From 33c550f1c94088ac935964e39c94cbf8466886fd Mon Sep 17 00:00:00 2001
From: gpa <gpa@tinyerp.com>
Date: Tue, 11 Jan 2011 12:14:20 +0530
Subject: [PATCH 001/188] [IMP]partner:added suppliers menu domain

bzr revid: gpa@tinyerp.com-20110111064420-9p05fwjsizqbtubz
---
 bin/addons/base/res/partner/partner_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index 8c949a7f410..3f225f29e49 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -394,7 +394,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.partner</field>
             <field name="view_type">form</field>
-            <field name="domain">[]</field>
+            <field name="domain">[('supplier','=',1)]</field>
             <field name="context">{'default_customer':0, 'search_default_supplier': 1, 'default_supplier':1}</field>
             <field name="filter" eval="True"/>
             <field name="help">You can access all information regarding your suppliers from the supplier form: accounting data, history of emails, meetings, purchases, etc. You can uncheck the 'Suppliers' filter button in order to search in all your partners, including customers and prospects.</field>

From 6a11b89e1729c6ac06efba1e75405e1ecd24dc8a Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Wed, 9 Feb 2011 11:07:35 +0100
Subject: [PATCH 002/188] [FIX] ensures no illegitimate cli argument is
 silently discarded

This avoids an insidious behavior: when copy-pasting a command from a
Microsoft document to the cmd terminal, one might not see that a hyphen ('-')
preceding an option has been converted to a dash (u'\u2012') which is then
interpreted as a normal cli argument (i.e. not an option) and thus silently
discarded.

bzr revid: jth@openerp.com-20110209100735-jaschhlv3cfqjry5
---
 openerp/tools/config.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/openerp/tools/config.py b/openerp/tools/config.py
index 7d0b04739e4..626720a43c2 100644
--- a/openerp/tools/config.py
+++ b/openerp/tools/config.py
@@ -251,12 +251,14 @@ class configmanager(object):
         self.parse_config()
 
     def parse_config(self, args=[]):
-        opt = self.parser.parse_args(args)[0]
+        opt, args = self.parser.parse_args()
 
         def die(cond, msg):
             if cond:
-                print msg
-                sys.exit(1)
+                self.parser.error(msg)
+
+        # Ensures no illegitimate argument is silently discarded (avoids insidious "hyphen to dash" problem)
+        die(args, "unrecognized parameters were passed: '%s'" % " ".join(args))
 
         die(bool(opt.syslog) and bool(opt.logfile),
             "the syslog and logfile options are exclusive")

From 1984fc62cb3a96412b10337e43a2a56914fb3b07 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Thu, 17 Mar 2011 19:04:19 +0530
Subject: [PATCH 003/188] [FIX] account: journal seqence not respected

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

bzr revid: ara@tinyerp.com-20110317133419-87dwll6uv39lw3cl
---
 addons/account/account_cash_statement.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index ff0f0117ff5..04e780ade30 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -320,6 +320,7 @@ class account_cash_statement(osv.osv):
         """ Changes statement state to Running.
         @return: True
         """
+        obj_seq = self.pool.get('ir.sequence')
         if context is None:
             context = {}
         statement_pool = self.pool.get('account.bank.statement')
@@ -329,15 +330,18 @@ class account_cash_statement(osv.osv):
                 raise osv.except_osv(_('Error !'), (_('User %s does not have rights to access %s journal !') % (statement.user_id.name, statement.journal_id.name)))
 
             if statement.name and statement.name == '/':
-                number = self.pool.get('ir.sequence').get(cr, uid, 'account.cash.statement')
+                if statement.journal_id.sequence_id:
+                    c = {'fiscalyear_id': statement.period_id.fiscalyear_id.id}
+                    st_number = obj_seq.get_id(cr, uid, statement.journal_id.sequence_id.id, context=c)
+                else:
+                    st_number = obj_seq.get(cr, uid, 'account.cash.statement')
                 vals.update({
-                    'name': number
+                    'name': st_number
                 })
 
             vals.update({
                 'date': time.strftime("%Y-%m-%d %H:%M:%S"),
                 'state': 'open',
-
             })
             self.write(cr, uid, [statement.id], vals, context=context)
         return True

From 838d9a3e60f49895bc54c3b58bc3d8ed36445c08 Mon Sep 17 00:00:00 2001
From: "pso (OpenERP)" <pso@tinyerp.com>
Date: Fri, 1 Apr 2011 10:55:32 +0530
Subject: [PATCH 004/188] [FIX] hr_holidays: possible to set to draft a refused
 allocation request

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

bzr revid: pso@tinyerp.com-20110401052532-5op996ya8rxbq0kb
---
 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 7740470ccc7..f49b2ab388a 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -139,7 +139,7 @@
                             <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
                             <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
                             <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
-                            <button string="Set to Draft" name="set_to_draft" states="cancel,validate,validate1" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
+                            <button string="Set to Draft" name="set_to_draft" states="cancel,validate,validate1,refuse" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
                         </group>
                     </page>
                 </notebook>

From 468f05c2099d5860896cf81a128bd22b0d514af0 Mon Sep 17 00:00:00 2001
From: "pso (OpenERP)" <pso@tinyerp.com>
Date: Fri, 1 Apr 2011 11:23:51 +0530
Subject: [PATCH 005/188] [FIX] hr: Put groups on HR menu

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

bzr revid: pso@tinyerp.com-20110401055351-uor3osh5vz761612
---
 addons/hr/hr_view.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index a3512b65588..75cbd88e64d 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -4,7 +4,8 @@
 
         <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15"
             web_icon="images/hr.png"
-            web_icon_hover="images/hr-hover.png"/>
+            web_icon_hover="images/hr-hover.png"
+            groups="base.group_hr_manager,base.group_hr_user,base.group_user"/>
         <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0"/>
         <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_hr_manager" sequence="50"/>
         <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" sequence="1"/>
@@ -320,7 +321,7 @@
             <field eval="True" name="object"/>
         </record>
 
-        <menuitem action="open_view_categ_tree" 
+        <menuitem action="open_view_categ_tree"
             id="menu_view_employee_category_tree" parent="hr.menu_view_employee_category_form"/>
 
         <record id="view_hr_job_form" model="ir.ui.view">

From 2f4a82f7f6318a9f2bfbfae0c056731209f00e5c Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Fri, 1 Apr 2011 18:18:04 +0530
Subject: [PATCH 006/188] [FIX] account: Cancel of invoice throws error,
 validate of move_id is invalid

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

bzr revid: ara@tinyerp.com-20110401124804-rvbqlbaosphsqv8c
---
 addons/account/account_move_line.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 83a67df9178..e5c06213061 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -1085,15 +1085,26 @@ class account_move_line(osv.osv):
         if context is None:
             context = {}
         move_obj = self.pool.get('account.move')
+        analytic_obj = self.pool.get('account.analytic.line')
         self._update_check(cr, uid, ids, context)
         result = False
         move_ids = set()
+        analytic_ids = set()
+        move_line_ids = set()
         for line in self.browse(cr, uid, ids, context=context):
             move_ids.add(line.move_id.id)
             context['journal_id'] = line.journal_id.id
             context['period_id'] = line.period_id.id
-            result = super(account_move_line, self).unlink(cr, uid, [line.id], context=context)
+            move_line_ids.add(line.id)
+            for obj in line.analytic_lines:
+                analytic_ids.add(obj.id)
+
+        analytic_ids = list(analytic_ids)
         move_ids = list(move_ids)
+
+        if analytic_ids:
+            analytic_obj.unlink(cr,uid, analytic_ids, context=context)
+        result = super(account_move_line, self).unlink(cr, uid, list(move_line_ids), context=context)
         if check and move_ids:
             move_obj.validate(cr, uid, move_ids, context=context)
         return result

From 08695d543309b3f64581440f70037699861a337c Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Mon, 4 Apr 2011 12:09:17 +0530
Subject: [PATCH 007/188] [FIX] account: Cancel of invoice throws error,
 validate of move_id is invalid

bzr revid: ara@tinyerp.com-20110404063917-kunaq8rj59pvvjsf
---
 addons/account/account_move_line.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index e5c06213061..2cbe9de9630 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -1093,11 +1093,9 @@ class account_move_line(osv.osv):
         move_line_ids = set()
         for line in self.browse(cr, uid, ids, context=context):
             move_ids.add(line.move_id.id)
-            context['journal_id'] = line.journal_id.id
-            context['period_id'] = line.period_id.id
             move_line_ids.add(line.id)
-            for obj in line.analytic_lines:
-                analytic_ids.add(obj.id)
+            for analytic in line.analytic_lines:
+                analytic_ids.add(analytic.id)
 
         analytic_ids = list(analytic_ids)
         move_ids = list(move_ids)

From ccbf1f434b8bf43e83dd0466dc9bfb226bb56f81 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 5 Apr 2011 10:50:41 +0530
Subject: [PATCH 008/188] [FIX]stock:Multiple UOM not handled by Inventory
 Analysis

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

bzr revid: ron@tinyerp.com-20110405052041-hu8odbfg12cm2xc2
---
 addons/stock/report/report_stock_move.py | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index 15e430d0599..f489b824062 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -176,18 +176,23 @@ CREATE OR REPLACE view report_stock_inventory AS (
         m.product_id as product_id, pt.categ_id as product_categ_id, l.usage as location_type,
         m.company_id,
         m.state as state, m.prodlot_id as prodlot_id,
-        coalesce(sum(-m.product_qty * u.factor)::decimal, 0.0) as product_qty,
-        coalesce(sum(-pt.standard_price * m.product_qty * u.factor)::decimal, 0.0) as value
+        coalesce(sum(-pt.standard_price * m.product_qty)::decimal, 0.0) as value,
+        CASE when pt.uom_id = m.product_uom 
+        THEN
+        coalesce(sum(-m.product_qty)::decimal, 0.0) 
+        ELSE
+        coalesce(sum(-m.product_qty * pu.factor)::decimal, 0.0) END as product_qty
     FROM
         stock_move m
             LEFT JOIN stock_picking p ON (m.picking_id=p.id)
             LEFT JOIN product_product pp ON (m.product_id=pp.id)
                 LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
+                LEFT JOIN product_uom pu ON (pt.uom_id=pu.id)
             LEFT JOIN product_uom u ON (m.product_uom=u.id)
             LEFT JOIN stock_location l ON (m.location_id=l.id)
     GROUP BY
         m.id, m.product_id, m.product_uom, pt.categ_id, m.address_id, m.location_id,  m.location_dest_id,
-        m.prodlot_id, m.date, m.state, l.usage, m.company_id
+        m.prodlot_id, m.date, m.state, l.usage, m.company_id,pt.uom_id
 ) UNION ALL (
     SELECT
         -m.id as id, m.date as date,
@@ -195,18 +200,23 @@ CREATE OR REPLACE view report_stock_inventory AS (
         m.product_id as product_id, pt.categ_id as product_categ_id, l.usage as location_type,
         m.company_id,
         m.state as state, m.prodlot_id as prodlot_id,
-        coalesce(sum(m.product_qty*u.factor)::decimal, 0.0) as product_qty,
-        coalesce(sum(pt.standard_price * m.product_qty * u.factor)::decimal, 0.0) as value
+        coalesce(sum(pt.standard_price * m.product_qty )::decimal, 0.0) as value,
+        CASE when pt.uom_id = m.product_uom 
+        THEN 
+        coalesce(sum(m.product_qty)::decimal, 0.0) 
+        ELSE
+        coalesce(sum(m.product_qty * pu.factor)::decimal, 0.0) END as product_qty
     FROM
         stock_move m
             LEFT JOIN stock_picking p ON (m.picking_id=p.id)
             LEFT JOIN product_product pp ON (m.product_id=pp.id)
                 LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
+                LEFT JOIN product_uom pu ON (pt.uom_id=pu.id)
             LEFT JOIN product_uom u ON (m.product_uom=u.id)
             LEFT JOIN stock_location l ON (m.location_dest_id=l.id)
     GROUP BY
         m.id, m.product_id, m.product_uom, pt.categ_id, m.address_id, m.location_id, m.location_dest_id,
-        m.prodlot_id, m.date, m.state, l.usage, m.company_id
+        m.prodlot_id, m.date, m.state, l.usage, m.company_id,pt.uom_id
     )
 );
         """)

From a21ecf80c5b18d00fb180f2d7237d63126d14ef8 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 5 Apr 2011 12:01:28 +0530
Subject: [PATCH 009/188] [REF]stock: Multiple UOM not handled by Inventory
 Analysis

bzr revid: ron@tinyerp.com-20110405063128-73v7uoqq3h3kt59s
---
 addons/stock/report/report_stock_move.py | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index f489b824062..d2dbcb72a46 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -177,11 +177,10 @@ CREATE OR REPLACE view report_stock_inventory AS (
         m.company_id,
         m.state as state, m.prodlot_id as prodlot_id,
         coalesce(sum(-pt.standard_price * m.product_qty)::decimal, 0.0) as value,
-        CASE when pt.uom_id = m.product_uom 
-        THEN
-        coalesce(sum(-m.product_qty)::decimal, 0.0) 
-        ELSE
-        coalesce(sum(-m.product_qty * pu.factor)::decimal, 0.0) END as product_qty
+        case when pt.uom_id = m.product_uom then
+            coalesce(sum(-m.product_qty)::decimal, 0.0) 
+        else
+            coalesce(sum(-m.product_qty * pu.factor)::decimal, 0.0) END as product_qty
     FROM
         stock_move m
             LEFT JOIN stock_picking p ON (m.picking_id=p.id)
@@ -192,7 +191,7 @@ CREATE OR REPLACE view report_stock_inventory AS (
             LEFT JOIN stock_location l ON (m.location_id=l.id)
     GROUP BY
         m.id, m.product_id, m.product_uom, pt.categ_id, m.address_id, m.location_id,  m.location_dest_id,
-        m.prodlot_id, m.date, m.state, l.usage, m.company_id,pt.uom_id
+        m.prodlot_id, m.date, m.state, l.usage, m.company_id, pt.uom_id
 ) UNION ALL (
     SELECT
         -m.id as id, m.date as date,
@@ -201,11 +200,10 @@ CREATE OR REPLACE view report_stock_inventory AS (
         m.company_id,
         m.state as state, m.prodlot_id as prodlot_id,
         coalesce(sum(pt.standard_price * m.product_qty )::decimal, 0.0) as value,
-        CASE when pt.uom_id = m.product_uom 
-        THEN 
-        coalesce(sum(m.product_qty)::decimal, 0.0) 
-        ELSE
-        coalesce(sum(m.product_qty * pu.factor)::decimal, 0.0) END as product_qty
+        case when pt.uom_id = m.product_uom  then 
+            coalesce(sum(m.product_qty)::decimal, 0.0) 
+        else
+            coalesce(sum(m.product_qty * pu.factor)::decimal, 0.0) END as product_qty
     FROM
         stock_move m
             LEFT JOIN stock_picking p ON (m.picking_id=p.id)
@@ -216,7 +214,7 @@ CREATE OR REPLACE view report_stock_inventory AS (
             LEFT JOIN stock_location l ON (m.location_dest_id=l.id)
     GROUP BY
         m.id, m.product_id, m.product_uom, pt.categ_id, m.address_id, m.location_id, m.location_dest_id,
-        m.prodlot_id, m.date, m.state, l.usage, m.company_id,pt.uom_id
+        m.prodlot_id, m.date, m.state, l.usage, m.company_id, pt.uom_id
     )
 );
         """)

From 53d0655f2821566a9128e49aa8f188898934b706 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 5 Apr 2011 12:20:13 +0530
Subject: [PATCH 010/188] [REF]stock: Multiple UOM not handled by Inventory
 Analysis

bzr revid: ron@tinyerp.com-20110405065013-4ntnsbij883vj5gi
---
 addons/stock/report/report_stock_move.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index d2dbcb72a46..07289a4379a 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -177,9 +177,9 @@ CREATE OR REPLACE view report_stock_inventory AS (
         m.company_id,
         m.state as state, m.prodlot_id as prodlot_id,
         coalesce(sum(-pt.standard_price * m.product_qty)::decimal, 0.0) as value,
-        case when pt.uom_id = m.product_uom then
+        CASE when pt.uom_id = m.product_uom THEN
             coalesce(sum(-m.product_qty)::decimal, 0.0) 
-        else
+        ELSE
             coalesce(sum(-m.product_qty * pu.factor)::decimal, 0.0) END as product_qty
     FROM
         stock_move m
@@ -200,9 +200,9 @@ CREATE OR REPLACE view report_stock_inventory AS (
         m.company_id,
         m.state as state, m.prodlot_id as prodlot_id,
         coalesce(sum(pt.standard_price * m.product_qty )::decimal, 0.0) as value,
-        case when pt.uom_id = m.product_uom  then 
+        CASE when pt.uom_id = m.product_uom  THEN 
             coalesce(sum(m.product_qty)::decimal, 0.0) 
-        else
+        ELSE
             coalesce(sum(m.product_qty * pu.factor)::decimal, 0.0) END as product_qty
     FROM
         stock_move m

From e6ebac0a38ce43b4b8245714ad702375ca8183a0 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Tue, 5 Apr 2011 15:00:17 +0530
Subject: [PATCH 011/188] [FIX] crm_claim : claim history should not be deleted

bzr revid: amp@tinyerp.com-20110405093017-hnob35dw5gt39x2t
---
 addons/crm_claim/crm_claim_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 63df2c35d0d..e7a0961a846 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -177,7 +177,7 @@
                                 <group colspan="4">
                                     <field colspan="4" name="email_cc" string="Global CC" widget="char"/>
                                 </group>
-                                <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
+                                <field name="message_ids" colspan="4" nolabel="1" mode="tree,form" readonly="1">
                                     <tree string="History">
                                         <field name="display_text" string="History Information"/>
                                         <button

From 84f97f57e66297011214044cd360d0e18392f222 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Tue, 5 Apr 2011 16:01:34 +0530
Subject: [PATCH 012/188] [FIX] hr_holidays : Fixes the holidays workflow issue

bzr revid: amp@tinyerp.com-20110405103134-2lu512lqup2w57o5
---
 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 7740470ccc7..ed062a38502 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -93,7 +93,7 @@
                             <newline/>
                             <field name="state" colspan="2"/>
                             <group colspan="2" col="6">
-                                <button string="Refuse" name="refuse" states="confirm" type="workflow" icon="gtk-no" groups="base.group_hr_user,base.group_hr_manager"/>
+                                <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user,base.group_hr_manager"/>
                                 <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
                                 <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
                                 <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>

From dba0f626205b1195ab9351a71202113f427f1154 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Tue, 5 Apr 2011 17:20:15 +0530
Subject: [PATCH 014/188] [FIX] hr_evaluation : Fixes the syntex problem on
 filter

bzr revid: amp@tinyerp.com-20110405115015-uymwebdn8b9b7j3e
---
 addons/hr_evaluation/hr_evaluation_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 27b3ba53d10..46d5cf55a98 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -252,7 +252,7 @@
             <field name="arch" type="xml">
                 <search string="Search Evaluation">
                    <group col='10' colspan='4'>
-                    <filter icon="terp-check" string="Current" domain="[('state','=','wait'))]" help="Evaluations that are in waiting state"/>
+                    <filter icon="terp-check" string="Current" domain="[('state','=','wait')]" help="Evaluations that are in waiting state"/>
                     <filter icon="terp-camera_test" string="In progress" domain="[('state','=','progress')]" help="Evaluations that are in progress state"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-go-week" string="7 Days" help="Evaluations to close within the next 7 days"

From f1f16b884e4099734799a0c876d03fd2eca5d45f Mon Sep 17 00:00:00 2001
From: "RME (OpenERP)" <rme@tinyerp.com>
Date: Tue, 5 Apr 2011 17:32:37 +0530
Subject: [PATCH 015/188] [FIX] crm : partner form having convert to
 opportunity wizard's name improper

bzr revid: rme@tinyerp.com-20110405120237-6i304fb39sivoxxn
---
 addons/crm/wizard/crm_partner_to_opportunity_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/wizard/crm_partner_to_opportunity_view.xml b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
index 7ceb9bc40d9..762303f06ba 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
@@ -8,7 +8,7 @@
           <field name="model">crm.partner2opportunity</field>
           <field name="type">form</field>
           <field name="arch" type="xml">
-              <form string="Convert To Opportunity">
+              <form string="Create Opportunity">
             <field name="name"/>
             <field name="partner_id"/>
             <newline/>

From e21a561cb19cb3b99730f4fb7970dbc202584354 Mon Sep 17 00:00:00 2001
From: skh <skh@tinyerp.com>
Date: Tue, 5 Apr 2011 18:09:58 +0530
Subject: [PATCH 016/188] [FIX] payment mode - account must belong to company

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

bzr revid: skh@tinyerp.com-20110405123958-savml2himnvrhsr3
---
 addons/account_payment/account_payment.py       | 11 ++++++++++-
 addons/account_payment/account_payment_view.xml |  5 +++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py
index f3259f846cc..9a089110d37 100644
--- a/addons/account_payment/account_payment.py
+++ b/addons/account_payment/account_payment.py
@@ -33,7 +33,9 @@ class payment_mode(osv.osv):
             required=True,help='Bank Account for the Payment Mode'),
         'journal': fields.many2one('account.journal', 'Journal', required=True,
             domain=[('type', 'in', ('bank','cash'))], help='Bank or Cash Journal for the Payment Mode'),
-        'company_id': fields.many2one('res.company', 'Company', required=True),
+        'company_id': fields.many2one('res.company', 'Company',required=True),
+        'partner_id':fields.related('company_id','partner_id',type='many2one',relation='res.partner',string='Partner',store=True,),
+        
     }
     _defaults = {
         'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id
@@ -49,6 +51,13 @@ class payment_mode(osv.osv):
             JOIN payment_mode pm ON (pm.bank_id = pb.id)
             WHERE pm.id = %s """, [payment_code])
         return [x[0] for x in cr.fetchall()]
+    
+    def onchange_company_id (self,cr,uid,ids,company_id,context=None):
+        vals={}
+        if company_id:
+            partner = self.pool.get('res.company').read(cr, uid, [company_id], ['partner_id'])[0]['partner_id']
+        return {'value': {'partner_id': partner}}
+                
 
 payment_mode()
 
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index 56ff30e5ded..6f7acc7a367 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -79,8 +79,9 @@
                 <form string="Payment Mode">
                     <field name="name" select="1"/>
                     <field name="journal" select="1"/>
-                    <field name="bank_id"/>
-                    <field name="company_id" select="1" widget='selection' groups="base.group_multi_company"/>
+                    <field name="bank_id" domain="[('partner_id','=',partner_id)]"  />
+                    <field name="company_id" select="1" widget='selection' groups="base.group_multi_company" on_change="onchange_company_id(company_id)"/>
+                    <field name="partner_id" select="1" widget='selection' invisible="1"/>
                 </form>
             </field>
         </record>

From 0e97026d171be10a9b93954a1b9cfabbb8be0312 Mon Sep 17 00:00:00 2001
From: skh <skh@tinyerp.com>
Date: Tue, 5 Apr 2011 18:52:02 +0530
Subject: [PATCH 017/188] [FIX] payment mode - account must belong to company

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

bzr revid: skh@tinyerp.com-20110405132202-sbnuwnhc9h8mrzbb
---
 addons/account_payment/account_payment.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py
index 9a089110d37..ec5367150f2 100644
--- a/addons/account_payment/account_payment.py
+++ b/addons/account_payment/account_payment.py
@@ -52,11 +52,15 @@ class payment_mode(osv.osv):
             WHERE pm.id = %s """, [payment_code])
         return [x[0] for x in cr.fetchall()]
     
-    def onchange_company_id (self,cr,uid,ids,company_id,context=None):
-        vals={}
+    def onchange_company_id (self,cr,uid,ids,company_id=False,context=None):
+        result={}
         if company_id:
-            partner = self.pool.get('res.company').read(cr, uid, [company_id], ['partner_id'])[0]['partner_id']
-        return {'value': {'partner_id': partner}}
+            company = self.pool.get('res.company').browse(cr,uid,company_id)
+            partner = company.partner_id.id
+            result = {'value': 
+                         {'partner_id': partner}
+                      }
+        return result
                 
 
 payment_mode()

From abc1e151124fe36e770631563b11c0e7a903609a Mon Sep 17 00:00:00 2001
From: skh <skh@tinyerp.com>
Date: Tue, 5 Apr 2011 19:06:31 +0530
Subject: [PATCH 018/188] [FIX] payment mode - account must belong to company

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

bzr revid: skh@tinyerp.com-20110405133631-53w2l2xurliqee3y
---
 addons/account_payment/account_payment.py | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py
index ec5367150f2..1840176519a 100644
--- a/addons/account_payment/account_payment.py
+++ b/addons/account_payment/account_payment.py
@@ -52,15 +52,12 @@ class payment_mode(osv.osv):
             WHERE pm.id = %s """, [payment_code])
         return [x[0] for x in cr.fetchall()]
     
-    def onchange_company_id (self,cr,uid,ids,company_id=False,context=None):
+    def onchange_company_id (self, cr, uid, ids, company_id = False, context = None):
         result={}
         if company_id:
-            company = self.pool.get('res.company').browse(cr,uid,company_id)
-            partner = company.partner_id.id
-            result = {'value': 
-                         {'partner_id': partner}
-                      }
-        return result
+            partner_id = self.pool.get('res.company').browse(cr, uid, company_id).partner_id.id
+            result['partner_id'] = partner_id
+        return {'value': result}
                 
 
 payment_mode()

From 0195b0755c09c9c898dcbd94a35897f594eac85e Mon Sep 17 00:00:00 2001
From: "pso (OpenERP)" <pso@tinyerp.com>
Date: Wed, 6 Apr 2011 10:35:34 +0530
Subject: [PATCH 019/188] [FIX] sale: Improved Usability for Product UOM and
 Product UOS in order line

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

bzr revid: pso@tinyerp.com-20110406050534-22rekrajfk0b1p4h
---
 addons/sale/sale_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 9925354346b..9b6664daf20 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -135,10 +135,10 @@
                                                 name="product_uom_qty"
                                                 on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging, parent.fiscal_position, True)"
                                                 />
-                                                <field groups="product.group_uos" name="product_uos_qty"/>
-                                                <field groups="product.group_uos" name="product_uos"/>
                                             <field name="product_uom"
                                                 on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order)"/>
+                                            <field groups="product.group_uos" name="product_uos_qty"/>
+                                            <field groups="product.group_uos" name="product_uos"/>
                                             <field
                                                 name="product_packaging"
                                                 context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"

From 93c75e59e6363ac006c024342c05316f7f86da24 Mon Sep 17 00:00:00 2001
From: skh <skh@tinyerp.com>
Date: Wed, 6 Apr 2011 10:43:37 +0530
Subject: [PATCH 020/188] [FIX] payment mode - account must belong to company

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

bzr revid: skh@tinyerp.com-20110406051337-852xk8bsz2feloro
---
 addons/account_payment/account_payment.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py
index 1840176519a..4119aa28e38 100644
--- a/addons/account_payment/account_payment.py
+++ b/addons/account_payment/account_payment.py
@@ -52,8 +52,8 @@ class payment_mode(osv.osv):
             WHERE pm.id = %s """, [payment_code])
         return [x[0] for x in cr.fetchall()]
     
-    def onchange_company_id (self, cr, uid, ids, company_id = False, context = None):
-        result={}
+    def onchange_company_id (self, cr, uid, ids, company_id=False, context=None):
+        result = {}
         if company_id:
             partner_id = self.pool.get('res.company').browse(cr, uid, company_id).partner_id.id
             result['partner_id'] = partner_id

From bc23be6ebaa3e8e2ef4d2e09f1bf97e73642a3af Mon Sep 17 00:00:00 2001
From: skh <skh@tinyerp.com>
Date: Wed, 6 Apr 2011 11:39:50 +0530
Subject: [PATCH 021/188] [FIX] [PS] Generating an invoice from an expense
 doesn't create a correct supplier invoice

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

bzr revid: skh@tinyerp.com-20110406060950-x1ndypq04szpsmvr
---
 addons/hr_expense/hr_expense.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 1fdbb56f40b..e366d7a6afd 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -127,7 +127,7 @@ class hr_expense_expense(osv.osv):
     def invoice(self, cr, uid, ids, context=None):
         wf_service = netsvc.LocalService("workflow")
         mod_obj = self.pool.get('ir.model.data')
-        res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_form')
+        res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_supplier_form')
         res_id = res and res[1] or False,
         inv_ids = []
         for id in ids:

From 29b7fddceb341e42721775b71de7ad754214dde5 Mon Sep 17 00:00:00 2001
From: Jigar Amin <jam@tinyerp.com>
Date: Wed, 6 Apr 2011 12:06:23 +0530
Subject: [PATCH 022/188] [IMP] account_analytic_analysis: All univoived menu
 should show all uninvocied entry

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

bzr revid: jam@tinyerp.com-20110406063623-m960iw15syjfgoq0
---
 .../account_analytic_analysis_menu.xml                          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index badd7e1816a..4ee4693abcb 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -8,7 +8,7 @@
             <field name="res_model">account.analytic.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('invoice_id','=',False),('to_invoice','!=',False)]</field>
+            <field name="domain">[('invoice_id','=',False)]</field>
             <field name="search_view_id" ref="account.view_account_analytic_line_filter"/>
         </record>
         <menuitem action="action_hr_tree_invoiced_all" id="menu_action_hr_tree_invoiced_all" parent="menu_invoicing" groups="base.group_extended"/>

From 49dd2cae4ed2fa726d7c7d1b3d1dbc260bd6d6c2 Mon Sep 17 00:00:00 2001
From: "RME (OpenERP)" <rme@tinyerp.com>
Date: Wed, 6 Apr 2011 12:32:01 +0530
Subject: [PATCH 023/188] [FIX] crm : Opportunity 'communication & history' tab
 sequence improper

bzr revid: rme@tinyerp.com-20110406070201-m0eg56c6lvwxm8w7
---
 addons/crm/crm_opportunity_view.xml | 40 +++++++++++++++--------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 9b87c64483e..a6fb9166186 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -136,6 +136,26 @@
                             </group>
                         </page>
 
+						<page string="Extra Info" groups="base.group_extended">
+                            <group col="2" colspan="2">
+                                <separator string="Dates" colspan="2"/>
+                                <field name="create_date"/>
+                                <field name="write_date"/>
+                                <field name="date_closed"/>
+                                <field name="date_open"/>
+                            </group>
+                            <group col="2" colspan="2">
+                                <separator string="Misc" colspan="2"/>
+                                <field name="active"/>
+                                <field name="day_open"/>
+                                <field name="day_close"/>
+                                <field name="referred"/>
+                            </group>
+                            <separator colspan="4" string="References"/>
+                            <field name="ref"/>
+                            <field name="ref2"/>
+                        </page>
+
                         <page string="Communication &amp; History" groups="base.group_extended">
                             <group colspan="4">
                                 <field colspan="4" name="email_cc" string="Global CC" widget="char" size="512"/>
@@ -188,25 +208,7 @@
                                 context="{'mail':'new', 'model': 'crm.lead'}"
                                 icon="terp-mail-message-new" type="action" />
                         </page>
-                        <page string="Extra Info" groups="base.group_extended">
-                            <group col="2" colspan="2">
-                                <separator string="Dates" colspan="2"/>
-                                <field name="create_date"/>
-                                <field name="write_date"/>
-                                <field name="date_closed"/>
-                                <field name="date_open"/>
-                            </group>
-                            <group col="2" colspan="2">
-                                <separator string="Misc" colspan="2"/>
-                                <field name="active"/>
-                                <field name="day_open"/>
-                                <field name="day_close"/>
-                                <field name="referred"/>
-                            </group>
-                            <separator colspan="4" string="References"/>
-                            <field name="ref"/>
-                            <field name="ref2"/>
-                        </page>
+
                         </notebook>
                     </form>
                 </field>

From 2e7d3b5ee15134b93944efa5a99a281cf76a9dc7 Mon Sep 17 00:00:00 2001
From: "RME (OpenERP)" <rme@tinyerp.com>
Date: Wed, 6 Apr 2011 15:48:54 +0530
Subject: [PATCH 024/188] [FIX] crm : history field should be present cause
 attrs on the same, due to that reply button appears for all

bzr revid: rme@tinyerp.com-20110406101854-1em722yxk9ufcovp
---
 addons/crm_claim/crm_claim_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 63df2c35d0d..77ab2320b7a 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -180,6 +180,7 @@
                                 <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
                                     <tree string="History">
                                         <field name="display_text" string="History Information"/>
+                                        <field name="history" invisible="1"/>
                                         <button
                                             string="Reply"
                                             name="%(crm.action_crm_send_mail)d"

From afc74ed47f09bca7130d310268588916aefeb09e Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Thu, 7 Apr 2011 10:26:07 +0530
Subject: [PATCH 025/188] [IMP] email.compose.message: removed method
 save_to_drafts() and did related changes for this

bzr revid: rha@tinyerp.com-20110407045607-tub41samcup20t5d
---
 addons/crm_partner_assign/wizard/crm_forward_to_partner.py | 7 -------
 .../wizard/crm_forward_to_partner_view.xml                 | 1 -
 addons/email_template/wizard/email_template_send_wizard.py | 7 -------
 .../wizard/email_template_send_wizard_view.xml             | 6 +-----
 addons/mail/wizard/email_compose_message.py                | 7 -------
 addons/mail/wizard/email_compose_message_view.xml          | 1 -
 6 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
index 91c3df7ac5b..d586f23f371 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -171,13 +171,6 @@ class crm_lead_forward_to_partner(osv.osv_memory):
             email = self.pool.get('res.partner.address').browse(cr, uid, address_id).email
         return {'value': {'email_to' : email}}
 
-    def save_to_drafts(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        super(crm_lead_forward_to_partner, self).save_to_drafts(cr, uid, ids, context=context)
-        self.action_forward(cr, uid, ids, context)
-        return {'type': 'ir.actions.act_window_close'}
-
     def send_mail(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
index 2a56e6e14d7..3e30d435025 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
@@ -46,7 +46,6 @@
                     <group col="4" colspan="4">
                         <label string="" colspan="1"/>
                         <button icon="gtk-close" special="cancel" string="Close"/>
-                        <button icon="gtk-apply" name="save_to_drafts" string="Save in Drafts" type="object"/>
                         <button icon="gtk-ok" name="send_mail" string="Send now" type="object"/>
                     </group>
                 </form>
diff --git a/addons/email_template/wizard/email_template_send_wizard.py b/addons/email_template/wizard/email_template_send_wizard.py
index 30ab10b9e82..67a13d3e4d0 100644
--- a/addons/email_template/wizard/email_template_send_wizard.py
+++ b/addons/email_template/wizard/email_template_send_wizard.py
@@ -128,13 +128,6 @@ class email_template_send_wizard(osv.osv_memory):
     #        result['attachment_ids']['domain'] = [('res_model','=',context['src_model']),('res_id','=',context['active_id'])]
     #    return result
 
-    def save_to_drafts(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        mailid = self.save_to_mailbox(cr, uid, ids, context=context)
-        self.pool.get('email.message').write(cr, uid, mailid, {'state': 'outgoing'}, context)
-        return {'type': 'ir.actions.act_window_close'}
-
     def send_mail(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
diff --git a/addons/email_template/wizard/email_template_send_wizard_view.xml b/addons/email_template/wizard/email_template_send_wizard_view.xml
index 90c2648b1de..f82288575bb 100644
--- a/addons/email_template/wizard/email_template_send_wizard_view.xml
+++ b/addons/email_template/wizard/email_template_send_wizard_view.xml
@@ -33,7 +33,7 @@
                                 <field name="attachment_ids" colspan="4" nolabel="1"/>
                             </page>
                         </notebook>
-                        
+
                     </group>
                     <field name="state" invisible="1"/>
                     <group col="4" colspan="4" attrs="{'invisible':[('state','=','single')]}">
@@ -52,12 +52,8 @@
                     </group>
                     <group col="4" colspan="2" attrs="{'invisible':[('state','!=','single')]}">
                         <button icon="gtk-cancel" special="cancel" string="Discard"/>
-                        <button icon="gtk-apply" name="save_to_drafts" string="Save in Drafts" type="object"/>
                         <button icon="gtk-ok" name="send_mail" string="Send now" type="object"/>
                     </group>
-                    
-                    
-                    
                 </form>
             </field>
         </record>
diff --git a/addons/mail/wizard/email_compose_message.py b/addons/mail/wizard/email_compose_message.py
index 3a06bc2171d..22779b076e4 100644
--- a/addons/mail/wizard/email_compose_message.py
+++ b/addons/mail/wizard/email_compose_message.py
@@ -192,13 +192,6 @@ class email_compose_message(osv.osv_memory):
         return {'value': result}
 
 
-    def save_to_drafts(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        email_id = self.save_to_mailbox(cr, uid, ids, context=context)
-        self.pool.get('email.message').write(cr, uid, email_id, {'state': 'outgoing'}, context)
-        return {'type': 'ir.actions.act_window_close'}
-
     def send_mail(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
diff --git a/addons/mail/wizard/email_compose_message_view.xml b/addons/mail/wizard/email_compose_message_view.xml
index eab36ebc522..b07b996265c 100644
--- a/addons/mail/wizard/email_compose_message_view.xml
+++ b/addons/mail/wizard/email_compose_message_view.xml
@@ -33,7 +33,6 @@
                     <group col="4" colspan="4">
                         <label string="" colspan="1"/>
                         <button icon="gtk-close" special="cancel" string="Close"/>
-                        <button icon="gtk-apply" name="save_to_drafts" string="Save in Drafts" type="object"/>
                         <button icon="gtk-ok" name="send_mail" string="Send now" type="object"/>
                     </group>
                 </form>

From 05e833ccfa3efc4f3c716c4e632d0528574e5d91 Mon Sep 17 00:00:00 2001
From: "Kervel,PSO" <>
Date: Thu, 7 Apr 2011 11:06:42 +0530
Subject: [PATCH 026/188] [FIX] hr_timesheet_invoice: Passed to_invocie while
 creating of analytic lines

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

bzr revid: pso@tinyerp.com-20110407053642-ao3itgzmfg94oboy
---
 .../hr_timesheet_invoice/hr_timesheet_invoice.py  | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 215c98c02ac..2ffa628a12d 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -176,5 +176,20 @@ class account_invoice(osv.osv):
 
 account_invoice()
 
+class account_move_line(osv.osv):
+    _inherit = "account.move.line"
+
+    def create_analytic_lines(self, cr, uid, ids, context=None):
+        res = super(account_move_line, self).create_analytic_lines(cr, uid, ids,context=context)
+        analytic_line_obj = self.pool.get('account.analytic.line')
+        for move_line in self.pool.get('account.move.line').browse(cr, uid, ids, context=context):
+            for line in move_line.analytic_lines:
+                toinv = line.account_id.to_invoice.id
+                if toinv:
+                    analytic_line_obj.write(cr, uid, line.id, {'to_invoice': toinv})
+        return res
+
+account_move_line()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

From 996f3359650feb4782dffc75082195a602c20875 Mon Sep 17 00:00:00 2001
From: "pso (OpenERP)" <pso@tinyerp.com>
Date: Thu, 7 Apr 2011 11:12:43 +0530
Subject: [PATCH 027/188] [IMP] hr_timesheet_invoice: Improved
 create_analytic_lines func

bzr revid: pso@tinyerp.com-20110407054243-6rus1i8rcx0cj1qs
---
 addons/hr_timesheet_invoice/hr_timesheet_invoice.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 2ffa628a12d..5c042c5c7e3 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -182,7 +182,7 @@ class account_move_line(osv.osv):
     def create_analytic_lines(self, cr, uid, ids, context=None):
         res = super(account_move_line, self).create_analytic_lines(cr, uid, ids,context=context)
         analytic_line_obj = self.pool.get('account.analytic.line')
-        for move_line in self.pool.get('account.move.line').browse(cr, uid, ids, context=context):
+        for move_line in self.browse(cr, uid, ids, context=context):
             for line in move_line.analytic_lines:
                 toinv = line.account_id.to_invoice.id
                 if toinv:

From 19fce03f9dd0742018a32443389d4fc7a7700695 Mon Sep 17 00:00:00 2001
From: "RME (OpenERP)" <rme@tinyerp.com>
Date: Thu, 7 Apr 2011 11:49:38 +0530
Subject: [PATCH 028/188] [FIX] crm : meeting invitation having improper label
 Mail TO

bzr revid: rme@tinyerp.com-20110407061938-l7m2mu4lg1lbpmr6
---
 addons/crm/crm_meeting_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index aba69889f57..3b87672d081 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -102,7 +102,7 @@
                             <tree string="Invitation details" editable="top">
                                 <field name="sent_by_uid" string="From"/>
                                 <field name="user_id" string="To"/>
-                                <field name="email" string="Mail TO"/>
+                                <field name="email" string="Mail To"/>
                                 <field name="role" select="1" />
                                 <field name="state" />
                                 <button name="do_tentative"

From d1128469dbbba4a4d6faa1079df4d766101611dc Mon Sep 17 00:00:00 2001
From: "RME (OpenERP)" <rme@tinyerp.com>
Date: Thu, 7 Apr 2011 16:19:20 +0530
Subject: [PATCH 029/188] [FIX] project_scrum : when click on postpone button
 than also button appears in cancel or done state

bzr revid: rme@tinyerp.com-20110407104920-mgv3rfi1aruoipxf
---
 addons/project_scrum/project_scrum_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 82c19c09238..99b74157466 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -63,7 +63,7 @@
                         <field domain="[('project_id','=',project_id), ('state','in', ['draft','open'])]" name="sprint_id" select="1"/>
      					<button name="%(action_postpone_wizard)d" string="Postpone" type="action"
 							help="Postpone backlog" colspan="2"
-                         icon="gtk-convert"  attrs="{'invisible':[('state','=','done')]}"/>
+                         icon="gtk-convert"  attrs="{'invisible':[('state','in',['done', 'cancel'])]}"/>
                         <field name="user_id" select="1"/>
                         <field name="sequence" groups="base.group_extended"/>
                         <field name="create_date"/>

From f53ee6053a0e4f2ed8abbeee6469edf634de3d64 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Thu, 7 Apr 2011 18:20:24 +0530
Subject: [PATCH 031/188] [IMP] email.message.common: implemented active_id and
 active_model in default_get() and fix reference of fields subject and body

bzr revid: rha@tinyerp.com-20110407125024-4354406jcb4ih2k9
---
 addons/crm/wizard/email_compose_message.py         |  4 ++--
 .../wizard/crm_forward_to_partner.py               |  2 +-
 .../email_template/wizard/email_compose_message.py |  8 ++++----
 .../hr_evaluation/wizard/email_compose_message.py  |  4 ++--
 addons/mail/wizard/email_compose_message.py        | 14 ++++++++------
 addons/project/wizard/email_compose_message.py     |  4 ++--
 .../project_scrum/wizard/email_compose_message.py  |  4 ++--
 7 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/addons/crm/wizard/email_compose_message.py b/addons/crm/wizard/email_compose_message.py
index 8f995b5e256..4bb55009c0e 100644
--- a/addons/crm/wizard/email_compose_message.py
+++ b/addons/crm/wizard/email_compose_message.py
@@ -38,10 +38,10 @@ class email_compose_message(osv.osv_memory):
             model_obj = self.pool.get(model)
             data = model_obj.browse(cr, uid , resource_id, context)
             result.update({
-                    'name' : data.name or False,
+                    'subject' : data.name or False,
                     'email_to' : data.email_from or False,
                     'email_from' : data.user_id and data.user_id.address_id and data.user_id.address_id.email or False,
-                    'description' : '\n' + (tools.ustr(data.user_id.signature or '')),
+                    'body' : '\n' + (tools.ustr(data.user_id.signature or '')),
                     'email_cc' : tools.ustr(data.email_cc or ''),
                     'model': model  or False,
                     'res_id': resource_id  or False,
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
index d586f23f371..bc0dd2ac0b6 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -75,7 +75,7 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         sender = 'From: %s' %(hist.email_from or '')
         to = 'To: %s' % (hist.email_to or '')
         sentdate = 'Date: %s' % (hist.date or '')
-        desc = '\n%s'%(hist.description)
+        desc = '\n%s'%(hist.body)
         original = [header, sender, to, sentdate, desc]
         original = '\n'.join(original)
         return original
diff --git a/addons/email_template/wizard/email_compose_message.py b/addons/email_template/wizard/email_compose_message.py
index 0c584c98990..27dc53744bd 100644
--- a/addons/email_template/wizard/email_compose_message.py
+++ b/addons/email_template/wizard/email_compose_message.py
@@ -62,8 +62,8 @@ class email_compose_message(osv.osv_memory):
         result = super(email_compose_message, self).default_get(cr, uid, fields, context=context)
         template_id = context.get('template_id', False)
         vals = {}
-        if template_id and context.get('email_model') and context.get('email_res_id'):
-            vals = self.get_template_data(cr, uid, context.get('email_res_id'), template_id, context)
+        if template_id and context.get('active_model') and context.get('active_id'):
+            vals = self.get_template_data(cr, uid, context.get('active_id'), template_id, context)
 
         if not vals:
             return result
@@ -116,8 +116,8 @@ class email_compose_message(osv.osv_memory):
             message_pool = self.pool.get('email.message')
             message_data = message_pool.browse(cr, uid, int(context.get('message_id')), context)
             model = message_data.model
-        elif context.get('email_model',False):
-            model =  context.get('email_model')
+        elif context.get('active_model',False):
+            model =  context.get('active_model')
         if model:
             record_ids = email_temp_pool.search(cr, uid, [('model','=',model)])
             return email_temp_pool.name_get(cr, uid, record_ids, context) + [(False,'')]
diff --git a/addons/hr_evaluation/wizard/email_compose_message.py b/addons/hr_evaluation/wizard/email_compose_message.py
index da25dcd8cfc..40f679f4f53 100644
--- a/addons/hr_evaluation/wizard/email_compose_message.py
+++ b/addons/hr_evaluation/wizard/email_compose_message.py
@@ -57,8 +57,8 @@ class email_compose_message(osv.osv_memory):
                 result.update({
                         'email_from': tools.config.get('email_from',''),
                         'email_to': record_data.user_to_review_id.work_email or False,
-                        'name': _("Reminder to fill up Survey"),
-                        'description': msg,
+                        'subject': _("Reminder to fill up Survey"),
+                        'body': msg,
                         'res_id': resource_id,
                         'email_cc': False,
                         'email_bcc': False,
diff --git a/addons/mail/wizard/email_compose_message.py b/addons/mail/wizard/email_compose_message.py
index 22779b076e4..fbc2ba58a63 100644
--- a/addons/mail/wizard/email_compose_message.py
+++ b/addons/mail/wizard/email_compose_message.py
@@ -33,12 +33,14 @@ class email_compose_message(osv.osv_memory):
             context = {}
         result = super(email_compose_message, self).default_get(cr, uid, fields, context=context)
         vals = {}
-        if context.get('email_model') and context.get('email_res_id'):
-            vals = self.get_value(cr, uid, context.get('email_model'), context.get('email_res_id'), context)
-        elif context.get('message_id', False):
-            vals = self.get_message_data(cr, uid, int(context.get('message_id', False)), context)
+        if context.get('active_model') and context.get('active_id') and not context.get('mail')=='reply':
+            vals = self.get_value(cr, uid, context.get('active_model'), context.get('active_id'), context)
+
+        elif context.get('mail')=='reply' and context.get('active_id', False):
+            vals = self.get_message_data(cr, uid, int(context.get('active_id', False)), context)
+
         else:
-            result['model'] = context.get('email_model', False)
+            result['model'] = context.get('active_model', False)
 
         if not vals:
             return result
@@ -213,7 +215,7 @@ class email_compose_message(osv.osv_memory):
                 message_id = mail.message_id
             email_id = email_message_pool.schedule_with_attach(cr, uid, mail.email_from, mail.email_to, mail.subject, mail.body,
                     model=mail.model, email_cc=mail.email_cc, email_bcc=mail.email_bcc, reply_to=mail.reply_to,
-                    attach=attachment, message_id=message_id, references=references, openobject_id=int(mail.res_id), debug=mail.debug,
+                    attach=attachment, message_id=message_id, references=references, openobject_id=int(mail.res_id),
                     subtype=mail.sub_type, x_headers=mail.headers, priority=mail.priority, smtp_server_id=mail.smtp_server_id and mail.smtp_server_id.id, context=context)
             email_ids.append(email_id)
         return email_ids
diff --git a/addons/project/wizard/email_compose_message.py b/addons/project/wizard/email_compose_message.py
index 68445661716..eb52604749e 100644
--- a/addons/project/wizard/email_compose_message.py
+++ b/addons/project/wizard/email_compose_message.py
@@ -54,9 +54,9 @@ class email_compose_message(osv.osv_memory):
             if partner and len(partner.address):
                 result.update({'email_to': result.get('email_to',False) and result.get('email_to') + ',' + partner.address[0].email})
             result.update({
-                       'description': description or False,
+                       'body': description or False,
                        'email_to':   task_data.project_id.user_id and task_data.project_id.user_id.user_email or False,
-                       'name':  _("Task '%s' Closed") % task_data.name,
+                       'subject':  _("Task '%s' Closed") % task_data.name,
                        'model': model,
                        'res_id': resource_id,
                     })
diff --git a/addons/project_scrum/wizard/email_compose_message.py b/addons/project_scrum/wizard/email_compose_message.py
index 1a639fbd198..12e7edb4e27 100644
--- a/addons/project_scrum/wizard/email_compose_message.py
+++ b/addons/project_scrum/wizard/email_compose_message.py
@@ -47,8 +47,8 @@ class email_compose_message(osv.osv_memory):
             subject = _("Scrum Meeting : %s") %(meeting.date)
             message = _("Hello  , \nI am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'") %(meeting.date, sprint.name, sprint.project_id.name)
             result.update({
-                       'name': subject,
-                       'description': message,
+                       'subject': subject,
+                       'body': message,
                        'model': model,
                        'res_id': resource_id
                     })

From fa0aa7f2adc0603ebef8959835804a5fbde459e0 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Thu, 7 Apr 2011 19:12:20 +0530
Subject: [PATCH 032/188] [IMP] email.compose.message: removed method
 _get_records() and on_change_referred_doc()

bzr revid: rha@tinyerp.com-20110407134220-w54lyxvcy7dzvemg
---
 .../wizard/email_compose_message.py           |  6 +--
 .../wizard/email_compose_message_view.xml     |  7 +--
 addons/mail/wizard/email_compose_message.py   | 46 -------------------
 .../wizard/email_compose_message_view.xml     |  2 -
 4 files changed, 5 insertions(+), 56 deletions(-)

diff --git a/addons/email_template/wizard/email_compose_message.py b/addons/email_template/wizard/email_compose_message.py
index 27dc53744bd..2fcc158a333 100644
--- a/addons/email_template/wizard/email_compose_message.py
+++ b/addons/email_template/wizard/email_compose_message.py
@@ -127,13 +127,13 @@ class email_compose_message(osv.osv_memory):
         'template_id': fields.selection(_get_templates, 'Template'),
     }
 
-    def on_change_template(self, cr, uid, ids, model, resource_id, template_id, context=None):
+    def on_change_template(self, cr, uid, ids, model, template_id, context=None):
         if context is None:
             context = {}
         if context.get('mail') == 'reply':
             return {'value':{}}
-        result = self.on_change_referred_doc(cr, uid, [],  model, resource_id, context=context)
-        vals = result.get('value',{})
+        vals = {}
+        resource_id = context.get('active_id', False)
         if template_id and resource_id:
             vals.update(self.get_template_data(cr, uid, resource_id, template_id, context))
         else:
diff --git a/addons/email_template/wizard/email_compose_message_view.xml b/addons/email_template/wizard/email_compose_message_view.xml
index fdac0cc0c23..0a99d2af5e9 100644
--- a/addons/email_template/wizard/email_compose_message_view.xml
+++ b/addons/email_template/wizard/email_compose_message_view.xml
@@ -8,12 +8,9 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="mail.email_compose_message_wizard_form"/>
             <field name="arch" type="xml">
-	            <field name="res_id" position="replace">
+	            <field name="model" position="after">
 	                <field name="template_id" colspan="4"
-	                    on_change="on_change_template(model, res_id, template_id, context)"/>
-	                <field name="res_id"
-                        invisible="context.get('active_model','') != 'ir.ui.menu'"
-                        colspan="4" on_change="on_change_template(model, res_id, template_id, context)"/>
+	                    on_change="on_change_template(model, template_id, context)"/>
 	            </field>
             </field>
         </record>
diff --git a/addons/mail/wizard/email_compose_message.py b/addons/mail/wizard/email_compose_message.py
index fbc2ba58a63..375611bfae1 100644
--- a/addons/mail/wizard/email_compose_message.py
+++ b/addons/mail/wizard/email_compose_message.py
@@ -98,33 +98,8 @@ class email_compose_message(osv.osv_memory):
 
         return result
 
-    def _get_records(self, cr, uid, context=None):
-        """
-        Return Records of particular  Model
-        """
-        if context is None:
-            context = {}
-        record_ids = []
-        model_pool = False
-        if context.get('message_id'):
-            message_pool = self.pool.get('email.message')
-            message_data = message_pool.browse(cr, uid, int(context.get('message_id')), context)
-            model_pool =  self.pool.get(message_data.model)
-            record_ids = [message_data.res_id]
-        elif context.get('email_model',False):
-            model =  context.get('email_model')
-            model_pool =  self.pool.get(model)
-            record_ids = context.get('email_res_id') and [context.get('email_res_id')] or []
-            if not record_ids:
-                record_ids = model_pool.search(cr, uid, [])
-        if model_pool:
-            return model_pool.name_get(cr, uid, record_ids, context)
-        return []
-
     _columns = {
         'attachment_ids': fields.many2many('ir.attachment','email_message_send_attachment_rel', 'wizard_id', 'attachment_id', 'Attachments'),
-        'debug':fields.boolean('Debug', readonly=True),
-        'res_id':fields.selection(_get_records, 'Referred Document'),
     }
 
     def get_value(self, cr, uid, model, res_id, context=None):
@@ -173,27 +148,6 @@ class email_compose_message(osv.osv_memory):
 
         return result
 
-    def on_change_referred_doc(self, cr, uid, ids, model, resource_id, context=None):
-        if context is None:
-            context = {}
-        if context.get('mail') == 'reply':
-            return {'value':{}}
-        result = {}
-        if resource_id and model:
-            vals = self.get_value(cr, uid, model, resource_id, context)
-            if vals:
-                result.update({
-                            'email_from':  vals.get('email_from',''),
-                            'email_to':  vals.get('email_to',''),
-                            'subject':  vals.get('subject',''),
-                            'body':  vals.get('body',''),
-                            'email_cc':  vals.get('email_cc',''),
-                            'email_bcc':  vals.get('email_bcc',''),
-                            'reply_to':  vals.get('reply_to',''),
-                        })
-        return {'value': result}
-
-
     def send_mail(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
diff --git a/addons/mail/wizard/email_compose_message_view.xml b/addons/mail/wizard/email_compose_message_view.xml
index b07b996265c..a2b22306992 100644
--- a/addons/mail/wizard/email_compose_message_view.xml
+++ b/addons/mail/wizard/email_compose_message_view.xml
@@ -10,8 +10,6 @@
                 <form string="Reply Email">
                     <group col="6" colspan="4">
                         <field name="model" invisible="1"/>
-                        <field name="res_id" invisible="context.get('active_model','') != 'ir.ui.menu'"
-                            colspan="4" on_change="on_change_referred_doc(model, res_id, context)"/>
                         <field name="smtp_server_id" widget="selection" colspan="4"/>
                         <field name="email_from" colspan="4" required="1"/>
                         <field name="email_to" colspan="4" required="1"/>

From 8aebdc308c7d66d358694db5cd622cf54dd0ddba Mon Sep 17 00:00:00 2001
From: Bogdan Stanciu <bogdanovidiu.stanciu@gmail.com>
Date: Thu, 7 Apr 2011 17:06:57 +0200
Subject: [PATCH 033/188] [FIX] for bug 753651 cannot select account for bank
 statement

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

bzr revid: bogdanovidiu.stanciu@gmail.com-20110407150657-76j88ckl5y1pd1jd
---
 addons/account/account_bank_statement.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 76ccad9e68a..7a885fb2cad 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -161,6 +161,7 @@ class account_bank_statement(osv.osv):
         'balance_start': _default_balance_start,
         'journal_id': _default_journal_id,
         'period_id': _get_period,
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.bank.statement',context=c),
     }
 
     def onchange_date(self, cr, user, ids, date, context=None):

From 4bdebd3573bc449920c49ec762d67c64783ca953 Mon Sep 17 00:00:00 2001
From: "RME (OpenERP)" <rme@tinyerp.com>
Date: Fri, 8 Apr 2011 12:04:40 +0530
Subject: [PATCH 034/188] [FIX] crm : opportunity list view should having
 'lost' button

bzr revid: rme@tinyerp.com-20110408063440-v81v2xxodtswkzfx
---
 addons/crm/crm_opportunity_view.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 9b87c64483e..0bb90ad6ac8 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -252,6 +252,9 @@
                         <button name="case_close" string="Won"
                             states="open,draft,pending" type="object"
                             icon="gtk-apply" />
+                        <button name="case_cancel" string="Lost"
+                            states="open,draft,pending" type="object"
+                            icon="gtk-cancel" />
                     </tree>
                 </field>
             </record>

From dbf82a8fb4cb0af4f74af5274290bd918c6914c6 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Fri, 8 Apr 2011 12:58:53 +0530
Subject: [PATCH 035/188] [FIX] rename name, descrition field to subject and
 body to remaining modules

bzr revid: rha@tinyerp.com-20110408072853-bhoeuqdfgoqx3tyb
---
 addons/crm_claim/crm_claim_view.xml            |  4 ++--
 .../crm_fundraising/crm_fundraising_view.xml   |  4 ++--
 addons/crm_helpdesk/crm_helpdesk_view.xml      |  4 ++--
 .../wizard/crm_forward_to_partner_view.xml     |  4 ++--
 addons/event/event_view.xml                    |  4 ++--
 .../wizard/email_compose_message.py            | 18 ------------------
 addons/hr_recruitment/hr_recruitment_view.xml  |  4 ++--
 7 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 3c6cc536731..a3bfdc1be02 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -187,13 +187,13 @@
                                             <field name="date"/>
                                             <field name="email_to" widget="char" size="512"/>
                                             <field name="email_cc" widget="char" size="512"/>
-                                            <field name="name" colspan="4" widget="char" size="512"/>
+                                            <field name="subject" colspan="4" widget="char" size="512"/>
                                             <field name="history" invisible="1"/>
                                         </group>
                                         <notebook colspan="4">
                                             <page string="Details">
                                                 <group attrs="{'invisible': [('history', '!=', True)]}">
-                                                    <field name="description" colspan="4" nolabel="1" height="250"/>
+                                                    <field name="body" colspan="4" nolabel="1" height="250"/>
 			                                        <button colspan="4" string="Reply"
 			                                            name="%(mail.action_email_compose_message_wizard)d"
 			                                            context="{'mail':'reply', 'message_id':active_id}"
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index b4c5fceb6e7..8c22caca178 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -178,13 +178,13 @@
                                         <field name="date"/>
                                         <field name="email_to" widget="char" size="512"/>
                                         <field name="email_cc" widget="char" size="512"/>
-                                        <field name="name" colspan="4" widget="char" size="512"/>
+                                        <field name="subject" colspan="4" widget="char" size="512"/>
                                         <field name="history" invisible="1"/>
                                     </group>
                                     <notebook colspan="4">
                                         <page string="Details">
                                             <group attrs="{'invisible': [('history', '!=', True)]}">
-                                                <field name="description" colspan="4" nolabel="1" height="250"/>
+                                                <field name="body" colspan="4" nolabel="1" height="250"/>
 		                                        <button colspan="4" string="Reply"
 		                                            name="%(mail.action_email_compose_message_wizard)d"
 		                                            context="{'mail':'reply', 'message_id':active_id}"
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index fc9a6dc68f6..1479ae78356 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -112,13 +112,13 @@
                                         <field name="date"/>
                                         <field name="email_to" widget="char" size="512"/>
                                         <field name="email_cc" widget="char" size="512"/>
-                                        <field name="name" colspan="4" widget="char" size="512"/>
+                                        <field name="subject" colspan="4" widget="char" size="512"/>
                                         <field name="history" invisible="1"/>
                                     </group>
                                     <notebook colspan="4">
                                         <page string="Details">
                                             <group attrs="{'invisible': [('history', '!=', True)]}">
-                                                <field name="description" colspan="4" nolabel="1" height="250"/>
+                                                <field name="body" colspan="4" nolabel="1" height="250"/>
 		                                        <button colspan="4" string="Reply"
 		                                            name="%(mail.action_email_compose_message_wizard)d"
 		                                            context="{'mail':'reply', 'message_id':active_id}"
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
index 3e30d435025..d47ed3625ba 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
@@ -31,12 +31,12 @@
                         <field name="email_cc" colspan="4"/>
                         <field name="email_bcc" colspan="4"/>
                         <field name="reply_to" colspan="4"/>
-                        <field name="name" colspan="4" widget="char" size="512"/>
+                        <field name="subject" colspan="4" widget="char" size="512"/>
                     </group>
                     <separator string="" colspan="4"/>
                     <notebook colspan="4">
                         <page string="Body">
-                            <field name="description" colspan="4" nolabel="1"/>
+                            <field name="body" colspan="4" nolabel="1"/>
                         </page>
                         <page string="Attachments">
                             <label string="Add here all attachments of the current document you want to include in the Email." colspan="4"/>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index c89be32a049..00289183e3a 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -403,13 +403,13 @@
                                         <field name="date"/>
                                         <field name="email_to" widget="char" size="512"/>
                                         <field name="email_cc" widget="char" size="512"/>
-                                        <field name="name" colspan="4" widget="char" size="512"/>
+                                        <field name="subject" colspan="4" widget="char" size="512"/>
                                         <field name="history" invisible="1"/>
                                     </group>
                                     <notebook colspan="4">
                                         <page string="Details">
                                             <group attrs="{'invisible': [('history', '!=', True)]}">
-                                                <field name="description" colspan="4" nolabel="1" height="250"/>
+                                                <field name="body" colspan="4" nolabel="1" height="250"/>
 		                                        <button colspan="4" string="Reply"
 		                                            name="%(mail.action_email_compose_message_wizard)d"
 		                                            context="{'mail':'reply', 'message_id':active_id}"
diff --git a/addons/hr_evaluation/wizard/email_compose_message.py b/addons/hr_evaluation/wizard/email_compose_message.py
index 40f679f4f53..b5c5b9b49dc 100644
--- a/addons/hr_evaluation/wizard/email_compose_message.py
+++ b/addons/hr_evaluation/wizard/email_compose_message.py
@@ -27,24 +27,6 @@ from tools.translate import _
 class email_compose_message(osv.osv_memory):
     _inherit = 'email.compose.message'
 
-    def _get_records(self, cr, uid, context=None):
-        """
-        Return Records of particular  Model
-        """
-        if context is None:
-            context = {}
-        record_ids = []
-        if context.get('email_model',False) and context.get('email_model') == 'hr.evaluation.interview':
-            model_pool =  self.pool.get(context.get('email_model'))
-            record_ids = model_pool.search(cr, uid, [('state','=','waiting_answer')])
-            return model_pool.name_get(cr, uid, record_ids, context)
-        else:
-            return super(email_compose_message, self)._get_records(cr, uid, context=context)
-
-    _columns = {
-        'res_id':fields.selection(_get_records, 'Referred Document'),
-    }
-
     def get_value(self, cr, uid, model, resource_id, context=None):
         if context is None:
             context = {}
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index a3be7c60263..4e09a965e65 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -157,13 +157,13 @@
                                     <field name="date"/>
                                     <field name="email_to" widget="char" size="512"/>
                                     <field name="email_cc" widget="char" size="512"/>
-                                    <field name="name" colspan="4" widget="char" size="512"/>
+                                    <field name="subject" colspan="4" widget="char" size="512"/>
                                     <field name="history" invisible="1"/>
                                 </group>
                                 <notebook colspan="4">
                                     <page string="Details">
                                         <group attrs="{'invisible': [('history', '!=', True)]}">
-                                            <field name="description" colspan="4" nolabel="1" height="250"/>
+                                            <field name="body" colspan="4" nolabel="1" height="250"/>
 	                                        <button colspan="4" string="Reply"
 	                                            name="%(mail.action_email_compose_message_wizard)d"
 	                                            context="{'mail':'reply', 'message_id':active_id}"

From 0db9b58ef9522f098e177aff63b3af8b260c6f47 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Fri, 8 Apr 2011 16:40:01 +0530
Subject: [PATCH 036/188] [IMP] crm_helpdesk, project_issue, hr_recruitment,
 event, project_planning: inherited email.compose.message in these modules

bzr revid: rha@tinyerp.com-20110408111001-9om0nhd9c9irtwkc
---
 addons/crm_helpdesk/__init__.py               |  1 +
 addons/crm_helpdesk/crm_helpdesk.py           |  1 -
 addons/crm_helpdesk/wizard/__init__.py        | 25 ++++++++++
 .../wizard/email_compose_message.py           | 49 ++++++++++++++++++
 addons/event/event.py                         |  1 -
 addons/event/wizard/__init__.py               |  1 +
 addons/event/wizard/email_compose_message.py  | 49 ++++++++++++++++++
 addons/hr_recruitment/hr_recruitment.py       |  2 -
 addons/hr_recruitment/wizard/__init__.py      |  1 +
 .../wizard/email_compose_message.py           | 50 +++++++++++++++++++
 addons/project_issue/project_issue.py         |  2 -
 addons/project_issue/wizard/__init__.py       | 25 ++++++++++
 .../wizard/email_compose_message.py           | 49 ++++++++++++++++++
 addons/project_planning/__init__.py           |  1 +
 addons/project_planning/wizard/__init__.py    | 24 +++++++++
 .../wizard/email_compose_message.py           | 48 ++++++++++++++++++
 16 files changed, 323 insertions(+), 6 deletions(-)
 create mode 100644 addons/crm_helpdesk/wizard/__init__.py
 create mode 100644 addons/crm_helpdesk/wizard/email_compose_message.py
 create mode 100644 addons/event/wizard/email_compose_message.py
 create mode 100644 addons/hr_recruitment/wizard/email_compose_message.py
 create mode 100644 addons/project_issue/wizard/__init__.py
 create mode 100644 addons/project_issue/wizard/email_compose_message.py
 create mode 100644 addons/project_planning/wizard/__init__.py
 create mode 100644 addons/project_planning/wizard/email_compose_message.py

diff --git a/addons/crm_helpdesk/__init__.py b/addons/crm_helpdesk/__init__.py
index 5d270dbebf8..7dca88af720 100644
--- a/addons/crm_helpdesk/__init__.py
+++ b/addons/crm_helpdesk/__init__.py
@@ -21,6 +21,7 @@
 
 import crm_helpdesk
 import report
+import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index ff503a8fb3e..5fed445bfcb 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -26,7 +26,6 @@ from crm import wizard
 import binascii
 import tools
 
-wizard.email_compose_message.email_model.append('crm.helpdesk')
 CRM_HELPDESK_STATES = (
     crm.AVAILABLE_STATES[2][0], # Cancelled
     crm.AVAILABLE_STATES[3][0], # Done
diff --git a/addons/crm_helpdesk/wizard/__init__.py b/addons/crm_helpdesk/wizard/__init__.py
new file mode 100644
index 00000000000..6e9830a5f3a
--- /dev/null
+++ b/addons/crm_helpdesk/wizard/__init__.py
@@ -0,0 +1,25 @@
+# -*- 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/>.
+#
+##############################################################################
+
+import email_compose_message
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/crm_helpdesk/wizard/email_compose_message.py b/addons/crm_helpdesk/wizard/email_compose_message.py
new file mode 100644
index 00000000000..0b04ca0b31c
--- /dev/null
+++ b/addons/crm_helpdesk/wizard/email_compose_message.py
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-Today 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 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from osv import osv
+from osv import fields
+import tools
+
+class email_compose_message(osv.osv_memory):
+    _inherit = 'email.compose.message'
+
+    def get_value(self, cr, uid, model, resource_id, context=None):
+        if context is None:
+            context = {}
+        result = super(email_compose_message, self).get_value(cr, uid,  model, resource_id, context=context)
+        if model == 'crm.helpdesk' and resource_id:
+            model_obj = self.pool.get(model)
+            data = model_obj.browse(cr, uid , resource_id, context)
+            result.update({
+                    'subject' : data.name or False,
+                    'email_to' : data.email_from or False,
+                    'email_from' : data.user_id and data.user_id.address_id and data.user_id.address_id.email or False,
+                    'body' : '\n' + (tools.ustr(data.user_id.signature or '')),
+                    'email_cc' : tools.ustr(data.email_cc or ''),
+                    'model': model  or False,
+                    'res_id': resource_id  or False,
+                })
+        return result
+
+email_compose_message()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/event/event.py b/addons/event/event.py
index 5e757d02903..e4728677bca 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -27,7 +27,6 @@ from tools.translate import _
 import decimal_precision as dp
 from crm import wizard
 
-wizard.email_compose_message.email_model.append('event.registration')
 
 class event_type(osv.osv):
     """ Event Type """
diff --git a/addons/event/wizard/__init__.py b/addons/event/wizard/__init__.py
index fbc44f417f4..2c04a0f5fcd 100644
--- a/addons/event/wizard/__init__.py
+++ b/addons/event/wizard/__init__.py
@@ -23,4 +23,5 @@ import event_make_invoice
 import event_confirm_registration
 import event_confirm
 import partner_event_registration
+import email_compose_message
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/event/wizard/email_compose_message.py b/addons/event/wizard/email_compose_message.py
new file mode 100644
index 00000000000..8d949255a3f
--- /dev/null
+++ b/addons/event/wizard/email_compose_message.py
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-Today 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 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from osv import osv
+from osv import fields
+import tools
+
+class email_compose_message(osv.osv_memory):
+    _inherit = 'email.compose.message'
+
+    def get_value(self, cr, uid, model, resource_id, context=None):
+        if context is None:
+            context = {}
+        result = super(email_compose_message, self).get_value(cr, uid,  model, resource_id, context=context)
+        if model == 'event.registration' and resource_id:
+            model_obj = self.pool.get(model)
+            data = model_obj.browse(cr, uid , resource_id, context)
+            result.update({
+                    'subject' : data.event_id.name or False,
+                    'email_to' : data.email_from or False,
+                    'email_from' : data.user_id and data.user_id.address_id and data.user_id.address_id.email or False,
+                    'body' : '\n' + (tools.ustr(data.user_id.signature or '')),
+                    'email_cc' : tools.ustr(data.email_cc or ''),
+                    'model': model  or False,
+                    'res_id': resource_id  or False,
+                })
+        return result
+
+email_compose_message()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 24b226f922e..03666878b11 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -31,8 +31,6 @@ import tools
 from tools.translate import _
 from crm import wizard
 
-wizard.email_compose_message.email_model.append('hr.applicant')
-
 AVAILABLE_STATES = [
     ('draft', 'New'),
     ('open', 'In Progress'),
diff --git a/addons/hr_recruitment/wizard/__init__.py b/addons/hr_recruitment/wizard/__init__.py
index acabd219857..607db0a93b4 100644
--- a/addons/hr_recruitment/wizard/__init__.py
+++ b/addons/hr_recruitment/wizard/__init__.py
@@ -23,6 +23,7 @@
 import hr_recruitment_phonecall
 import hr_recruitment_create_partner_job
 import hr_recruitment_employee_hired
+import email_compose_message
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/hr_recruitment/wizard/email_compose_message.py b/addons/hr_recruitment/wizard/email_compose_message.py
new file mode 100644
index 00000000000..9320badb28b
--- /dev/null
+++ b/addons/hr_recruitment/wizard/email_compose_message.py
@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-Today 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 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from osv import osv
+from osv import fields
+import tools
+
+
+class email_compose_message(osv.osv_memory):
+    _inherit = 'email.compose.message'
+
+    def get_value(self, cr, uid, model, resource_id, context=None):
+        if context is None:
+            context = {}
+        result = super(email_compose_message, self).get_value(cr, uid,  model, resource_id, context=context)
+        if model == 'hr.applicant' and resource_id:
+            model_obj = self.pool.get(model)
+            data = model_obj.browse(cr, uid , resource_id, context)
+            result.update({
+                    'subject' : data.name or False,
+                    'email_to' : data.email_from or False,
+                    'email_from' : data.user_id and data.user_id.address_id and data.user_id.address_id.email or False,
+                    'body' : '\n' + (tools.ustr(data.user_id.signature or '')),
+                    'email_cc' : tools.ustr(data.email_cc or ''),
+                    'model': model  or False,
+                    'res_id': resource_id  or False,
+                })
+        return result
+
+email_compose_message()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 11e76f142a1..1d30cfbd74b 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -28,8 +28,6 @@ import time
 import tools
 from crm import wizard
 
-wizard.email_compose_message.email_model.append('project.issue')
-
 class project_issue_version(osv.osv):
     _name = "project.issue.version"
     _order = "name desc"
diff --git a/addons/project_issue/wizard/__init__.py b/addons/project_issue/wizard/__init__.py
new file mode 100644
index 00000000000..51d4faa47d6
--- /dev/null
+++ b/addons/project_issue/wizard/__init__.py
@@ -0,0 +1,25 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 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/>.
+#
+##############################################################################
+
+import email_compose_message
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_issue/wizard/email_compose_message.py b/addons/project_issue/wizard/email_compose_message.py
new file mode 100644
index 00000000000..655f04ad72a
--- /dev/null
+++ b/addons/project_issue/wizard/email_compose_message.py
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-Today 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 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from osv import osv
+from osv import fields
+import tools
+
+class email_compose_message(osv.osv_memory):
+    _inherit = 'email.compose.message'
+
+    def get_value(self, cr, uid, model, resource_id, context=None):
+        if context is None:
+            context = {}
+        result = super(email_compose_message, self).get_value(cr, uid,  model, resource_id, context=context)
+        if model == 'project.issue' and resource_id:
+            model_obj = self.pool.get(model)
+            data = model_obj.browse(cr, uid , resource_id, context)
+            result.update({
+                    'subject' : data.name or False,
+                    'email_to' : data.email_from or False,
+                    'email_from' : data.user_id and data.user_id.address_id and data.user_id.address_id.email or False,
+                    'body' : '\n' + (tools.ustr(data.user_id.signature or '')),
+                    'email_cc' : tools.ustr(data.email_cc or ''),
+                    'model': model  or False,
+                    'res_id': resource_id  or False,
+                })
+        return result
+
+email_compose_message()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_planning/__init__.py b/addons/project_planning/__init__.py
index 3cf91b8b9f7..e664a57cf92 100644
--- a/addons/project_planning/__init__.py
+++ b/addons/project_planning/__init__.py
@@ -21,5 +21,6 @@
 
 import project_planning
 import report
+import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_planning/wizard/__init__.py b/addons/project_planning/wizard/__init__.py
new file mode 100644
index 00000000000..f32421ada61
--- /dev/null
+++ b/addons/project_planning/wizard/__init__.py
@@ -0,0 +1,24 @@
+# -*- 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/>.     
+#
+##############################################################################
+
+import email_compose_message
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_planning/wizard/email_compose_message.py b/addons/project_planning/wizard/email_compose_message.py
new file mode 100644
index 00000000000..ed7ffdd0eb9
--- /dev/null
+++ b/addons/project_planning/wizard/email_compose_message.py
@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-Today 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 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from osv import osv
+from osv import fields
+import tools
+
+class email_compose_message(osv.osv_memory):
+    _inherit = 'email.compose.message'
+
+    def get_value(self, cr, uid, model, resource_id, context=None):
+        if context is None:
+            context = {}
+        result = super(email_compose_message, self).get_value(cr, uid,  model, resource_id, context=context)
+        if model == 'project.task' and resource_id:
+            model_obj = self.pool.get(model)
+            data = model_obj.browse(cr, uid , resource_id, context)
+            result.update({
+                    'subject' : data.name or False,
+                    'email_to' : data.user_id.user_email or False,
+                    'email_from' : data.user_id and data.user_id.address_id and data.user_id.address_id.email or False,
+                    'body' : '\n' + (tools.ustr(data.user_id.signature or '')),
+                    'model': model  or False,
+                    'res_id': resource_id  or False,
+                })
+        return result
+
+email_compose_message()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 53ea40d8e99e3a8a1505edea9695605f839bc4a7 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Mon, 11 Apr 2011 12:30:35 +0530
Subject: [PATCH 037/188] [FIX] hr_timesheet:an employee shouldn't be able to
 see all timesheet line

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

bzr revid: ara@tinyerp.com-20110411070035-rmd3l2a1g3zdfomt
---
 addons/hr_timesheet/__openerp__.py                   |  1 +
 .../hr_timesheet/security/hr_timesheet_security.xml  | 12 ++++++++++++
 addons/hr_timesheet/security/ir.model.access.csv     |  1 +
 3 files changed, 14 insertions(+)
 create mode 100644 addons/hr_timesheet/security/hr_timesheet_security.xml

diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py
index 345f9c92df7..e58d09c296d 100644
--- a/addons/hr_timesheet/__openerp__.py
+++ b/addons/hr_timesheet/__openerp__.py
@@ -44,6 +44,7 @@ to set up a management by affair.
     'init_xml': ['hr_timesheet_data.xml'],
     'update_xml': [
         'security/ir.model.access.csv',
+        'security/hr_timesheet_security.xml',
         'hr_timesheet_view.xml',
         'hr_timesheet_report.xml',
         'hr_timesheet_wizard.xml',
diff --git a/addons/hr_timesheet/security/hr_timesheet_security.xml b/addons/hr_timesheet/security/hr_timesheet_security.xml
new file mode 100644
index 00000000000..6b341e50f4b
--- /dev/null
+++ b/addons/hr_timesheet/security/hr_timesheet_security.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="True">
+
+        <record id="property_rule_timesheet_employee" model="ir.rule">
+            <field name="name">HR Analytic Timesheet</field>
+            <field model="ir.model" name="model_id" ref="model_hr_analytic_timesheet"/>
+            <field name="domain_force">[('user_id', '=', user.id)]</field>
+        </record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/hr_timesheet/security/ir.model.access.csv b/addons/hr_timesheet/security/ir.model.access.csv
index 6e932d4e8f8..ea34aa4ddc4 100644
--- a/addons/hr_timesheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet/security/ir.model.access.csv
@@ -9,3 +9,4 @@
 "access_account_fiscalyear_hr_user","account.account.fiscalyear.user","account.model_account_fiscalyear","base.group_hr_user",1,1,1,1
 "hr.access_account_journal_view_hruser","account.journal.view hruser","account.model_account_journal_view","base.group_hr_user",1,0,0,0
 "hr.access_account_journal_column_hruser","account.journal.column hruser","account.model_account_journal_column","base.group_hr_user",1,0,0,0
+"access_hr_analytic_timesheet_user","hr.analytic.timesheet.user","model_hr_analytic_timesheet","base.group_user",1,0,0,0
\ No newline at end of file

From fbad6f6767e0392022760c5fa7dd9a3998be7a24 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Mon, 11 Apr 2011 17:40:32 +0530
Subject: [PATCH 038/188] [IMP] email.compose.message: mass mailing * created a
 method do_mass_mail() for mass maining * improvements for mass mailing in
 case of template, took the value from wizard and evaluated using mako
 template

bzr revid: rha@tinyerp.com-20110411121032-j4u2ao710vc1dt8k
---
 addons/mail/wizard/email_compose_message.py | 36 +++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/addons/mail/wizard/email_compose_message.py b/addons/mail/wizard/email_compose_message.py
index 375611bfae1..fb2ce69ce87 100644
--- a/addons/mail/wizard/email_compose_message.py
+++ b/addons/mail/wizard/email_compose_message.py
@@ -151,9 +151,45 @@ class email_compose_message(osv.osv_memory):
     def send_mail(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
+
+        record = self.browse(cr, uid, ids[0], context=context)
+        if context.get('mass_mail') and context['active_ids'] and context.get('template_id'):
+            email_message_pool = self.pool.get('email.message')
+            email_temp_pool = self.pool.get('email.template')
+            for res_id in context['active_ids']:
+                subject = email_temp_pool.get_template_value(cr, uid, record.subject, context['active_model'], res_id)
+                body = email_temp_pool.get_template_value(cr, uid, record.body, context['active_model'], res_id)
+                email_to = email_temp_pool.get_template_value(cr, uid, record.email_to, context['active_model'], res_id)
+                email_from = email_temp_pool.get_template_value(cr, uid, record.email_from, context['active_model'], res_id)
+                email_cc = email_temp_pool.get_template_value(cr, uid, record.email_cc, context['active_model'], res_id)
+                reply_to = email_temp_pool.get_template_value(cr, uid, record.reply_to, context['active_model'], res_id)
+
+                email_id = email_message_pool.schedule_with_attach(cr, uid, email_from,
+                           email_to, subject or False, body or False, context['active_model'], email_cc or False, openobject_id=int(res_id),
+                           context=context)
+            return {'type': 'ir.actions.act_window_close'}
+
+        if context.get('mass_mail') and context.get('active_ids') and not context.get('template_id'):
+            self.do_mass_mail(cr, uid, context['active_ids'], record.subject or False, record.body or False, context=context)
+            return {'type': 'ir.actions.act_window_close'}
+
         email_id = self.save_to_mailbox(cr, uid, ids, context)
         return {'type': 'ir.actions.act_window_close'}
 
+    def do_mass_mail(self, cr, uid, ids, subject, body, context=None):
+        if context is None:
+            context = {}
+
+        if context.get('active_model'):
+            email_message_pool = self.pool.get('email.message')
+            model_pool = self.pool.get(context['active_model'])
+            for data in model_pool.browse(cr, uid, ids, context=context):
+                email_id = email_message_pool.schedule_with_attach(cr, uid,
+                    data.user_id and data.user_id.address_id and data.user_id.address_id.email or False,
+                    data.email_from or False, subject, body, model=context['active_model'],
+                    email_cc=tools.ustr(data.email_cc or ''), openobject_id=int(data.id), context=context)
+        return True
+
     def save_to_mailbox(self, cr, uid, ids, context=None):
         email_ids = []
         email_message_pool = self.pool.get('email.message')

From 2e138b0d0d65e691bd324e3c9f072f5b9c3ef844 Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Tue, 12 Apr 2011 10:26:42 +0530
Subject: [PATCH 039/188] [FIX] : Fixed partner label report bug.

bzr revid: uco@tinyerp.com-20110412045642-d2gpgoyzmi00glio
---
 openerp/addons/base/res/partner/report/partner_address.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/res/partner/report/partner_address.xml b/openerp/addons/base/res/partner/report/partner_address.xml
index a6865f88153..2a413f4e3c6 100644
--- a/openerp/addons/base/res/partner/report/partner_address.xml
+++ b/openerp/addons/base/res/partner/report/partner_address.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <addresses>
     <address type="fields" name="id">
-        <company-title type="field" name="title"/>
+        <company-title type="field" name="title.name"/>
         <company-name type="field" name="name"/>
         <contact type="zoom" name="address">
             <type type="field" name="type"/>
-            <title type="field" name="title"/>
+            <title type="field" name="title.name"/>
             <name type="field" name="name"/>
             <street type="field" name="street"/>
             <street2 type="field" name="street2"/>

From bc708c8b963be2540ba39e86e16d184c1158d0aa Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 12 Apr 2011 14:48:20 +0530
Subject: [PATCH 040/188] [REVIEW] remove passing email_model and email_res_id
 into context

bzr revid: hmo@tinyerp.com-20110412091820-t9wjrzetr814soeg
---
 addons/crm/crm_lead_view.xml                          | 2 --
 addons/crm/crm_opportunity_view.xml                   | 2 --
 addons/crm_claim/crm_claim_view.xml                   | 1 -
 addons/crm_fundraising/crm_fundraising_view.xml       | 1 -
 addons/crm_helpdesk/crm_helpdesk_view.xml             | 1 -
 addons/email_template/email_template.py               | 2 +-
 addons/email_template/wizard/email_compose_message.py | 2 +-
 addons/event/event_view.xml                           | 1 -
 addons/hr_recruitment/hr_recruitment_view.xml         | 1 -
 addons/project_issue/project_issue_view.xml           | 1 -
 addons/project_planning/project_planning_view.xml     | 2 +-
 addons/project_scrum/project_scrum_view.xml           | 2 +-
 12 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index dea5e58394c..59b482e978f 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -108,7 +108,6 @@
                         <field name="email_from" widget="email"/>
                         <button string="Send Email"
                             name="%(mail.action_email_compose_message_wizard)d"
-                            context="{'email_model':'crm.lead', 'email_res_id': active_id}"
                             icon="terp-mail-message-new" type="action" colspan="1"/>
                         <newline/>
                         <field name="phone"/>
@@ -227,7 +226,6 @@
                         icon="terp-document-new" type="action" />
                     <button string="Send New Email"
                         name="%(mail.action_email_compose_message_wizard)d"
-                        context="{'email_model':'crm.lead', 'email_res_id': active_id}"
                         icon="terp-mail-message-new" type="action"/>
                  </page>
                 </notebook>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 0fb45b99ef3..9f5fa7429d6 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -61,7 +61,6 @@
                                     <field name="email_from" string="Email" />
                                     <button string="Send Email"
                                         name="%(mail.action_email_compose_message_wizard)d"
-                                        context="{'email_model': 'crm.lead', 'email_res_id': active_id}"
                                         icon="terp-mail-message-new" type="action"/>
                                 </group>
                                 <field name="phone"/>
@@ -183,7 +182,6 @@
                                 icon="terp-document-new" type="action" />
 		                    <button string="Send New Email"
 		                        name="%(mail.action_email_compose_message_wizard)d"
-		                        context="{'email_model': 'crm.lead', 'email_res_id': active_id}"
 		                        icon="terp-mail-message-new" type="action"/>
                         </page>
                         <page string="Extra Info" groups="base.group_extended">
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index a3bfdc1be02..6b1d35eb785 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -215,7 +215,6 @@
                                     icon="terp-document-new" type="action" />
 			                    <button string="Send New Email"
 			                        name="%(mail.action_email_compose_message_wizard)d"
-			                        context="{'email_model':'crm.claim', 'email_res_id': active_id}"
 			                        icon="terp-mail-message-new" type="action"/>
                             </page>
                         </notebook>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 8c22caca178..aa154e89b72 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -206,7 +206,6 @@
                                 icon="terp-document-new" type="action" />
 		                    <button string="Send New Email"
 		                        name="%(mail.action_email_compose_message_wizard)d"
-		                        context="{'email_model':'crm.fundraising', 'email_res_id': active_id}"
 		                        icon="terp-mail-message-new" type="action"/>
                         </page>
                         <page string="Extra Info" groups="base.group_extended">
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 1479ae78356..f834f798f3e 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -140,7 +140,6 @@
                                 icon="terp-document-new" type="action" />
 		                    <button string="Send New Email"
 		                        name="%(mail.action_email_compose_message_wizard)d"
-		                        context="{'email_model':'crm.helpdesk', 'email_res_id': active_id}"
 		                        icon="terp-mail-message-new" type="action"/>
                         </page>
                         <page string="Extra Info" groups="base.group_extended">
diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 476174db32f..af0589b3282 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -183,7 +183,7 @@ This is useful for CRM leads for example"),
                  'res_model': 'email.compose.message',
                  'src_model': src_obj,
                  'view_type': 'form',
-                 'context': "{'email_model':'%s', 'email_res_id': active_id,'template_id':'%d','src_rec_id':active_id,'src_rec_ids':active_ids}" % (src_obj, template.id),
+                 'context': "{'template_id':'%d','src_rec_id':active_id,'src_rec_ids':active_ids}" % (src_obj, template.id),
                  'view_mode':'form,tree',
                  'view_id': res_id,
                  'target': 'new',
diff --git a/addons/email_template/wizard/email_compose_message.py b/addons/email_template/wizard/email_compose_message.py
index 2fcc158a333..db15b3172b6 100644
--- a/addons/email_template/wizard/email_compose_message.py
+++ b/addons/email_template/wizard/email_compose_message.py
@@ -40,7 +40,7 @@ class email_compose_message(osv.osv_memory):
                 if len(context.get('src_rec_ids',[])) > 1: # Multiple Mail: Gets original template values for multiple email change
                     return getattr(template, field)
                 else: # Simple Mail: Gets computed template values
-                    return template_pool.get_template_value(cr, uid, getattr(template, field), template.model, context.get('email_res_id'), context)
+                    return template_pool.get_template_value(cr, uid, getattr(template, field), template.model, context.get('active_id'), context)
             result.update({
                     'template_id' : template.id,
                     'smtp_server_id' : template.smtp_server_id.id,
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 00289183e3a..d2fc260909e 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -431,7 +431,6 @@
                                 icon="terp-document-new" type="action" />
 		                    <button string="Send New Email"
 		                        name="%(mail.action_email_compose_message_wizard)d"
-		                        context="{'email_model':'event.registration', 'email_res_id': active_id}"
 		                        icon="terp-mail-message-new" type="action"/>
                            </page>
                     </notebook>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 4e09a965e65..703e24eeb17 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -185,7 +185,6 @@
                                 icon="terp-document-new" type="action" />
 	                    <button string="Send New Email"
 	                        name="%(mail.action_email_compose_message_wizard)d"
-	                        context="{'email_model': 'hr.applicant', 'email_res_id': active_id}"
 	                        icon="terp-mail-message-new" type="action"/>
                  </page>
                  <page string="Notes">
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 5fed2baceed..86baa45b2f4 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -142,7 +142,6 @@
                                 icon="terp-document-new" type="action" />
 		                    <button string="Send New Email"
 		                        name="%(mail.action_email_compose_message_wizard)d"
-		                        context="{'email_model':'project.issue', 'email_res_id': active_id}"
 		                        icon="terp-mail-message-new" type="action"/>
                         </page>
                            <page string="Extra Info" groups="base.group_extended">
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index 3aac5c7f466..016a10d940f 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -109,7 +109,7 @@
                                                         <button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert"/>
                                                         <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
                                                         <button groups="base.group_extended" name="%(project.action_project_task_delegate)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
-                                                        <button name="%(mail.action_email_compose_message_wizard)d" context="{'email_model':'project.task', 'email_res_id': active_id}" states="pending,open" string="Done" type="action" icon="gtk-jump-to"/>
+                                                        <button name="%(mail.action_email_compose_message_wizard)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to"/>
                                                     </group>
                                                  </page>
                                                 <page groups="base.group_extended" string="Extra Info" attrs="{'readonly':[('state','=','done')]}">
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 014d920d83d..78ff529b240 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -398,7 +398,7 @@
                         <field name="user_id"/>
                         <button name="%(mail.action_email_compose_message_wizard)d"
                                 string="Send Email" type="action" icon="terp-mail-message-new"
-                                context="{'email_model': 'project.scrum.meeting', 'email_res_id': active_id}"/>
+                        />
                     </group>
                     <notebook colspan="4">
                         <page string="Scrum Meeting">

From cf91e73c54db777f9d6ba3754e2c81f589d9b463 Mon Sep 17 00:00:00 2001
From: "pso (OpenERP)" <pso@tinyerp.com>
Date: Tue, 12 Apr 2011 14:51:15 +0530
Subject: [PATCH 041/188] [FIX] hr_timesheet_invoice: Fixed bug of recreating
 invoice if invoice already exists

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

bzr revid: pso@tinyerp.com-20110412092115-nz5zelrazbk3og7y
---
 .../wizard/hr_timesheet_invoice_create.py         | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index 33c23140358..ee66cc045b0 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -47,6 +47,21 @@ class hr_timesheet_invoice_create(osv.osv_memory):
          'name': lambda *args: 1
     }
 
+    def view_init(self, cr, uid, fields, context=None):
+        """
+        This function checks for precondition before wizard executes
+        @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 fields: List of fields for default value
+        @param context: A standard dictionary for contextual values
+        """
+        analytic_obj = self.pool.get('account.analytic.line')
+        data = context and context.get('active_ids', [])
+        for analytic in analytic_obj.browse(cr, uid, data, context=context):
+            if analytic.invoice_id:
+                     raise osv.except_osv(_('Warning !'), _("Invoice is already linked to some of the analytic line(s)!"))
+
     def do_create(self, cr, uid, ids, context=None):
         mod_obj = self.pool.get('ir.model.data')
         analytic_account_obj = self.pool.get('account.analytic.account')

From d94a7aa661eb9c2587b6d092743f7ca2bf263bdf Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 13 Apr 2011 16:13:31 +0530
Subject: [PATCH 042/188] [ADD]crm_helpdesk: Add filter on write date of crm
 helpdesk module.

bzr revid: atp@tinyerp.com-20110413104331-5tr4p052t8jj9tpc
---
 addons/crm_helpdesk/crm_helpdesk_view.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 19fe23d3f5c..eaa43d286bb 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -148,6 +148,7 @@
                             <group colspan="2" col="2">
                                 <separator colspan="4" string="Dates"/>
                                 <field name="create_date"/>
+                                <field name="write_date"/>
                                 <field name="date_closed"/>
                             </group>
                             <group colspan="2" col="2">
@@ -254,6 +255,10 @@
                             help="My Sales Team(s)" />
                     </field>
                     <newline/>
+					<group  expand="0" string="Extended Filters..." groups="base.group_extended">
+                            <field name="write_date" string="Updated Date"/>
+                    </group>
+                    <newline/>                         
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner"
                             domain="[]" help="Partner"

From e2c7bfc88cf603e8a73b3638b09f32a3aa639ba7 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Wed, 13 Apr 2011 17:06:33 +0530
Subject: [PATCH 043/188] [FIX] email.compose.message: set signature and
 auto_delete on change of template

bzr revid: rha@tinyerp.com-20110413113633-un3xkrbhlfaof585
---
 addons/email_template/wizard/email_compose_message.py | 9 ++++++---
 addons/mail/wizard/email_compose_message.py           | 3 ++-
 addons/mail/wizard/email_compose_message_view.xml     | 1 +
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/addons/email_template/wizard/email_compose_message.py b/addons/email_template/wizard/email_compose_message.py
index 4ca04b2d154..4086a4b1aee 100644
--- a/addons/email_template/wizard/email_compose_message.py
+++ b/addons/email_template/wizard/email_compose_message.py
@@ -139,12 +139,15 @@ class email_compose_message(osv.osv_memory):
             vals.update(self.get_template_data(cr, uid, resource_id, template_id, context))
         else:
             vals.update({'attachment_ids' : []})
+
         email_temp_pool = self.pool.get('email.template')
-        if context.get('active_model') and context.get('active_id') and email_temp_pool.browse(cr, uid, template_id, context=context).user_signature:
+        template_data = email_temp_pool.browse(cr, uid, template_id, context=context)
+        vals.update({'auto_delete': template_data.auto_delete})
+        if context.get('active_model') and context.get('active_id') and template_data.user_signature:
             model_pool = self.pool.get(context['active_model'])
             user = model_pool.browse(cr, uid, context['active_id'], context=context).user_id
-            signature = user and user.signature
-            vals['body'] = _('%s\n%s') %(vals['body'], signature or '')
+            signature = user and user.signature or ''
+            vals['body'] = vals['body'] + '\n' + signature
         return {'value': vals}
 
 email_compose_message()
diff --git a/addons/mail/wizard/email_compose_message.py b/addons/mail/wizard/email_compose_message.py
index 3f528f4732e..4f6e810ac28 100644
--- a/addons/mail/wizard/email_compose_message.py
+++ b/addons/mail/wizard/email_compose_message.py
@@ -207,7 +207,8 @@ class email_compose_message(osv.osv_memory):
             email_id = email_message_pool.schedule_with_attach(cr, uid, mail.email_from, mail.email_to, mail.subject, mail.body,
                     model=mail.model, email_cc=mail.email_cc, email_bcc=mail.email_bcc, reply_to=mail.reply_to,
                     attach=attachment, message_id=message_id, references=references, openobject_id=int(mail.res_id),
-                    subtype=mail.sub_type, x_headers=mail.headers, priority=mail.priority, smtp_server_id=mail.smtp_server_id and mail.smtp_server_id.id, context=context)
+                    subtype=mail.sub_type, x_headers=mail.headers, priority=mail.priority, smtp_server_id=mail.smtp_server_id and mail.smtp_server_id.id,
+                    auto_delete=mail.auto_delete or False, context=context)
             email_ids.append(email_id)
         return email_ids
 
diff --git a/addons/mail/wizard/email_compose_message_view.xml b/addons/mail/wizard/email_compose_message_view.xml
index 71fe82fb7e6..92d2ed35594 100644
--- a/addons/mail/wizard/email_compose_message_view.xml
+++ b/addons/mail/wizard/email_compose_message_view.xml
@@ -17,6 +17,7 @@
                         <field name="email_bcc" colspan="4"/>
                         <field name="reply_to" colspan="4"/>
                         <field name="subject" colspan="4" widget="char" size="512"/>
+                        <field name="auto_delete" colspan="4" invisible="1"/>
                     </group>
                     <separator string="" colspan="4"/>
                     <notebook colspan="4">

From 2f2a489e0a2b3141a7b10bbb2c4c5d546f02145f Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Wed, 13 Apr 2011 19:07:27 +0530
Subject: [PATCH 044/188] [REVIEW] clean compose wizard with template

bzr revid: hmo@tinyerp.com-20110413133727-b2ghap9v5zjmnk9k
---
 .../wizard/email_compose_message.py           | 114 +++++-------------
 1 file changed, 29 insertions(+), 85 deletions(-)

diff --git a/addons/email_template/wizard/email_compose_message.py b/addons/email_template/wizard/email_compose_message.py
index 177d7f035b6..ed42c1788b5 100644
--- a/addons/email_template/wizard/email_compose_message.py
+++ b/addons/email_template/wizard/email_compose_message.py
@@ -28,82 +28,40 @@ class email_compose_message(osv.osv_memory):
     _name = 'email.compose.message'
     _inherit = 'email.compose.message'
 
-    def get_template_data(self, cr, uid, res_id, template_id, context=None):
-        if context is None:
-            context = {}
+    def get_template_data(self, cr, uid, template_id, context=None):
         result = {}
-        template_pool = self.pool.get('email.template')
-        if template_id:
-            template = template_pool.get_email_template(cr, uid, template_id=template_id, context=context)
-            def _get_template_value(field):
-                if not template:
-                    return False
-                if len(context.get('src_rec_ids',[])) > 1: # Multiple Mail: Gets original template values for multiple email change
-                    return getattr(template, field)
-                else: # Simple Mail: Gets computed template values
-                    return template_pool.get_template_value(cr, uid, getattr(template, field), template.model, context.get('active_id'), context)
-            result.update({
-                    'template_id' : template.id,
-                    'smtp_server_id' : template.smtp_server_id.id,
-                    'body' : _get_template_value('body') or False,
-                    'subject' : _get_template_value('subject') or False,
-                    'attachment_ids' : template_pool.read(cr, uid, template.id, ['attachment_ids'])['attachment_ids'] or [],
-                    'res_id' : res_id or False,
-                    'email_to' : _get_template_value('email_to') or False,
-                    'email_cc' : _get_template_value('email_cc') or False,
-                    'email_bcc' : _get_template_value('email_bcc') or False,
-                    'reply_to' : _get_template_value('reply_to') or False,
-                    'model' : template.model or False,
-                })
-        return result
-
-    def default_get(self, cr, uid, fields, context=None):
+        if not template_id: 
+            return result
         if context is None:
             context = {}
-        result = super(email_compose_message, self).default_get(cr, uid, fields, context=context)
-        template_id = context.get('template_id', False)
-        vals = {}
-        if template_id and context.get('active_model') and context.get('active_id'):
-            vals = self.get_template_data(cr, uid, context.get('active_id'), template_id, context)
 
-        if not vals:
-            return result
+        template_pool = self.pool.get('email.template')
+        resource_id = context.get('active_id')
+        template = template_pool.get_email_template(cr, uid, template_id=template_id, context=context)
 
-        if 'template_id' in fields:
-            result.update({'template_id' : vals.get('template_id', False)})
+        def _get_template_value(field):
+            if context.get('mass_mail',False): # Multiple Mail: Gets original template values for multiple email change
+                return getattr(template, field)
+            else
+                return self.get_template_value(cr, uid, getattr(template, field), template.model, resource_id, context=context)
 
-        if 'smtp_server_id' in fields:
-            result.update({'smtp_server_id' : vals.get('smtp_server_id', False)})
-
-        if 'attachment_ids' in fields:
-            result.update({'attachment_ids' : vals.get('attachment_ids', False)})
-
-        if 'model' in fields:
-            result.update({'model' : vals.get('model', False)})
-
-        if 'res_id' in fields:
-            result.update({'res_id' : vals.get('res_id', False)})
-
-        if 'email_to' in fields:
-            result.update({'email_to' : vals.get('email_to', False)})
-
-        if 'email_cc' in fields:
-            result.update({'email_cc' : vals.get('email_cc', False)})
-
-        if 'email_bcc' in fields:
-            result.update({'email_bcc' : vals.get('email_bcc', False)})
-
-        if 'subject' in fields:
-            result.update({'subject' : vals.get('name', False)})
-
-        if 'body' in fields:
-            result.update({'body' : vals.get('body', False)})
-
-        if 'reply_to' in fields:
-            result.update({'reply_to' : vals.get('reply_to', False)})
 
+        result.update({
+                'template_id' : template.id,
+                'smtp_server_id' : template.smtp_server_id.id,
+                'body' : _get_template_value('body') or False,
+                'subject' : _get_template_value('subject') or False,
+                'attachment_ids' : template_pool.read(cr, uid, template.id, ['attachment_ids'])['attachment_ids'] or [],
+                'res_id' : resource_id or False,
+                'email_to' : _get_template_value('email_to') or False,
+                'email_cc' : _get_template_value('email_cc') or False,
+                'email_bcc' : _get_template_value('email_bcc') or False,
+                'reply_to' : _get_template_value('reply_to') or False,
+                'model' : template.model or False,
+            })
         return result
 
+
     def _get_templates(self, cr, uid, context=None):
         """
         Return Email Template of particular  Model.
@@ -132,27 +90,13 @@ class email_compose_message(osv.osv_memory):
         template_pool = self.pool.get('email.template')
         return template_pool.get_template_value(cr, uid, message, model, resource_id, context)
 
-    def on_change_template(self, cr, uid, ids, model, template_id, context=None):
+    def on_change_template(self, cr, uid, template_id, context=None):
         if context is None:
             context = {}
-        if context.get('mail') == 'reply':
-            return {'value':{}}
-        vals = {}
+        
         resource_id = context.get('active_id', False)
-        if template_id and resource_id:
-            vals.update(self.get_template_data(cr, uid, resource_id, template_id, context))
-        else:
-            vals.update({'attachment_ids' : []})
-
-        email_temp_pool = self.pool.get('email.template')
-        template_data = email_temp_pool.browse(cr, uid, template_id, context=context)
-        vals.update({'auto_delete': template_data.auto_delete})
-        if context.get('active_model') and context.get('active_id') and template_data.user_signature:
-            model_pool = self.pool.get(context['active_model'])
-            user = model_pool.browse(cr, uid, context['active_id'], context=context).user_id
-            signature = user and user.signature or ''
-            vals['body'] = vals['body'] + '\n' + signature
-        return {'value': vals}
+        
+        return self.get_template_data(cr, uid, resource_id, template_id, context)
 
 email_compose_message()
 

From db89a49fa0ea73f4cfe116fa79a4bea1e9bbb6e5 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Thu, 14 Apr 2011 10:25:03 +0530
Subject: [PATCH 045/188] [FIX] email_template: fix on_change_template

bzr revid: rha@tinyerp.com-20110414045503-t1l81wx5n72ixa85
---
 .../wizard/email_compose_message.py           | 26 +++++++++----------
 .../wizard/email_compose_message_view.xml     |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/addons/email_template/wizard/email_compose_message.py b/addons/email_template/wizard/email_compose_message.py
index 4086a4b1aee..8ec86f3f975 100644
--- a/addons/email_template/wizard/email_compose_message.py
+++ b/addons/email_template/wizard/email_compose_message.py
@@ -35,6 +35,7 @@ class email_compose_message(osv.osv_memory):
         template_pool = self.pool.get('email.template')
         if template_id:
             template = template_pool.get_email_template(cr, uid, template_id=template_id, context=context)
+
             def _get_template_value(field):
                 if not template:
                     return False
@@ -42,10 +43,18 @@ class email_compose_message(osv.osv_memory):
                     return getattr(template, field)
                 else: # Simple Mail: Gets computed template values
                     return template_pool.get_template_value(cr, uid, getattr(template, field), template.model, context.get('active_id'), context)
+
+            body = _get_template_value('body') or False
+            if context.get('active_model') and context.get('active_id') and template.user_signature:
+                model_pool = self.pool.get(context['active_model'])
+                user = model_pool.browse(cr, uid, context['active_id'], context=context).user_id
+                signature = user and user.signature or ''
+                body = body + '\n' + signature
+
             result.update({
                     'template_id' : template.id,
                     'smtp_server_id' : template.smtp_server_id.id,
-                    'body' : _get_template_value('body') or False,
+                    'body' : body,
                     'subject' : _get_template_value('subject') or False,
                     'attachment_ids' : template_pool.read(cr, uid, template.id, ['attachment_ids'])['attachment_ids'] or [],
                     'res_id' : res_id or False,
@@ -54,6 +63,7 @@ class email_compose_message(osv.osv_memory):
                     'email_bcc' : _get_template_value('email_bcc') or False,
                     'reply_to' : _get_template_value('reply_to') or False,
                     'model' : template.model or False,
+                    'auto_delete': template.auto_delete
                 })
         return result
 
@@ -128,26 +138,16 @@ class email_compose_message(osv.osv_memory):
         'template_id': fields.selection(_get_templates, 'Template'),
     }
 
-    def on_change_template(self, cr, uid, ids, model, template_id, context=None):
+    def on_change_template(self, cr, uid, ids, template_id, context=None):
         if context is None:
             context = {}
-        if context.get('mail') == 'reply':
-            return {'value':{}}
         vals = {}
         resource_id = context.get('active_id', False)
         if template_id and resource_id:
-            vals.update(self.get_template_data(cr, uid, resource_id, template_id, context))
+            vals.update(self.get_template_data(cr, uid, resource_id, template_id, context=context))
         else:
             vals.update({'attachment_ids' : []})
 
-        email_temp_pool = self.pool.get('email.template')
-        template_data = email_temp_pool.browse(cr, uid, template_id, context=context)
-        vals.update({'auto_delete': template_data.auto_delete})
-        if context.get('active_model') and context.get('active_id') and template_data.user_signature:
-            model_pool = self.pool.get(context['active_model'])
-            user = model_pool.browse(cr, uid, context['active_id'], context=context).user_id
-            signature = user and user.signature or ''
-            vals['body'] = vals['body'] + '\n' + signature
         return {'value': vals}
 
 email_compose_message()
diff --git a/addons/email_template/wizard/email_compose_message_view.xml b/addons/email_template/wizard/email_compose_message_view.xml
index 0a99d2af5e9..a2776662e0d 100644
--- a/addons/email_template/wizard/email_compose_message_view.xml
+++ b/addons/email_template/wizard/email_compose_message_view.xml
@@ -10,7 +10,7 @@
             <field name="arch" type="xml">
 	            <field name="model" position="after">
 	                <field name="template_id" colspan="4"
-	                    on_change="on_change_template(model, template_id, context)"/>
+	                    on_change="on_change_template(template_id, context)"/>
 	            </field>
             </field>
         </record>

From 31bcd2588fb89eb67533781fff36e8326b07f628 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 14 Apr 2011 12:53:04 +0530
Subject: [PATCH 046/188] [FIX]: crm: Fixed missing functionalities for "Allow
 unlink" in case sections

bzr revid: rpa@tinyerp.com-20110414072304-cqvsezoeb5g20182
---
 addons/crm/crm.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index f25e4c1a0bf..7014fd77517 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -199,6 +199,13 @@ class crm_case(object):
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         return user.context_section_id.id or False
 
+    def unlink(self, cr, uid, ids, context={}):
+        for case in self.browse(cr, uid, ids, context):
+            if (not case.section_id.allow_unlink) and (case.state <> 'draft'):
+                raise osv.except_osv(_('Warning !'),
+                    _('You can not delete this case. You should better cancel it.'))
+        return super(crm_case, self).unlink(cr, uid, ids, context)
+
     def _find_next_stage(self, cr, uid, stage_list, index, current_seq, stage_pool, context=None):
         if index + 1 == len(stage_list):
             return False

From b0b547ef77e5cbf1b1e132f231acbea595e36bea Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 14 Apr 2011 12:53:51 +0530
Subject: [PATCH 047/188] [IMP]: crm: Meeting recurrency option, Way to end
 reccurency, End date, then field "Repeat Until" must be set as required

bzr revid: rpa@tinyerp.com-20110414072351-7ya4vrw3tofxywc3
---
 addons/crm/crm_meeting_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index aba69889f57..70104403f23 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -179,7 +179,7 @@
                                 <field name="count" attrs="{'invisible' : [('end_type', '!=', 'count')] }"/>
                                 <label string=" " colspan="2" />
                                 <newline />
-                                <field name="end_date" attrs="{'invisible' : [('end_type', '!=', 'end_date')] }"/>
+                                <field name="end_date" attrs="{'invisible' : [('end_type', '!=', 'end_date')], 'required': [('end_type', '=', 'end_date')]}"/>
                                 <newline />
                            
                       

From 077d56f53e70f1d2c80b73213c4bd7710c4f1912 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 14 Apr 2011 12:57:16 +0530
Subject: [PATCH 048/188] [FIX]: crm: Fixed computation of repeat Until, if I
 set 15th as until date, it must include 15th , but it was taking meetings
 till 14th only

bzr revid: rpa@tinyerp.com-20110414072716-q4ao5c2iczas19f6
---
 addons/base_calendar/base_calendar.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 9693a0d5c0f..095a1654991 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1296,7 +1296,7 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
                         if name == "UNTIL":
                             is_until = True
                             value = parser.parse(value)
-                            rrule_until_date = parser.parse(value.strftime("%Y-%m-%d"))
+                            rrule_until_date = parser.parse(value.strftime("%Y-%m-%d %H:%M:%S"))
                             if until_date and until_date >= rrule_until_date:
                                 until_date = rrule_until_date
                             if until_date:

From ba121d110d30d9932b7d1c1695f4c3e6b0051633 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 14 Apr 2011 12:58:30 +0530
Subject: [PATCH 049/188] [IMP]: caldav: Added button in the wizard

bzr revid: rpa@tinyerp.com-20110414072830-1x4ofwu90s0ldwzd
---
 addons/caldav/wizard/caldav_browse_view.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/caldav/wizard/caldav_browse_view.xml b/addons/caldav/wizard/caldav_browse_view.xml
index 0a7e6269fe2..53af6029883 100644
--- a/addons/caldav/wizard/caldav_browse_view.xml
+++ b/addons/caldav/wizard/caldav_browse_view.xml
@@ -15,8 +15,10 @@
                         <separator string="Description" colspan="4"/>
                         <field name="description"  colspan="4"  nolabel="1"/>
                         <separator colspan="4"/>
-                       
-                        
+                      <group col="4" colspan="4">
+                        <label string="" colspan="2"/>
+                        <button special="cancel" string="_Close" icon="gtk-close"/>
+                      </group>
                     </group>
                 </form>
             </field>

From e8e8c3bd44e023e569f28f3a4cb8c1e3300cae8c Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Thu, 14 Apr 2011 13:06:11 +0530
Subject: [PATCH 050/188] [FIX] account : Fixes the integrity problem when
 remove the sequence id in jounral

bzr revid: amp@tinyerp.com-20110414073611-e870z2bc1g5qrsrp
---
 addons/account/account_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index bab2f43060f..e0a355c35bf 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -454,7 +454,7 @@
                             </group>
                             <group colspan="2" col="2" groups="base.group_extended">
                                 <separator string="Sequence" colspan="4"/>
-                                <field name="sequence_id" required="0"/>
+                                <field name="sequence_id"/>
                             </group>
                         </page>
                         <page string="Entry Controls" groups="base.group_extended">

From 39d0932dfab7f6735f4b43fd1d1f1d5fbafb3e90 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 14 Apr 2011 15:05:40 +0530
Subject: [PATCH 051/188] [FIX]: purchase: Fixed invoiced rate for purchase
 order

bzr revid: rpa@tinyerp.com-20110414093540-lv5x998zs3cv770b
---
 addons/purchase/purchase.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 6f6ab0c1b44..324fe130f81 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -98,7 +98,7 @@ class purchase_order(osv.osv):
             tot = 0.0
             for invoice in purchase.invoice_ids:
                 if invoice.state not in ('draft','cancel'):
-                    tot += invoice.amount_untaxed
+                    tot += (invoice.amount_untaxed - invoice.residual)
             if purchase.amount_untaxed:
                 res[purchase.id] = tot * 100.0 / purchase.amount_untaxed
             else:

From ec90de83c38dd6154065ec3c86e26192b7e91345 Mon Sep 17 00:00:00 2001
From: "pso (OpenERP)" <pso@tinyerp.com>
Date: Thu, 14 Apr 2011 15:10:54 +0530
Subject: [PATCH 052/188] [IMP] Usability Improvements

bzr revid: pso@tinyerp.com-20110414094054-q9yxjhj1nmjid027
---
 addons/account_payment/account_payment.py | 2 +-
 addons/hr_attendance/hr_attendance.py     | 4 ++--
 addons/point_of_sale/point_of_sale.py     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py
index f3259f846cc..8437622e93e 100644
--- a/addons/account_payment/account_payment.py
+++ b/addons/account_payment/account_payment.py
@@ -328,7 +328,7 @@ class payment_line(osv.osv):
             required=True, help='Payment amount in the partner currency'),
         'currency': fields.many2one('res.currency','Partner Currency', required=True),
         'company_currency': fields.many2one('res.currency', 'Company Currency', readonly=True),
-        'bank_id': fields.many2one('res.partner.bank', 'Destination Bank account'),
+        'bank_id': fields.many2one('res.partner.bank', 'Destination Bank Account'),
         'order_id': fields.many2one('payment.order', 'Order', required=True,
             ondelete='cascade', select=True),
         'partner_id': fields.many2one('res.partner', string="Partner", required=True, help='The Ordering Customer'),
diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py
index 7699e7468d9..8c5648a1040 100644
--- a/addons/hr_attendance/hr_attendance.py
+++ b/addons/hr_attendance/hr_attendance.py
@@ -29,7 +29,7 @@ class hr_action_reason(osv.osv):
     _description = "Action Reason"
     _columns = {
         'name': fields.char('Reason', size=64, required=True, help='Specifies the reason for Signing In/Signing Out.'),
-        'action_type': fields.selection([('sign_in', 'Sign in'), ('sign_out', 'Sign out')], "Action's type"),
+        'action_type': fields.selection([('sign_in', 'Sign in'), ('sign_out', 'Sign out')], "Action Type"),
     }
     _defaults = {
         'action_type': 'sign_in',
@@ -137,7 +137,7 @@ class hr_employee(osv.osv):
 
             res = {'action': type, 'employee_id': emp['id']}
             if dt:
-                res['name'] = dt   
+                res['name'] = dt
         id = obj_attendance.create(cr, uid, res, context=context)
 
         if type != 'action':
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index a2123cb287c..4426eaf9999 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -267,7 +267,7 @@ class pos_order(osv.osv):
         'lines': fields.one2many('pos.order.line', 'order_id', 'Order Lines', states={'draft': [('readonly', False)]}, readonly=True),
         'price_type': fields.selection([
                                 ('tax_excluded','Tax excluded')],
-                                 'Price method', required=True),
+                                 'Price Method', required=True),
         'statement_ids': fields.one2many('account.bank.statement.line', 'pos_statement_id', 'Payments', states={'draft': [('readonly', False)]}, readonly=True),
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, states={'draft': [('readonly', False)]}, readonly=True),
         'partner_id': fields.many2one('res.partner', 'Customer', change_default=True, select=1, states={'draft': [('readonly', False)], 'paid': [('readonly', False)]}),

From 59ee56541c419268aafd7890396923459d903a53 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Thu, 14 Apr 2011 15:22:31 +0530
Subject: [PATCH 053/188] [FIX] base : Fixes the partner manager group problem

bzr revid: amp@tinyerp.com-20110414095231-jltmqb3i22z4s7i3
---
 openerp/addons/base/res/res_security.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/openerp/addons/base/res/res_security.xml b/openerp/addons/base/res/res_security.xml
index 9185ec2dcac..df80f90373c 100644
--- a/openerp/addons/base/res/res_security.xml
+++ b/openerp/addons/base/res/res_security.xml
@@ -12,6 +12,9 @@
     <record model="ir.ui.menu" id="menu_base_config">
         <field eval="[(6,0,[ref('group_system'), ref('group_partner_manager')])]" name="groups_id"/>
     </record>
+    <record model="ir.ui.menu" id="menu_base_partner">
+        <field eval="[(6,0,[ref('group_partner_manager')])]" name="groups_id"/>
+    </record>
 
 
     <!-- Record Rule For Company -->

From 442981388721be6f6b40ca142346b2d3282b9408 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 14 Apr 2011 15:45:32 +0530
Subject: [PATCH 054/188] [IMP] Holidays: State field tooltips

bzr revid: mra@mra-laptop-20110414101532-jceuzg8bx0el02p7
---
 addons/hr_holidays/hr_holidays.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 131d38d7001..ebe4948ef16 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -113,8 +113,10 @@ class hr_holidays(osv.osv):
         'name': fields.char('Description', required=True, size=64),
         'state': fields.selection([('draft', 'Draft'), ('confirm', 'Waiting Approval'), ('refuse', 'Refused'),
             ('validate1', 'Waiting Second Approval'), ('validate', 'Approved'), ('cancel', 'Cancelled')],
-            'State', readonly=True, help='When the holiday request is created the state is \'Draft\'.\n It is confirmed by the user and request is sent to admin, the state is \'Waiting Approval\'.\
-            If the admin accepts it, the state is \'Approved\'. If it is refused, the state is \'Refused\'.'),
+            'State', readonly=True, help='The state is set to \'Draft\', when a holiday request is created.\
+            \nThe state is \'Waiting Approval\', when holiday request is confirmed by user.\
+            \nThe state is \'Refused\', when holiday request is refused by manager.\
+            \nThe state is \'Approved\', when holiday request is approved by manager.'),
         'user_id':fields.related('employee_id', 'user_id', type='many2one', relation='res.users', string='User', store=True),
         'date_from': fields.datetime('Start Date', readonly=True, states={'draft':[('readonly',False)]}),
         'date_to': fields.datetime('End Date', readonly=True, states={'draft':[('readonly',False)]}),

From d566e5eb8055faca9cfb4cb887ebb5f010b1b0fc Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Thu, 14 Apr 2011 16:03:49 +0530
Subject: [PATCH 055/188] [FIX] crm,stock : Fixes the partner manager group
 problem

bzr revid: amp@tinyerp.com-20110414103349-uj2zhs8q00qt6e5p
---
 addons/crm/crm_view.xml                   | 2 +-
 addons/stock/security/ir.model.access.csv | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 685019a3001..cc9005d69bf 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -3,7 +3,7 @@
     <data>
 
         <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" 
-            groups="base.group_sale_manager,base.group_sale_salesman,base.group_partner_manager"/>
+            groups="base.group_sale_manager,base.group_sale_salesman"/>
 
         <menuitem id="base.menu_crm_config_lead" name="Leads &amp; Opportunities"
             parent="base.menu_base_config" sequence="1" groups="base.group_sale_manager"/>
diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index 8c7c53ed8ba..68a210e535d 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -3,6 +3,7 @@
 "access_stock_incoterms_manager","stock.incoterms manager","model_stock_incoterms","stock.group_stock_manager",1,1,1,1
 "access_stock_warehouse_manager","stock.warehouse.manager","model_stock_warehouse","stock.group_stock_manager",1,1,1,1
 "access_stock_warehouse_user","stock.warehouse.user","model_stock_warehouse","base.group_user",1,0,0,0
+"access_stock_location__partner_manager","stock.location.partner.manager","model_stock_location","base.group_partner_manager",1,1,1,1
 "access_stock_location_manager","stock.location.manager","model_stock_location","stock.group_stock_manager",1,1,1,1
 "access_stock_location_user","stock.location.user","model_stock_location","base.group_user",1,0,0,0
 "access_stock_journal_user","stock.journal.user","model_stock_journal","base.group_user",1,0,0,0

From c61bf2dcf477a4d6d2a5956f7c3b0dc131dfa3fa Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Thu, 14 Apr 2011 17:04:01 +0530
Subject: [PATCH 056/188] [FIX] email_template, mail: added constraint and fix
 return type for mako template in email_template

bzr revid: rha@tinyerp.com-20110414113401-dwhhu7srusqh4yfj
---
 addons/email_template/mako_template.py |  4 +++-
 addons/mail/email_message.py           | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/addons/email_template/mako_template.py b/addons/email_template/mako_template.py
index f73b462d7da..509bcbc66b3 100644
--- a/addons/email_template/mako_template.py
+++ b/addons/email_template/mako_template.py
@@ -47,7 +47,9 @@ def get_value(cr, uid, message=None, model=None, record_id=False, context=None):
                }
             templ = MakoTemplate(message, input_encoding='utf-8')
             reply = MakoTemplate(message).render_unicode(object=record, peobject=record, env=env, format_exceptions=True)
-            return reply or False
+            if reply == 'False':
+                reply = ''
+            return reply
         except Exception:
             logging.exception("can't render %r", message)
             return u""
diff --git a/addons/mail/email_message.py b/addons/mail/email_message.py
index d39b92c8a8a..a7dabf905ef 100644
--- a/addons/mail/email_message.py
+++ b/addons/mail/email_message.py
@@ -94,6 +94,7 @@ class email_message_common(osv.osv_memory):
     _rec_name = 'subject'
 
     _sql_constraints = []
+
 email_message_common()
 
 class email_message(osv.osv):
@@ -105,6 +106,19 @@ class email_message(osv.osv):
     _description = 'Email Message'
     _order = 'date desc'
 
+    def _check_email_recipients(self, cr, uid, ids, context=None):
+        '''
+        checks email_to, email_cc, email_bcc
+        '''
+        for message in self.browse(cr, uid, ids, context=context):
+            if not (message.email_to or message.email_cc or message.email_bcc):
+                return False
+        return True
+
+    _constraints = [
+        (_check_email_recipients, 'No recipients were specified. Please enter a recipient!', ['email_to', 'email_cc', 'email_bcc']),
+    ]
+
     def open_document(self, cr, uid, ids, context=None):
         """ To Open Document
         @param self: The object pointer.

From 0ad501441eb1cc7d3a1aac328bc65466a70c1b38 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Thu, 14 Apr 2011 17:19:18 +0530
Subject: [PATCH 057/188] [FIX] mail: fixed constraint and removed print
 statement

bzr revid: rha@tinyerp.com-20110414114918-6yb1tzj6dr9u9ajz
---
 addons/mail/email_message.py                | 2 +-
 addons/mail/wizard/email_compose_message.py | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/mail/email_message.py b/addons/mail/email_message.py
index a7dabf905ef..b6c52d381f5 100644
--- a/addons/mail/email_message.py
+++ b/addons/mail/email_message.py
@@ -111,7 +111,7 @@ class email_message(osv.osv):
         checks email_to, email_cc, email_bcc
         '''
         for message in self.browse(cr, uid, ids, context=context):
-            if not (message.email_to or message.email_cc or message.email_bcc):
+            if not (message.email_to or message.email_cc or message.email_bcc) and message.history:
                 return False
         return True
 
diff --git a/addons/mail/wizard/email_compose_message.py b/addons/mail/wizard/email_compose_message.py
index fa7d8d74a96..8d5274aaa75 100644
--- a/addons/mail/wizard/email_compose_message.py
+++ b/addons/mail/wizard/email_compose_message.py
@@ -170,8 +170,6 @@ class email_compose_message(osv.osv_memory):
             else:
                 message_id = mail.message_id
 
-            context.update({'mass_mail': True})
-            print 'mail contx::', context
             # Mass mailing
             if context.get('mass_mail', False):
                 if context['active_ids'] and context['active_model']:

From d224cc22054ee46646b8b43aed347a1efb6fda2e Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Thu, 14 Apr 2011 18:10:49 +0530
Subject: [PATCH 058/188] [IMP]resource:Usability Issue-Remove Read only Field
 working period

bzr revid: aag@tinyerp.co.in-20110414124049-ehkses30irtpjiv4
---
 addons/resource/resource_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 7663a5af5d4..424955d0584 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -225,7 +225,7 @@
                        </group>
                        <group colspan="2" col="2">
                            <field name="date_from"/>
-                           <field name="calendar_id" string="Working Period" readonly='1'/>
+                           <field name="calendar_id" string="Working Period"/>
                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                        </group>
                        <group colspan="2" col="2">

From 8519b21aebaa29ef9e2645354df9efd88426a552 Mon Sep 17 00:00:00 2001
From: vro <vro@tinyerp.com>
Date: Thu, 14 Apr 2011 18:44:17 +0530
Subject: [PATCH 059/188] [FIX]: Fixed idea module parent category bug.

bzr revid: vro@tinyerp.com-20110414131417-hoponmoszarth5nl
---
 addons/idea/idea.py       | 21 +++++++++++++++++++++
 addons/idea/idea_view.xml |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index deda3ab1350..04ae4dff5df 100644
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -31,11 +31,28 @@ DefaultVoteValue = '50'
 class idea_category(osv.osv):
     """ Category of Idea """
 
+    def name_get(self, cr, uid, ids, context=None):
+        if not len(ids):
+            return []
+        reads = self.read(cr, uid, ids, ['name','parent_id'], context=context)
+        res = []
+        for record in reads:
+            name = record['name']
+            if record['parent_id']:
+                name = record['parent_id'][1]+' / '+name
+            res.append((record['id'], name))
+        return res
+
+    def _categ_name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None):
+        res = self.name_get(cr, uid, ids, context=context)
+        return dict(res)
+
     _name = "idea.category"
     _description = "Idea Category"
 
     _columns = {
         'name': fields.char('Category', size=64, required=True),
+        'complete_name': fields.function(_categ_name_get_fnc, method=True, type="char", string='Name'),
         'summary': fields.text('Summary'),
         'parent_id': fields.many2one('idea.category', 'Parent Categories', ondelete='set null'),
         'child_ids': fields.one2many('idea.category', 'parent_id', 'Child Categories'),
@@ -46,6 +63,10 @@ class idea_category(osv.osv):
     ]
     _order = 'parent_id,name asc'
 
+    _constraints = [
+        (osv.osv._check_recursion, 'Error ! You can not create recursive categories.', ['parent_id'])
+    ]
+
 idea_category()
 
 class idea_idea(osv.osv):
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 493fda2c01f..2d42ab25711 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -46,7 +46,7 @@
             <field name="field_parent">child_ids</field>
             <field name="arch" type="xml">
                 <tree string="Category of ideas">
-                    <field name="name"/>
+                    <field name="complete_name"/>
                     <field name="parent_id" invisible="1"/>
                 </tree>
             </field>

From a560130ee2d9fb6db96535ebf60878d5f68dd9b4 Mon Sep 17 00:00:00 2001
From: vro <vro@tinyerp.com>
Date: Thu, 14 Apr 2011 18:45:33 +0530
Subject: [PATCH 060/188] [FIX]: Fixed idea module typos.

bzr revid: vro@tinyerp.com-20110414131533-kk2hokwe2pfmybg3
---
 addons/idea/idea_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 2d42ab25711..e4cfa4efbe7 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -234,11 +234,11 @@
                         <field name="count_votes" />
                     </group>
                     <field name="stat_vote_ids" colspan="4" mode="graph,tree" nolabel="1">
-                        <graph string="Vots Statistics" type="bar">
+                        <graph string="Votes Statistics" type="bar">
                             <field name="score"/>
                             <field name="nbr"/>
                         </graph>
-                        <tree string="Vots Statistics">
+                        <tree string="Votes Statistics">
                             <field name="score"/>
                             <field name="nbr"/>
                         </tree>

From 99bac0b9be878df5ccdb9c1118f4cb2245b35be7 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Thu, 14 Apr 2011 18:49:38 +0530
Subject: [PATCH 061/188] [REM] email_template: remove email_template_send
 wizard and IMP

bzr revid: rha@tinyerp.com-20110414131938-5y133uyx5j7hl5v0
---
 addons/email_template/__openerp__.py          |   1 -
 addons/email_template/wizard/__init__.py      |   1 -
 .../wizard/email_compose_message.py           |  10 +-
 .../wizard/email_template_preview.py          |   3 +-
 .../wizard/email_template_send_wizard.py      | 166 ------------------
 .../email_template_send_wizard_view.xml       |  62 -------
 6 files changed, 6 insertions(+), 237 deletions(-)
 delete mode 100644 addons/email_template/wizard/email_template_send_wizard.py
 delete mode 100644 addons/email_template/wizard/email_template_send_wizard_view.xml

diff --git a/addons/email_template/__openerp__.py b/addons/email_template/__openerp__.py
index ef2d314e561..eab9f8bc148 100644
--- a/addons/email_template/__openerp__.py
+++ b/addons/email_template/__openerp__.py
@@ -42,7 +42,6 @@ for leads, the action will be added to the right side panel of the Lead form.
     "update_xml": [
         'wizard/email_template_preview_view.xml',
         'email_template_view.xml',
-        'wizard/email_template_send_wizard_view.xml',
         'wizard/email_compose_message_view.xml',
         'security/ir.model.access.csv'
     ],
diff --git a/addons/email_template/wizard/__init__.py b/addons/email_template/wizard/__init__.py
index 1bac2d4aaad..b0ad4313b4f 100644
--- a/addons/email_template/wizard/__init__.py
+++ b/addons/email_template/wizard/__init__.py
@@ -20,6 +20,5 @@
 #
 ##############################################################################
 import email_template_preview
-import email_template_send_wizard
 import email_compose_message
 
diff --git a/addons/email_template/wizard/email_compose_message.py b/addons/email_template/wizard/email_compose_message.py
index fc357c88a6e..82381c838e3 100644
--- a/addons/email_template/wizard/email_compose_message.py
+++ b/addons/email_template/wizard/email_compose_message.py
@@ -44,12 +44,10 @@ class email_compose_message(osv.osv_memory):
             else:
                 return self.get_template_value(cr, uid, getattr(template, field), template.model, resource_id, context=context)
 
-        body = _get_template_value('body') or False
-        if context.get('active_model') and resource_id and template.user_signature:
-            model_pool = self.pool.get(context['active_model'])
-            user = model_pool.browse(cr, uid, resource_id, context=context).user_id
-            signature = user and user.signature or ''
-            body = body + '\n' + signature
+        body = _get_template_value('body')
+        if template.user_signature:
+            signature = self.pool.get('res.users').browse(cr, uid, uid, context).signature
+            body += '\n' + signature
 
         result.update({
                 'template_id' : template.id,
diff --git a/addons/email_template/wizard/email_template_preview.py b/addons/email_template/wizard/email_template_preview.py
index a1281831c4f..2538244ebea 100644
--- a/addons/email_template/wizard/email_template_preview.py
+++ b/addons/email_template/wizard/email_template_preview.py
@@ -46,8 +46,9 @@ class email_template_preview(osv.osv_memory):
         template = template_pool.browse(cr, uid, int(template_id), context=context)
         template_object = template.model_id
         model =  self.pool.get(template_object.model)
-        record_ids = model.search(cr, uid, [], 0, 20, 'id', context=context)
+        record_ids = model.search(cr, uid, [], 0, 10, 'id', context=context)
         default_id = context.get('default_res_id')
+
         if default_id and default_id not in record_ids:
             record_ids.insert(0, default_id)
 
diff --git a/addons/email_template/wizard/email_template_send_wizard.py b/addons/email_template/wizard/email_template_send_wizard.py
deleted file mode 100644
index b1c91401e55..00000000000
--- a/addons/email_template/wizard/email_template_send_wizard.py
+++ /dev/null
@@ -1,166 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2009 Sharoon Thomas
-#    Copyright (C) 2010-Today 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 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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>
-#
-##############################################################################
-
-from osv import osv, fields
-import netsvc
-from tools.translate import _
-
-class email_template_send_wizard(osv.osv_memory):
-    _name = 'email_template.send.wizard'
-    _inherit = 'email.template'
-    _description = 'This is the wizard for sending mail'
-
-    def default_get(self, cr, uid, fields, context=None):
-        if context is None:
-            context = {}
-        result = super(email_template_send_wizard, self).default_get(cr, uid, fields, context=context)
-
-        template_pool = self.pool.get('email.template')
-        model_pool = self.pool.get('ir.model')
-        template_id=context.get('template_id', False)
-        template = template_pool.get_email_template(cr, uid, template_id=template_id, context=context)
-        def _get_template_value(field):
-            if not template:
-                return False
-            if len(context['src_rec_ids']) > 1: # Multiple Mail: Gets original template values for multiple email change
-                return getattr(template, field)
-            else: # Simple Mail: Gets computed template values
-                return self.get_template_value(cr, uid, getattr(template, field), template.model, context.get('active_id'), context)
-
-        if 'user_signature' in fields:
-            result['user_signature'] = template.user_signature
-
-        if 'report_template' in fields:
-            result['report_template'] = template.report_template and template.report_template.id or False
-
-        if 'template_id' in fields:
-            result['template_id'] = template.id
-
-        if 'smtp_server_id' in fields:
-            result['smtp_server_id'] = template.smtp_server_id.id
-
-        if 'attachment_ids' in fields:
-            result['attachment_ids'] = template_pool.read(cr, uid, template.id, ['attachment_ids'])['attachment_ids']
-
-        if 'requested' in fields:
-            result['requested'] = len(context.get('src_rec_ids',''))
-
-        if 'state' in fields:
-            result['state'] =  len(context.get('src_rec_ids','')) > 1 and 'multi' or 'single'
-
-        if 'model_id' in fields:
-            result['model_id'] = model_pool.search(cr, uid, [('model','=',context.get('src_model'))],context=context)[0]
-
-        if 'res_id' in fields:
-            result['res_id'] = context['active_id']
-
-        if 'email_to' in fields:
-            result['email_to'] = _get_template_value('email_to')
-
-        if 'email_cc' in fields:
-            result['email_cc'] = _get_template_value('email_cc')
-
-        if 'email_bcc' in fields:
-            result['email_bcc'] = _get_template_value('email_bcc')
-
-        if 'subject' in fields:
-            result['subject'] = _get_template_value('subject')
-
-        if 'body' in fields:
-            result['body'] = _get_template_value('description')
-
-        #if 'body_html' in fields:
-        #    result['body_html'] = _get_template_value('body_html')
-
-        if 'reply_to' in fields:
-            result['reply_to'] = _get_template_value('reply_to')
-
-        if 'report_name' in fields:
-            result['report_name'] = _get_template_value('report_name')
-
-        return result
-
-    _columns = {
-        'requested':fields.integer('No of requested Mails',readonly=True),
-        'generated':fields.integer('No of generated Mails',readonly=True),
-        'full_success':fields.boolean('Complete Success',readonly=True),
-        'attachment_ids': fields.many2many('ir.attachment','send_wizard_attachment_rel', 'wizard_id', 'attachment_id', 'Attachments'),
-        'state':fields.selection([
-                        ('single','Simple Mail Wizard Step 1'),
-                        ('multi','Multiple Mail Wizard Step 1'),
-                        ('done','Wizard Complete')
-                                  ],'State',readonly=True),
-    }
-
-    _defaults = {
-    }
-
-    #def fields_get(self, cr, uid, fields=None, context=None, write_access=True):
-    #    if context is None:
-    #        context = {}
-    #    result = super(email_template_send_wizard, self).fields_get(cr, uid, fields, context, write_access)
-    #    if 'attachment_ids' in result and 'src_model' in context:
-    #        result['attachment_ids']['domain'] = [('res_model','=',context['src_model']),('res_id','=',context['active_id'])]
-    #    return result
-
-    def send_mail(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        mailid = self.save_to_mailbox(cr, uid, ids, context)
-        return {'type': 'ir.actions.act_window_close'}
-
-    def get_generated(self, cr, uid, ids=None, context=None):
-        if ids is None:
-            ids = []
-        if context is None:
-            context = {}
-        logger = netsvc.Logger()
-        if context.get('src_rec_ids'):
-            #Means there are multiple items selected for email.
-            mail_ids = self.save_to_mailbox(cr, uid, ids, context)
-            if mail_ids:
-                logger.notifyChannel("email-template", netsvc.LOG_INFO, _("Emails for multiple items saved in outbox."))
-                self.write(cr, uid, ids, {
-                    'generated':len(mail_ids),
-                    'state':'done'
-                }, context)
-            else:
-                raise osv.except_osv(_("Email Template"),_("Email sending failed for one or more objects."))
-        return True
-
-    def save_to_mailbox(self, cr, uid, ids, context=None):
-        #def get_end_value(id, value):
-        #    if len(context['src_rec_ids']) > 1: # Multiple Mail: Gets value from the template
-        #        return self.get_value(cr, uid, template, value, context, id)
-        #    else:
-        #        return value
-
-        email_ids = []
-        for template in self.browse(cr, uid, ids, context=context):
-            for record_id in context.get('src_rec_ids',[]):
-                email_id = self.generate_email(cr, uid, template.id, record_id, context)
-                email_ids.append(email_id)
-        return email_ids
-
-email_template_send_wizard()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/email_template/wizard/email_template_send_wizard_view.xml b/addons/email_template/wizard/email_template_send_wizard_view.xml
deleted file mode 100644
index f82288575bb..00000000000
--- a/addons/email_template/wizard/email_template_send_wizard_view.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-	<data>
-
-        <record model="ir.ui.view" id="email_template_send_wizard_form">
-            <field name="name">email_template.send.wizard.form</field>
-            <field name="model">email_template.send.wizard</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Send Email Wizard">
-                    <group col="4" colspan="4">
-                        <field name="smtp_server_id" widget="selection" required="1" colspan="4"/>
-                    </group>
-                    <group col="4" colspan="4">
-                        <group col="6" colspan="4">
-                            <field name="email_to" colspan="4"/>
-                            <field name="email_cc" colspan="4"/>
-                            <field name="email_bcc" colspan="4"/>
-                            <field name="subject" colspan="4" attrs="{'required':[('state','=','single')]}"/>
-                            <field name="report_name" colspan="4"/>
-                            <field name="user_signature" colspan="4"/>
-                        </group>
-                        <separator string="" colspan="4"/>
-                        <notebook colspan="4">
-                            <page string="Body">
-                                <field name="description" colspan="4" nolabel="1"/>
-                            </page>
-                            <!-- <page string="Body (HTML)">
-                                <field name="body_html" colspan="4" nolabel="1"/>
-                            </page> -->
-                            <page string="Attachments">
-                                <label string="Add here all attachments of the current document you want to include in the Email." colspan="4"/>
-                                <field name="attachment_ids" colspan="4" nolabel="1"/>
-                            </page>
-                        </notebook>
-
-                    </group>
-                    <field name="state" invisible="1"/>
-                    <group col="4" colspan="4" attrs="{'invisible':[('state','=','single')]}">
-                        <field name="requested"/>
-                        <field name="generated"/>
-                        <newline/>
-                        <label string="After clicking Send All, emails will be sent to outbox and cleared in next Send/Recieve" colspan="4"/>
-                        <label string="Tip: Multiple emails are sent in the same language (the first one is proposed). We suggest you send emails in groups according to language." colspan="4"/>
-                        <newline/>
-                    </group>
-                    <label string="" colspan="2"/>
-                    <group col="4" colspan="2" attrs="{'invisible':[('state','=','single')]}">
-                        <button icon="gtk-cancel" special="cancel" string="Discard"  states="multi"/>
-                        <button icon="gtk-ok" name="get_generated" string="Send All" type="object" states="multi"/>
-                        <button icon="gtk-ok" special="cancel" string="Close" states="done"/>
-                    </group>
-                    <group col="4" colspan="2" attrs="{'invisible':[('state','!=','single')]}">
-                        <button icon="gtk-cancel" special="cancel" string="Discard"/>
-                        <button icon="gtk-ok" name="send_mail" string="Send now" type="object"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-
-	</data>
-</openerp>

From 82b08318fe0bd3d4cb92ee3a46873714e51a708a Mon Sep 17 00:00:00 2001
From: Daniel Watkins <daniel@daniel-watkins.co.uk>
Date: Thu, 14 Apr 2011 22:20:45 +0100
Subject: [PATCH 062/188] Typo fixes.

bzr revid: daniel@daniel-watkins.co.uk-20110414212045-hlglpa7dfum3j15w
---
 doc/source/development.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/source/development.rst b/doc/source/development.rst
index a1d989b46ac..81f2d8219a5 100644
--- a/doc/source/development.rst
+++ b/doc/source/development.rst
@@ -55,7 +55,7 @@ Events
   Event triggered after a user asked for a search. The search view
   fires this event after collecting all input data (contexts, domains
   and group_by contexts). Note that the search view does *not* merge
-  those (or therwise evaluate them), they are returned as provided by
+  those (or otherwise evaluate them), they are returned as provided by
   the various inputs within the view.
 
 ``on_clear``
@@ -104,7 +104,7 @@ reaction:
     the search process.
 
     :js:class:`~openerp.base.search.Invalid` takes three mandatory
-    arguments: an indentifier (a name for instance), the invalid value
+    arguments: an identifier (a name for instance), the invalid value,
     and a validation message indicating the issue.
 
 ``get_domain``

From 8b4fd867430b8e14c8d48b8d6c8ee2c9d41df121 Mon Sep 17 00:00:00 2001
From: Daniel Watkins <daniel@daniel-watkins.co.uk>
Date: Thu, 14 Apr 2011 22:21:32 +0100
Subject: [PATCH 063/188] s/have to/must/ -- it's a more common directive in
 docs.

bzr revid: daniel@daniel-watkins.co.uk-20110414212132-yw281minl1zx5a7d
---
 doc/source/development.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/source/development.rst b/doc/source/development.rst
index 81f2d8219a5..8e37ed744b1 100644
--- a/doc/source/development.rst
+++ b/doc/source/development.rst
@@ -114,7 +114,7 @@ reaction:
 
 The :js:class:`openerp.base.search.Input` type implements registration
 on its own, but its implementations of ``get_context`` and
-``get_domain`` simply raise errors and *have* to be overridden.
+``get_domain`` simply raise errors and *must* be overridden.
 
 One last action is for filters, as an activation order has to be kept
 on them for some controls (establish the correct grouping sequence for

From 417bdbf6903d440333e6e221740d2a9140569bff Mon Sep 17 00:00:00 2001
From: Daniel Watkins <daniel@daniel-watkins.co.uk>
Date: Thu, 14 Apr 2011 22:23:43 +0100
Subject: [PATCH 064/188] s/falsy//

bzr revid: daniel@daniel-watkins.co.uk-20110414212343-aam4fc6nxgkxmnwz
---
 doc/source/development.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/source/development.rst b/doc/source/development.rst
index 8e37ed744b1..a103893d86c 100644
--- a/doc/source/development.rst
+++ b/doc/source/development.rst
@@ -71,7 +71,7 @@ An important concept in the search view is that of input. It is both
 an informal protocol and an abstract type that can be inherited from.
 
 Inputs are widgets which can contain user data (a char widget for
-instance, or a selection box). They are able of action and of
+instance, or a selection box). They are capable of action and of
 reaction:
 
 .. _views-search-registration:
@@ -93,9 +93,9 @@ reaction:
   * Return a context (an object), this is the "normal" response if the
     input holds a value.
 
-  * Return a falsy value (generally ``null``). This value indicates
-    the input does not contain any value and will not take part in the
-    research.
+  * Return a value that evaluates as false (generally ``null``). This
+    value indicates the input does not contain any value and will not
+    take part in the research.
 
   * Raise :js:class:`openerp.base.search.Invalid` to indicate that it
     holds a value but this value can not be used in the search

From 2fabcdffd988918d1968896f8fe78bc286cb940c Mon Sep 17 00:00:00 2001
From: Daniel Watkins <daniel@daniel-watkins.co.uk>
Date: Thu, 14 Apr 2011 22:24:48 +0100
Subject: [PATCH 065/188] 'research' unclear; changed wording.

bzr revid: daniel@daniel-watkins.co.uk-20110414212448-oncc720ar4gw7td9
---
 doc/source/development.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/source/development.rst b/doc/source/development.rst
index a103893d86c..c81ceec9498 100644
--- a/doc/source/development.rst
+++ b/doc/source/development.rst
@@ -95,7 +95,7 @@ reaction:
 
   * Return a value that evaluates as false (generally ``null``). This
     value indicates the input does not contain any value and will not
-    take part in the research.
+    affect the results of the search.
 
   * Raise :js:class:`openerp.base.search.Invalid` to indicate that it
     holds a value but this value can not be used in the search

From 8ed08b8d6fed3beccc7e7ef77acefe5268f4de13 Mon Sep 17 00:00:00 2001
From: Daniel Watkins <daniel@daniel-watkins.co.uk>
Date: Thu, 14 Apr 2011 22:26:03 +0100
Subject: [PATCH 066/188] Minor grammatical improvement.

bzr revid: daniel@daniel-watkins.co.uk-20110414212603-3wn8ek3xiawug8ry
---
 doc/source/development.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/source/development.rst b/doc/source/development.rst
index c81ceec9498..719c6baa74a 100644
--- a/doc/source/development.rst
+++ b/doc/source/development.rst
@@ -117,8 +117,8 @@ on its own, but its implementations of ``get_context`` and
 ``get_domain`` simply raise errors and *must* be overridden.
 
 One last action is for filters, as an activation order has to be kept
-on them for some controls (establish the correct grouping sequence for
-instance).
+on them for some controls (to establish the correct grouping sequence,
+for instance).
 
 To that end, filters can call
 :js:func:`openerp.base.Search.do_toggle_filter`, providing themselves

From fcfa8feb192a0979bc515483f645fe04bef7102d Mon Sep 17 00:00:00 2001
From: Daniel Watkins <daniel@daniel-watkins.co.uk>
Date: Thu, 14 Apr 2011 22:36:11 +0100
Subject: [PATCH 067/188] Consistent reference to methods.

bzr revid: daniel@daniel-watkins.co.uk-20110414213611-e7duvzsd65ygxp9o
---
 doc/source/development.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/source/development.rst b/doc/source/development.rst
index 719c6baa74a..07ee7dabf64 100644
--- a/doc/source/development.rst
+++ b/doc/source/development.rst
@@ -137,7 +137,7 @@ Life cycle
 
 The search view has a pretty simple and linear life cycle, in three main steps:
 
-:js:class:`init <openerp.base.SearchView>`
+:js:class:`~openerp.base.SearchView.init`
 
   Nothing interesting happens here
 
@@ -232,7 +232,8 @@ abstract types, used to implement input widgets:
   <views-search-registration>`.
 
   If inherited from, descendant classes should not call its
-  implementations of ``get_context`` and ``get_domain``.
+  implementations of :js:func:`~openerp.base.search.Input.get_context`
+  and :js:func:`~openerp.base.search.Input.get_domain`.
 
 * :js:class:`openerp.base.search.Field` is used to implement more
   "field" widgets (which allow the user to input potentially complex

From ec98904f9c8aec9d32a3cdc21368cdc49836a336 Mon Sep 17 00:00:00 2001
From: Daniel Watkins <daniel@daniel-watkins.co.uk>
Date: Thu, 14 Apr 2011 22:36:22 +0100
Subject: [PATCH 068/188] Typos.

bzr revid: daniel@daniel-watkins.co.uk-20110414213622-7c3zb9zd5o1ur4yb
---
 doc/source/development.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/source/development.rst b/doc/source/development.rst
index 07ee7dabf64..514e094b689 100644
--- a/doc/source/development.rst
+++ b/doc/source/development.rst
@@ -211,7 +211,7 @@ called in this order:
   Gives the widget the opportunity to unbind its events, remove itself
   from the DOM and perform any other cleanup task it may have.
 
-  Event if the widget does not do anything itself, it is responsible
+  Even if the widget does not do anything itself, it is responsible
   for shutting down its children.
 
 An abstract type is available and can be inherited from, to simplify
@@ -252,7 +252,7 @@ abstract types, used to implement input widgets:
     :js:func:`~openerp.base.search.Widget.make_id`.
 
   * It sets up a basic (overridable)
-    :js:attr:`~opererp.base.search.Field.template` attribute, combined
+    :js:attr:`~openerp.base.search.Field.template` attribute, combined
     with the previous tasks, this makes subclasses of
     :js:class:`~openerp.base.search.Field` render themselves "for
     free".

From 9c99f01964bc0a750a5232c8ec21305b995ae900 Mon Sep 17 00:00:00 2001
From: Daniel Watkins <daniel@daniel-watkins.co.uk>
Date: Thu, 14 Apr 2011 22:43:32 +0100
Subject: [PATCH 069/188] Prettify JSON examples.

bzr revid: daniel@daniel-watkins.co.uk-20110414214332-2zsj9i4ogf3l7u1z
---
 openerpweb/openerpweb.py | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/openerpweb/openerpweb.py b/openerpweb/openerpweb.py
index 8423dc878ab..d569a9d5f20 100644
--- a/openerpweb/openerpweb.py
+++ b/openerpweb/openerpweb.py
@@ -289,13 +289,34 @@ class JsonRequest(object):
     * the json string is passed as a form parameter named "request"
     * method is currently ignored
 
-    Sucessful request:
-    --> {"jsonrpc": "2.0", "method": "call", "params": {"session_id": "SID", "context": {}, "arg1": "val1" }, "id": null}
-    <-- {"jsonrpc": "2.0", "result": { "res1": "val1" }, "id": null}
+    Sucessful request::
 
-    Request producing a error:
-    --> {"jsonrpc": "2.0", "method": "call", "params": {"session_id": "SID", "context": {}, "arg1": "val1" }, "id": null}
-    <-- {"jsonrpc": "2.0", "error": {"code": 1, "message": "End user error message.", "data": {"code": "codestring", "debug": "traceback" } }, "id": null}
+      --> {"jsonrpc": "2.0",
+           "method": "call",
+           "params": {"session_id": "SID",
+                      "context": {},
+                      "arg1": "val1" },
+           "id": null}
+
+      <-- {"jsonrpc": "2.0",
+           "result": { "res1": "val1" },
+           "id": null}
+
+    Request producing a error::
+
+      --> {"jsonrpc": "2.0",
+           "method": "call",
+           "params": {"session_id": "SID",
+                      "context": {},
+                      "arg1": "val1" },
+           "id": null}
+
+      <-- {"jsonrpc": "2.0",
+           "error": {"code": 1,
+                     "message": "End user error message.",
+                     "data": {"code": "codestring",
+                              "debug": "traceback" } },
+           "id": null}
 
     """
 

From c6b812ebfad91d9833ba7fe127932da1f49a7be6 Mon Sep 17 00:00:00 2001
From: Daniel Watkins <daniel@daniel-watkins.co.uk>
Date: Thu, 14 Apr 2011 22:45:30 +0100
Subject: [PATCH 070/188] Minor fixes.

bzr revid: daniel@daniel-watkins.co.uk-20110414214530-767qdh3ygh8kxkpj
---
 doc/source/project.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/source/project.rst b/doc/source/project.rst
index 6f9a06b2f0d..d435a731d40 100644
--- a/doc/source/project.rst
+++ b/doc/source/project.rst
@@ -31,7 +31,7 @@ Guides and main documentation
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The meat and most important part of all documentation. Should be
-written in plain english, using reStructuredText_ and taking advantage
+written in plain English, using reStructuredText_ and taking advantage
 of `Sphinx's extensions`_, especially `cross-references`_.
 
 Python API Documentation
@@ -65,7 +65,7 @@ RST, using Sphinx's `Python domain`_ [#]_:
   and ``__new__``), using the `info fields`_  as well.
 
 * Attributes (class and instance) should be documented in their
-  class's docstrin via the ``.. attribute::`` directiveg, following
+  class's docstring via the ``.. attribute::`` directiveg, following
   the class's own documentation.
 
 * The relation between modules and module-level attributes is similar:
@@ -220,7 +220,7 @@ Roadmap
 Release notes
 +++++++++++++
 
-.. [#] because Python is the default domain, the ``py:`` markup prefix
+.. [#] Because Python is the default domain, the ``py:`` markup prefix
        is optional and should be left out.
 
 .. [#] Resig's Class still uses prototypes under the hood, it doesn't

From f0cf5764c820aa35ed59bbc1bf41ee51c5c8ec7c Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Fri, 15 Apr 2011 11:28:17 +0530
Subject: [PATCH 071/188] [IMP]MRP :Usability Issue-Now MO: Product is not
 Consumable or Service type

bzr revid: aag@tinyerp.co.in-20110415055817-3366enzlvbav7yr2
---
 addons/mrp/mrp_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 1ac11707870..48c136d1258 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -638,7 +638,7 @@
                         <field name="date_planned"/>
                         <field name="origin"/>
                         <newline/>
-                        <field name="product_id" on_change="product_id_change(product_id)"/>
+                        <field name="product_id" on_change="product_id_change(product_id)" domain="[('type','=','product')]"/>
                         <field name="product_qty"/>
                         <field name="product_uom"/>
                         <button type="action"

From db491b415b5ddfbf2ab3e94adf7134f27f8c8d3c Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Fri, 15 Apr 2011 11:39:42 +0530
Subject: [PATCH 072/188] [FIX] account_budget: Print budget report without
 analytic account gives error

bzr revid: ara@tinyerp.com-20110415060942-czsjpgs1jguwvc11
---
 addons/account_budget/report/budget_report.py             | 2 ++
 addons/account_budget/report/crossovered_budget_report.py | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/addons/account_budget/report/budget_report.py b/addons/account_budget/report/budget_report.py
index 8b98b067bb3..7681f9268d9 100644
--- a/addons/account_budget/report/budget_report.py
+++ b/addons/account_budget/report/budget_report.py
@@ -67,6 +67,8 @@ class budget_report(report_sxw.rml_parse):
 
             context = {'wizard_date_from': d_from, 'wizard_date_to': d_to}
             for i in range(0, len(an_ids)):
+                if not an_ids[i][0]:
+                    continue
                 analytic_name = acc_analytic_obj.browse(self.cr, self.uid, [an_ids[i][0]])
                 res={
                     'b_id': '-1',
diff --git a/addons/account_budget/report/crossovered_budget_report.py b/addons/account_budget/report/crossovered_budget_report.py
index 8a3b745e32a..b70b7da34bb 100644
--- a/addons/account_budget/report/crossovered_budget_report.py
+++ b/addons/account_budget/report/crossovered_budget_report.py
@@ -72,6 +72,8 @@ class budget_report(report_sxw.rml_parse):
 
             context = {'wizard_date_from': d_from, 'wizard_date_to': d_to}
             for i in range(0, len(an_ids)):
+                if not an_ids[i][0]:
+                    continue
                 analytic_name = acc_analytic_obj.browse(self.cr, self.uid, [an_ids[i][0]])
                 res={
                     'b_id': '-1',

From 3fe9f6b1f1eb3f696b674b940c6f877bd61deed1 Mon Sep 17 00:00:00 2001
From: vro <vro@tinyerp.com>
Date: Fri, 15 Apr 2011 11:59:18 +0530
Subject: [PATCH 073/188] [IMP]: Event tooltip typos and grammar.

bzr revid: vro@tinyerp.com-20110415062918-bluxwdyxixtxyjbi
---
 addons/event/event.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index f4f7c4930b8..4d392689bba 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -205,12 +205,12 @@ class event_event(osv.osv):
         'child_ids': fields.one2many('event.event', 'parent_id', 'Child Events', readonly=False, states={'done': [('readonly', True)]}),
         'reply_to': fields.char('Reply-To', size=64, readonly=False, states={'done': [('readonly', True)]}, help="The email address put in the 'Reply-To' of all emails sent by OpenERP"),
         'type': fields.many2one('event.type', 'Type', help="Type of Event like Seminar, Exhibition, Conference, Training.", readonly=False, states={'done': [('readonly', True)]}),
-        'register_max': fields.integer('Maximum Registrations', help="Provide Maximun Number of Registrations", readonly=True, states={'draft': [('readonly', False)]}),
-        'register_min': fields.integer('Minimum Registrations', help="Providee Minimum Number of Registrations", readonly=True, states={'draft': [('readonly', False)]}),
+        'register_max': fields.integer('Maximum Registrations', help="Provide Maximum Number of Registrations", readonly=True, states={'draft': [('readonly', False)]}),
+        'register_min': fields.integer('Minimum Registrations', help="Provide Minimum Number of Registrations", readonly=True, states={'draft': [('readonly', False)]}),
         'register_current': fields.function(_get_register, method=True, string='Confirmed Registrations', multi='register_current',
             help="Total of Open and Done Registrations"),
         'register_prospect': fields.function(_get_register, method=True, string='Unconfirmed Registrations', multi='register_prospect',
-            help="Total of Prospect Registrati./event/event.py:41:ons"),
+            help="Total of Prospect Registrations"),
         'registration_ids': fields.one2many('event.registration', 'event_id', 'Registrations', readonly=False, states={'done': [('readonly', True)]}),
         'date_begin': fields.datetime('Beginning date', required=True, help="Beginning Date of Event", readonly=True, states={'draft': [('readonly', False)]}),
         'date_end': fields.datetime('Closing date', required=True, help="Closing Date of Event", readonly=True, states={'draft': [('readonly', False)]}),
@@ -221,15 +221,15 @@ class event_event(osv.osv):
             ('cancel', 'Cancelled')],
             'State', readonly=True, required=True,
             help='If event is created, the state is \'Draft\'.If event is confirmed for the particular dates the state is set to \'Confirmed\'. If the event is over, the state is set to \'Done\'.If event is cancelled the state is set to \'Cancelled\'.'),
-        'mail_auto_registr': fields.boolean('Mail Auto Register', readonly=False, states={'done': [('readonly', True)]}, help='Check this box if you want to use the automatic mailing for new registration'),
-        'mail_auto_confirm': fields.boolean('Mail Auto Confirm', readonly=False, states={'done': [('readonly', True)]}, help='Check this box if you want ot use the automatic confirmation emailing or the reminder'),
+        'mail_auto_registr': fields.boolean('Mail Auto Register', readonly=False, states={'done': [('readonly', True)]}, help='Check this box if you want to use automatic emailing for new registration.'),
+        'mail_auto_confirm': fields.boolean('Mail Auto Confirm', readonly=False, states={'done': [('readonly', True)]}, help='Check this box if you want to use automatic confirmation emailing or reminder.'),
         'mail_registr': fields.text('Registration Email', readonly=False, states={'done': [('readonly', True)]}, help='This email will be sent when someone subscribes to the event.'),
-        'mail_confirm': fields.text('Confirmation Email', readonly=False, states={'done': [('readonly', True)]}, help="This email will be sent when the event gets confimed or when someone subscribes to a confirmed event. This is also the email sent to remind someone about the event."),
+        'mail_confirm': fields.text('Confirmation Email', readonly=False, states={'done': [('readonly', True)]}, help="This email will be sent when the event gets confirmed or when someone subscribes to a confirmed event. This is also the email sent to remind someone about the event."),
         'product_id': fields.many2one('product.product', 'Product', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="The invoices of this event registration will be created with this Product. Thus it allows you to set the default label and the accounting info you want by default on these invoices."),
         'note': fields.text('Notes', help="Description or Summary of Event", readonly=False, states={'done': [('readonly', True)]}),
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', readonly=True, states={'draft': [('readonly', False)]}, help="Pricelist version for current event."),
-        'unit_price': fields.related('product_id', 'list_price', type='float', string='Registration Cost', readonly=True, states={'draft':[('readonly',False)]}, help="This will be the default price used as registration cost when invoicing this event. Note that you can specify for each registration a specific amount if you want to", digits_compute=dp.get_precision('Sale Price')),
-        'main_speaker_id': fields.many2one('res.partner','Main Speaker', readonly=False, states={'done': [('readonly', True)]}, help="Speaker who are giving speech on event."),
+        'unit_price': fields.related('product_id', 'list_price', type='float', string='Registration Cost', readonly=True, states={'draft':[('readonly',False)]}, help="This will be the default price used as registration cost when invoicing this event. Note that you can specify a specific amount for each registration.", digits_compute=dp.get_precision('Sale Price')),
+        'main_speaker_id': fields.many2one('res.partner','Main Speaker', readonly=False, states={'done': [('readonly', True)]}, help="Speaker who will be giving speech at the event."),
         'speaker_ids': fields.many2many('res.partner', 'event_speaker_rel', 'speaker_id', 'partner_id', 'Other Speakers', readonly=False, states={'done': [('readonly', True)]}),
         'address_id': fields.many2one('res.partner.address','Location Address', readonly=False, states={'done': [('readonly', True)]}),
         'speaker_confirmed': fields.boolean('Speaker Confirmed', readonly=False, states={'done': [('readonly', True)]}),

From eeaa82523233a5ab498288172000ca175770a343 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Fri, 15 Apr 2011 14:13:11 +0530
Subject: [PATCH 074/188] [IMP]Procrument :Usability Issue-solve Speling
 Mistack of  tooltip

bzr revid: aag@tinyerp.co.in-20110415084311-3iygvwq221ctgqd1
---
 addons/procurement/procurement.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 3257f0a5694..fccc6445d3d 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -512,13 +512,13 @@ class stock_warehouse_orderpoint(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', required=True, ondelete='cascade', domain=[('type','=','product')]),
         'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
         'product_min_qty': fields.float('Min Quantity', required=True,
-            help="When the virtual stock goes belong the Min Quantity, OpenERP generates "\
+            help="When the virtual stock goes below the Min Quantity, OpenERP generates "\
             "a procurement to bring the virtual stock to the Max Quantity."),
         'product_max_qty': fields.float('Max Quantity', required=True,
-            help="When the virtual stock goes belong the Max Quantity, OpenERP generates "\
+            help="When the virtual stock goes below the Max Quantity, OpenERP generates "\
             "a procurement to bring the virtual stock to the Max Quantity."),
         'qty_multiple': fields.integer('Qty Multiple', required=True,
-            help="The procurement quantity will by rounded up to this multiple."),
+            help="The procurement quantity will be rounded up to this multiple."),
         'procurement_id': fields.many2one('procurement.order', 'Latest procurement', ondelete="set null"),
         'company_id': fields.many2one('res.company','Company',required=True),
         'procurement_draft_ids': fields.function(_get_draft_procurements, method=True, type='many2many', relation="procurement.order", \

From 943c96f639e92e62d900792045bffbe13473c646 Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Fri, 15 Apr 2011 14:15:14 +0530
Subject: [PATCH 075/188] [FIX] document: Renamed tab name.

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

bzr revid: uco@tinyerp.com-20110415084514-l0ohwka0ayrgqun8
---
 addons/document/document_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 6f82dde0a4f..c82c7be8973 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -274,7 +274,7 @@
                         <field name="write_date" readonly="1"/>
                     </group>
                 </page>
-                <page string="Indexed Content" groups="base.group_extended">
+                <page string="Indexed Content - experimental" groups="base.group_extended">
                     <field name="index_content" colspan="4" nolabel="1"/>
                 </page>
                 <page string="Notes">

From 6b83b67f60e6336b8b2e2fdb809e35c1e1b7a3cb Mon Sep 17 00:00:00 2001
From: skh <skh@tinyerp.com>
Date: Fri, 15 Apr 2011 14:19:06 +0530
Subject: [PATCH 076/188] [FIX] Adding working time in a confirmed timesheet

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

bzr revid: skh@tinyerp.com-20110415084906-j70rij3nfvr77cn3
---
 addons/hr_timesheet_sheet/hr_timesheet_sheet.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 23ab63247e5..c65dc810c3e 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -481,6 +481,19 @@ class hr_timesheet_line(osv.osv):
         'date': _get_default_date,
     }
 
+    def _check_sheet_state(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        line = self.browse(cr, uid, ids, context=context)
+        for timesheet in line:
+            if timesheet.sheet_id and timesheet.sheet_id.state not in ('draft', 'new'):
+                return False
+        return True
+
+    _constraints = [
+        (_check_sheet_state, 'You can not modify an entry in a confirmed timesheet !.', ['state']),
+    ]
+
     def create(self, cr, uid, vals, *args, **kwargs):
         if vals.get('sheet_id', False):
             ts = self.pool.get('hr_timesheet_sheet.sheet').browse(cr, uid, vals['sheet_id'])

From bb0095642e246702212db85b271d1833bf27f779 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Fri, 15 Apr 2011 14:43:34 +0530
Subject: [PATCH 077/188] [FIX] sale:improved execute method of config wizard
 when there is one step picking

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

bzr revid: mtr@mtr-20110415091334-tna4ac2k0e1ltnwn
---
 addons/sale/sale.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index f80d610eb03..60b09f08518 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -710,7 +710,7 @@ class sale_order(osv.osv):
                         'note': line.notes,
                         'company_id': order.company_id.id,
                     })
-
+                    
                 if line.product_id:
                     proc_id = self.pool.get('procurement.order').create(cr, uid, {
                         'name': line.name,
@@ -1202,14 +1202,16 @@ class sale_config_picking_policy(osv.osv_memory):
     }
 
     def execute(self, cr, uid, ids, context=None):
+        ir_values_obj = self.pool.get('ir.values')
+        ir_model_data_obj = self.pool.get('ir.model.data')
+        location_id = ir_model_data_obj.get_object_reference(cr, uid, 'stock', 'stock_location_output')
+        location_id = location_id and location_id[1] or False
         for o in self.browse(cr, uid, ids, context=context):
-            ir_values_obj = self.pool.get('ir.values')
             ir_values_obj.set(cr, uid, 'default', False, 'picking_policy', ['sale.order'], o.picking_policy)
             ir_values_obj.set(cr, uid, 'default', False, 'order_policy', ['sale.order'], o.order_policy)
+            if o.step == 'one':
+                self.pool.get('stock.location').write(cr, uid, [location_id], {'chained_auto_packing': 'transparent'})
             if o.step == 'two':
-                md = self.pool.get('ir.model.data')
-                location_id = md.get_object_reference(cr, uid, 'stock', 'stock_location_output')
-                location_id = location_id and location_id[1] or False
                 self.pool.get('stock.location').write(cr, uid, [location_id], {'chained_auto_packing': 'manual'})
 
 sale_config_picking_policy()

From 75c16a19ccb94283f0897421db4fb5583cee2200 Mon Sep 17 00:00:00 2001
From: skh <skh@tinyerp.com>
Date: Fri, 15 Apr 2011 14:44:28 +0530
Subject: [PATCH 078/188] [FIX] Adding working time in a confirmed timesheet

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

bzr revid: skh@tinyerp.com-20110415091428-r9rm44mkdnjiwp9x
---
 addons/hr_timesheet_sheet/hr_timesheet_sheet.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index c65dc810c3e..4e5d8331441 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -484,14 +484,13 @@ class hr_timesheet_line(osv.osv):
     def _check_sheet_state(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-        line = self.browse(cr, uid, ids, context=context)
-        for timesheet in line:
-            if timesheet.sheet_id and timesheet.sheet_id.state not in ('draft', 'new'):
+        for timesheet_line in self.browse(cr, uid, ids, context=context):
+            if timesheet_line.sheet_id and timesheet_line.sheet_id.state not in ('draft', 'new'):
                 return False
         return True
 
     _constraints = [
-        (_check_sheet_state, 'You can not modify an entry in a confirmed timesheet !.', ['state']),
+        (_check_sheet_state, 'You can not modify an entry in a Confirmed/Done timesheet !.', ['state']),
     ]
 
     def create(self, cr, uid, vals, *args, **kwargs):

From 4b46fd652aef91324875955e04256ca158d89ce3 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Fri, 15 Apr 2011 15:05:16 +0530
Subject: [PATCH 079/188] [IMP] sale:improved code for revision no 4640

bzr revid: mtr@mtr-20110415093516-r3ffuz6mrbaqca3c
---
 addons/sale/sale.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 60b09f08518..1c0e8cc48f7 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1204,15 +1204,16 @@ class sale_config_picking_policy(osv.osv_memory):
     def execute(self, cr, uid, ids, context=None):
         ir_values_obj = self.pool.get('ir.values')
         ir_model_data_obj = self.pool.get('ir.model.data')
+        stock_location_obj = self.pool.get('stock.location')
         location_id = ir_model_data_obj.get_object_reference(cr, uid, 'stock', 'stock_location_output')
         location_id = location_id and location_id[1] or False
         for o in self.browse(cr, uid, ids, context=context):
             ir_values_obj.set(cr, uid, 'default', False, 'picking_policy', ['sale.order'], o.picking_policy)
             ir_values_obj.set(cr, uid, 'default', False, 'order_policy', ['sale.order'], o.order_policy)
             if o.step == 'one':
-                self.pool.get('stock.location').write(cr, uid, [location_id], {'chained_auto_packing': 'transparent'})
+                stock_location_obj.write(cr, uid, [location_id], {'chained_auto_packing': 'transparent'})
             if o.step == 'two':
-                self.pool.get('stock.location').write(cr, uid, [location_id], {'chained_auto_packing': 'manual'})
+                stock_location_obj.write(cr, uid, [location_id], {'chained_auto_packing': 'manual'})
 
 sale_config_picking_policy()
 

From c2719f0f8cd984db73cb9ca58907c7a53f7c700a Mon Sep 17 00:00:00 2001
From: skh <skh@tinyerp.com>
Date: Fri, 15 Apr 2011 15:35:34 +0530
Subject: [PATCH 080/188] [FIX] Adding working time in a confirmed timesheet

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

bzr revid: skh@tinyerp.com-20110415100534-g823ifs3sa7ufz4l
---
 addons/hr_timesheet_sheet/hr_timesheet_sheet.py | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 4e5d8331441..6fca2b7e23e 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -493,21 +493,10 @@ class hr_timesheet_line(osv.osv):
         (_check_sheet_state, 'You can not modify an entry in a Confirmed/Done timesheet !.', ['state']),
     ]
 
-    def create(self, cr, uid, vals, *args, **kwargs):
-        if vals.get('sheet_id', False):
-            ts = self.pool.get('hr_timesheet_sheet.sheet').browse(cr, uid, vals['sheet_id'])
-            if not ts.state in ('draft', 'new'):
-                raise osv.except_osv(_('Error !'), _('You can not modify an entry in a confirmed timesheet !'))
-        return super(hr_timesheet_line,self).create(cr, uid, vals, *args, **kwargs)
-
     def unlink(self, cr, uid, ids, *args, **kwargs):
         self._check(cr, uid, ids)
         return super(hr_timesheet_line,self).unlink(cr, uid, ids,*args, **kwargs)
 
-    def write(self, cr, uid, ids, *args, **kwargs):
-        self._check(cr, uid, ids)
-        return super(hr_timesheet_line,self).write(cr, uid, ids,*args, **kwargs)
-
     def _check(self, cr, uid, ids):
         for att in self.browse(cr, uid, ids):
             if att.sheet_id and att.sheet_id.state not in ('draft', 'new'):

From f91905c2f024530e6164d64570324375e9c55763 Mon Sep 17 00:00:00 2001
From: rch-openerp <rch@tinyerp.com>
Date: Fri, 15 Apr 2011 15:39:01 +0530
Subject: [PATCH 081/188] [FIX]: Usability: Labels of Account module's Wizards.

bzr revid: rch@tinyerp.com-20110415100901-ya1358pdli70465a
---
 .../account/wizard/account_report_aged_partner_balance.py | 2 +-
 addons/account/wizard/account_report_common.py            | 8 ++++----
 addons/account/wizard/account_report_common_account.py    | 2 +-
 addons/account/wizard/account_report_general_ledger.py    | 4 ++--
 addons/account/wizard/account_report_partner_ledger.py    | 4 ++--
 addons/account/wizard/account_report_print_journal.py     | 2 +-
 addons/account/wizard/account_vat.py                      | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/account/wizard/account_report_aged_partner_balance.py b/addons/account/wizard/account_report_aged_partner_balance.py
index 59784e6e15d..4e6c6dea752 100644
--- a/addons/account/wizard/account_report_aged_partner_balance.py
+++ b/addons/account/wizard/account_report_aged_partner_balance.py
@@ -31,7 +31,7 @@ class account_aged_trial_balance(osv.osv_memory):
     _description = 'Account Aged Trial balance Report'
 
     _columns = {
-        'period_length':fields.integer('Period length (days)', required=True),
+        'period_length':fields.integer('Period Length (days)', required=True),
         'direction_selection': fields.selection([('past','Past'),
                                                  ('future','Future')],
                                                  'Analysis Direction', required=True),
diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py
index 7a8a0365208..42153c096e6 100644
--- a/addons/account/wizard/account_report_common.py
+++ b/addons/account/wizard/account_report_common.py
@@ -30,11 +30,11 @@ class account_common_report(osv.osv_memory):
     _description = "Account Common Report"
 
     _columns = {
-        'chart_account_id': fields.many2one('account.account', 'Chart of account', help='Select Charts of Accounts', required=True, domain = [('parent_id','=',False)]),
-        'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal year', help='Keep empty for all open fiscal year'),
+        'chart_account_id': fields.many2one('account.account', 'Chart of Account', help='Select Charts of Accounts', required=True, domain = [('parent_id','=',False)]),
+        'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', help='Keep empty for all open fiscal year'),
         'filter': fields.selection([('filter_no', 'No Filters'), ('filter_date', 'Date'), ('filter_period', 'Periods')], "Filter by", required=True),
-        'period_from': fields.many2one('account.period', 'Start period'),
-        'period_to': fields.many2one('account.period', 'End period'),
+        'period_from': fields.many2one('account.period', 'Start Period'),
+        'period_to': fields.many2one('account.period', 'End Period'),
         'journal_ids': fields.many2many('account.journal', 'account_common_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
         'date_from': fields.date("Start Date"),
         'date_to': fields.date("End Date"),
diff --git a/addons/account/wizard/account_report_common_account.py b/addons/account/wizard/account_report_common_account.py
index 7205a9e53bf..0040d563bdd 100644
--- a/addons/account/wizard/account_report_common_account.py
+++ b/addons/account/wizard/account_report_common_account.py
@@ -28,7 +28,7 @@ class account_common_account_report(osv.osv_memory):
     _columns = {
         'display_account': fields.selection([('bal_all','All'), ('bal_movement','With movements'),
                                             ('bal_solde','With balance is not equal to 0'),
-                                            ],'Display accounts', required=True),
+                                            ],'Display Accounts', required=True),
 
     }
     _defaults = {
diff --git a/addons/account/wizard/account_report_general_ledger.py b/addons/account/wizard/account_report_general_ledger.py
index c08894bfadd..1e17a66dd85 100644
--- a/addons/account/wizard/account_report_general_ledger.py
+++ b/addons/account/wizard/account_report_general_ledger.py
@@ -28,10 +28,10 @@ class account_report_general_ledger(osv.osv_memory):
 
     _columns = {
         'landscape': fields.boolean("Landscape Mode"),
-        'initial_balance': fields.boolean("Include initial balances",
+        'initial_balance': fields.boolean("Include Initial Balances",
                                           help='It adds initial balance row on report which display previous sum amount of debit/credit/balance'),
         'amount_currency': fields.boolean("With Currency", help="It adds the currency column if the currency is different then the company currency"),
-        'sortby': fields.selection([('sort_date', 'Date'), ('sort_journal_partner', 'Journal & Partner')], 'Sort By', required=True),
+        'sortby': fields.selection([('sort_date', 'Date'), ('sort_journal_partner', 'Journal & Partner')], 'Sort by', required=True),
     }
     _defaults = {
         'landscape': True,
diff --git a/addons/account/wizard/account_report_partner_ledger.py b/addons/account/wizard/account_report_partner_ledger.py
index 1a09a6344f4..590ba80bd02 100644
--- a/addons/account/wizard/account_report_partner_ledger.py
+++ b/addons/account/wizard/account_report_partner_ledger.py
@@ -30,10 +30,10 @@ class account_partner_ledger(osv.osv_memory):
     _description = 'Account Partner Ledger'
 
     _columns = {
-        'initial_balance': fields.boolean('Include initial balances',
+        'initial_balance': fields.boolean('Include Initial Balances',
                                     help='It adds initial balance row on report which display previous sum amount of debit/credit/balance'),
         'reconcil': fields.boolean('Include Reconciled Entries', help='Consider reconciled entries'),
-        'page_split': fields.boolean('One Partner Per Page', help='Display Ledger Report with One partner per page'),
+        'page_split': fields.boolean('One Partner per Page', help='Display Ledger Report with One partner per page'),
         'amount_currency': fields.boolean("With Currency", help="It adds the currency column if the currency is different then the company currency"),
 
     }
diff --git a/addons/account/wizard/account_report_print_journal.py b/addons/account/wizard/account_report_print_journal.py
index b1ca30dc560..f4a5fcaf9f9 100644
--- a/addons/account/wizard/account_report_print_journal.py
+++ b/addons/account/wizard/account_report_print_journal.py
@@ -29,7 +29,7 @@ class account_print_journal(osv.osv_memory):
     _columns = {
         'sort_selection': fields.selection([('date', 'Date'),
                                             ('ref', 'Reference Number'),],
-                                            'Entries Sorted By', required=True),
+                                            'Entries Sorted by', required=True),
     }
     _defaults = {
         'sort_selection': 'date',
diff --git a/addons/account/wizard/account_vat.py b/addons/account/wizard/account_vat.py
index 3aecfb04a30..186f79cad6d 100644
--- a/addons/account/wizard/account_vat.py
+++ b/addons/account/wizard/account_vat.py
@@ -28,7 +28,7 @@ class account_vat_declaration(osv.osv_memory):
     _columns = {
         'based_on': fields.selection([('invoices', 'Invoices'),
                                       ('payments', 'Payments'),],
-                                      'Based On', required=True),
+                                      'Based on', required=True),
         'chart_tax_id': fields.many2one('account.tax.code', 'Chart of Tax', help='Select Charts of Taxes', required=True, domain = [('parent_id','=', False)]),
     }
 

From 995b1bacd84985a25d59dcf4d81da5a1fb9e9ca4 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Fri, 15 Apr 2011 16:11:21 +0530
Subject: [PATCH 082/188] [IMP] sale: optimized code for execute method of
 config wizard

bzr revid: mtr@mtr-20110415104121-30u1fodo8osjw9v3
---
 addons/sale/sale.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 1c0e8cc48f7..4a49a52ede1 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1207,13 +1207,15 @@ class sale_config_picking_policy(osv.osv_memory):
         stock_location_obj = self.pool.get('stock.location')
         location_id = ir_model_data_obj.get_object_reference(cr, uid, 'stock', 'stock_location_output')
         location_id = location_id and location_id[1] or False
+        chaining_type = False
         for o in self.browse(cr, uid, ids, context=context):
             ir_values_obj.set(cr, uid, 'default', False, 'picking_policy', ['sale.order'], o.picking_policy)
             ir_values_obj.set(cr, uid, 'default', False, 'order_policy', ['sale.order'], o.order_policy)
             if o.step == 'one':
-                stock_location_obj.write(cr, uid, [location_id], {'chained_auto_packing': 'transparent'})
-            if o.step == 'two':
-                stock_location_obj.write(cr, uid, [location_id], {'chained_auto_packing': 'manual'})
+                chaining_type = 'transparent'
+            else:
+                chaining_type = 'manual'
+            stock_location_obj.write(cr, uid, [location_id], {'chained_auto_packing': chaining_type})
 
 sale_config_picking_policy()
 

From 25da1b63a304c815c064282256703bfc7d938bb1 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sun, 17 Apr 2011 04:36:34 +0000
Subject: [PATCH 083/188] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110416045916-5ck4ifulww06owks
bzr revid: launchpad_translations_on_behalf_of_openerp-20110417043634-x8jqcrbbylxdj06l
---
 addons/account/i18n/ru.po                |   50 +-
 addons/account_analytic_plans/i18n/ru.po |    9 +-
 addons/board/i18n/ln.po                  |  393 +++++
 addons/caldav/i18n/ca.po                 |  818 +++++++++++
 addons/crm/i18n/ru.po                    |    8 +-
 addons/crm_fundraising/i18n/pt_BR.po     |   10 +-
 addons/email_template/i18n/ca.po         | 1278 ++++++++++++++++
 addons/email_template/i18n/pt_BR.po      |   14 +-
 addons/survey/i18n/ca.po                 | 1717 ++++++++++++++++++++++
 addons/survey/i18n/pt_BR.po              |   56 +-
 addons/wiki/i18n/ru.po                   |   57 +-
 11 files changed, 4316 insertions(+), 94 deletions(-)
 create mode 100644 addons/board/i18n/ln.po
 create mode 100644 addons/caldav/i18n/ca.po
 create mode 100644 addons/email_template/i18n/ca.po
 create mode 100644 addons/survey/i18n/ca.po

diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index 575723fc90d..2a4d65e1ef4 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-03-20 16:41+0000\n"
+"PO-Revision-Date: 2011-04-15 19:34+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-21 04:46+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-16 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -2890,7 +2890,7 @@ msgstr "Вид"
 #: code:addons/account/account.py:2951
 #, python-format
 msgid "BNK%s"
-msgstr ""
+msgstr "БНК%s"
 
 #. module: account
 #: code:addons/account/account.py:2906
@@ -3751,7 +3751,7 @@ msgstr ""
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
-msgstr ""
+msgstr "Искать шаблоны налогов"
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
@@ -4547,7 +4547,7 @@ msgstr ""
 #: code:addons/account/account.py:940
 #, python-format
 msgid "Start period should be smaller then End period"
-msgstr ""
+msgstr "Начало периода должно быть меньше, чем конец периода"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -5090,7 +5090,7 @@ msgstr "Количество"
 #. module: account
 #: view:account.move.line:0
 msgid "Number (Move)"
-msgstr ""
+msgstr "Номер (перемещение)"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -5164,7 +5164,7 @@ msgstr "Фиксированная величина"
 #. module: account
 #: view:account.subscription:0
 msgid "Valid Up to"
-msgstr ""
+msgstr "Действительно до"
 
 #. module: account
 #: view:board.board:0
@@ -5191,7 +5191,7 @@ msgstr ""
 #: 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 ""
+msgstr "Генерировать открывающие проводки"
 
 #. module: account
 #: code:addons/account/account_move_line.py:738
@@ -5261,7 +5261,7 @@ msgstr "Поставщик"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "March"
-msgstr ""
+msgstr "Март"
 
 #. module: account
 #: view:account.account.template:0
@@ -5370,7 +5370,7 @@ msgstr "# строк"
 #: code:addons/account/wizard/account_change_currency.py:60
 #, python-format
 msgid "New currency is not confirured properly !"
-msgstr ""
+msgstr "Новая валюта неправильно настроена !"
 
 #. module: account
 #: field:account.aged.trial.balance,filter:0
@@ -5624,7 +5624,7 @@ msgstr "Настройка отчетов"
 #. module: account
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
-msgstr ""
+msgstr "Для счета и периода должна быть одна компания."
 
 #. module: account
 #: field:account.tax,type:0
@@ -5927,7 +5927,7 @@ msgstr ""
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:57
 #, python-format
 msgid "Enter a Start date !"
-msgstr ""
+msgstr "Введите дату начала !"
 
 #. module: account
 #: report:account.invoice:0
@@ -6141,6 +6141,8 @@ 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
@@ -6315,13 +6317,13 @@ msgstr ""
 #. module: account
 #: view:account.journal.select:0
 msgid "Journal Select"
-msgstr ""
+msgstr "Выбор журнала"
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:65
 #, python-format
 msgid "Currnt currency is not confirured properly !"
-msgstr ""
+msgstr "Текущая валюта неправильно настроена !"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_reconcile
@@ -6468,7 +6470,7 @@ msgstr "Выполнено"
 #. module: account
 #: model:process.transition,note:account.process_transition_invoicemanually0
 msgid "A statement with manual entries becomes a draft statement."
-msgstr ""
+msgstr "Документ с проводками вручную становится черновиком."
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -6782,7 +6784,7 @@ msgstr "Отчетность"
 #. module: account
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr ""
+msgstr "Код журнала должен быть уникальным для компании !"
 
 #. module: account
 #: field:account.bank.statement,ending_details_ids:0
@@ -6822,7 +6824,7 @@ msgstr "Домен"
 #. module: account
 #: model:ir.model,name:account.model_account_use_model
 msgid "Use model"
-msgstr ""
+msgstr "Использовать модель"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_purchase
@@ -7417,7 +7419,7 @@ msgstr "Банковские и кассовые счета"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,residual:0
 msgid "Total Residual"
-msgstr ""
+msgstr "Общий остаток"
 
 #. module: account
 #: model:process.node,note:account.process_node_invoiceinvoice0
@@ -7798,6 +7800,8 @@ msgstr "Поставщики"
 msgid ""
 "You cannot create more than one move per period on centralized journal"
 msgstr ""
+"Вы не можете создать больше одного действия за период по централизованному "
+"журналу."
 
 #. module: account
 #: view:account.journal:0
@@ -8488,7 +8492,7 @@ msgstr ""
 #: model:process.node,note:account.process_node_manually0
 #: model:process.transition,name:account.process_transition_invoicemanually0
 msgid "Manual entry"
-msgstr ""
+msgstr "Проводка вручную"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -8697,7 +8701,7 @@ msgstr "Не сверенные"
 #: code:addons/account/invoice.py:804
 #, python-format
 msgid "Bad total !"
-msgstr ""
+msgstr "Плохой итог !"
 
 #. module: account
 #: field:account.journal,sequence_id:0
@@ -9200,7 +9204,7 @@ msgstr "Определить повторяющиеся проводки"
 #. module: account
 #: field:account.entries.report,date_maturity:0
 msgid "Date Maturity"
-msgstr ""
+msgstr "Дата погашения"
 
 #. module: account
 #: help:account.bank.statement,total_entry_encoding:0
@@ -9228,7 +9232,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_balance_report
 msgid "Trial Balance Report"
-msgstr ""
+msgstr "Балансовый отчет"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
diff --git a/addons/account_analytic_plans/i18n/ru.po b/addons/account_analytic_plans/i18n/ru.po
index ca2f431d36e..6f5f6baa5ba 100644
--- a/addons/account_analytic_plans/i18n/ru.po
+++ b/addons/account_analytic_plans/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:56+0000\n"
-"PO-Revision-Date: 2011-02-19 12:26+0000\n"
+"PO-Revision-Date: 2011-04-15 19:38+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-20 04:34+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-16 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
@@ -154,6 +154,7 @@ msgstr ""
 msgid ""
 "You can not create move line on receivable/payable account without partner"
 msgstr ""
+"Нельзя сделать действие по дебетовому/кредитовому счету без контрагента"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_sale_order_line
@@ -361,7 +362,7 @@ msgstr "Счет 1 уровня"
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
-msgstr ""
+msgstr "Для счета и периода должна быть одна компания."
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,min_required:0
diff --git a/addons/board/i18n/ln.po b/addons/board/i18n/ln.po
new file mode 100644
index 00000000000..0544a3e51ec
--- /dev/null
+++ b/addons/board/i18n/ln.po
@@ -0,0 +1,393 @@
+# Lingala translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-04-15 08:55+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lingala <ln@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: 2011-04-16 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: board
+#: view:res.log.report:0
+msgid "  Year  "
+msgstr "  Mobú  "
+
+#. module: board
+#: model:ir.model,name:board.model_board_menu_create
+msgid "Menu Create"
+msgstr ""
+
+#. module: board
+#: view:board.note:0
+#: field:board.note.type,name:0
+#: model:ir.model,name:board.model_board_note_type
+msgid "Note Type"
+msgstr ""
+
+#. module: board
+#: view:board.note:0
+#: field:board.note,user_id:0
+msgid "Author"
+msgstr ""
+
+#. module: board
+#: model:ir.module.module,shortdesc:board.module_meta_information
+msgid "Dashboard main module"
+msgstr ""
+
+#. module: board
+#: view:res.users:0
+msgid "Latest Connections"
+msgstr ""
+
+#. module: board
+#: code:addons/board/wizard/board_menu_create.py:45
+#, python-format
+msgid "User Error!"
+msgstr ""
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.open_board_administration_form
+#: model:ir.ui.menu,name:board.menu_board_admin
+msgid "Administration Dashboard"
+msgstr ""
+
+#. module: board
+#: view:board.note:0
+#: field:board.note,note:0
+#: model:ir.model,name:board.model_board_note
+msgid "Note"
+msgstr ""
+
+#. module: board
+#: view:board.note:0
+#: view:res.log.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: board
+#: model:ir.model,name:board.model_board_board
+msgid "Board"
+msgstr ""
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.board_weekly_res_log_report_action
+#: view:res.log.report:0
+msgid "Weekly Global Activity"
+msgstr ""
+
+#. module: board
+#: field:board.board.line,name:0
+msgid "Title"
+msgstr ""
+
+#. module: board
+#: field:res.log.report,nbr:0
+msgid "# of Entries"
+msgstr ""
+
+#. module: board
+#: view:res.log.report:0
+#: field:res.log.report,month:0
+msgid "Month"
+msgstr "Sánzá"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.dashboard_open
+msgid "Open Dashboard"
+msgstr ""
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.board_monthly_res_log_report_action
+#: view:res.log.report:0
+msgid "Monthly Activity per Document"
+msgstr ""
+
+#. module: board
+#: view:res.log.report:0
+msgid "Log Analysis"
+msgstr ""
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_view_board_list_form
+#: model:ir.ui.menu,name:board.menu_view_board_form
+msgid "Dashboard Definition"
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "March"
+msgstr "mársi"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "August"
+msgstr "augústo"
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.action_user_connection_tree
+msgid "User Connections"
+msgstr ""
+
+#. module: board
+#: field:res.log.report,creation_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_view_board_note_form
+#: model:ir.ui.menu,name:board.menu_view_board_note_form
+msgid "Publish a note"
+msgstr ""
+
+#. module: board
+#: view:board.menu.create:0
+msgid "Menu Information"
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "June"
+msgstr "yúni"
+
+#. module: board
+#: field:board.note,type:0
+msgid "Note type"
+msgstr ""
+
+#. module: board
+#: field:board.board,line_ids:0
+msgid "Action Views"
+msgstr ""
+
+#. module: board
+#: model:ir.model,name:board.model_res_log_report
+msgid "Log Report"
+msgstr ""
+
+#. module: board
+#: view:board.note:0
+#: field:board.note,date:0
+msgid "Date"
+msgstr "Dáte"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "July"
+msgstr "yúli"
+
+#. module: board
+#: view:res.log.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: board
+#: view:res.log.report:0
+#: field:res.log.report,day:0
+msgid "Day"
+msgstr "Mokɔlɔ"
+
+#. module: board
+#: view:board.menu.create:0
+msgid "Create Menu For Dashboard"
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "February"
+msgstr "febwáli"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "October"
+msgstr "ɔkɔtɔ́bɛ"
+
+#. module: board
+#: model:ir.model,name:board.model_board_board_line
+msgid "Board Line"
+msgstr ""
+
+#. module: board
+#: field:board.menu.create,menu_parent_id:0
+msgid "Parent Menu"
+msgstr ""
+
+#. module: board
+#: view:res.log.report:0
+msgid "    Month-1    "
+msgstr "    Sánzá-1    "
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "January"
+msgstr "yanwáli"
+
+#. module: board
+#: view:board.note:0
+msgid "Notes"
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "November"
+msgstr "novɛ́mbɛ"
+
+#. module: board
+#: help:board.board.line,sequence:0
+msgid ""
+"Gives the sequence order                         when displaying a list of "
+"board lines."
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "April"
+msgstr "apríli"
+
+#. module: board
+#: view:board.board:0
+#: field:board.board,name:0
+#: field:board.board.line,board_id:0
+#: model:ir.ui.menu,name:board.admin_menu_dasboard
+#: model:ir.ui.menu,name:board.menu_dasboard
+msgid "Dashboard"
+msgstr ""
+
+#. module: board
+#: model:ir.module.module,description:board.module_meta_information
+msgid "Base module for all dashboards."
+msgstr ""
+
+#. module: board
+#: field:board.board.line,action_id:0
+msgid "Action"
+msgstr ""
+
+#. module: board
+#: field:board.board.line,position:0
+msgid "Position"
+msgstr ""
+
+#. module: board
+#: view:res.log.report:0
+msgid "Model"
+msgstr ""
+
+#. module: board
+#: field:board.menu.create,menu_name:0
+msgid "Menu Name"
+msgstr ""
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.action_latest_activities_tree
+msgid "Latest Activities"
+msgstr ""
+
+#. module: board
+#: selection:board.board.line,position:0
+msgid "Left"
+msgstr ""
+
+#. module: board
+#: field:board.board,view_id:0
+msgid "Board View"
+msgstr ""
+
+#. module: board
+#: selection:board.board.line,position:0
+msgid "Right"
+msgstr ""
+
+#. module: board
+#: field:board.board.line,width:0
+msgid "Width"
+msgstr ""
+
+#. module: board
+#: view:res.log.report:0
+msgid "   Month   "
+msgstr "   Sánzá   "
+
+#. module: board
+#: field:board.board.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "September"
+msgstr "sɛtɛ́mbɛ"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "December"
+msgstr "dɛsɛ́mbɛ"
+
+#. module: board
+#: view:board.board:0
+#: view:board.menu.create:0
+msgid "Create Menu"
+msgstr ""
+
+#. module: board
+#: field:board.board.line,height:0
+msgid "Height"
+msgstr ""
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_board_menu_create
+msgid "Create Board Menu"
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "May"
+msgstr "máyí"
+
+#. module: board
+#: field:res.log.report,res_model:0
+msgid "Object"
+msgstr ""
+
+#. module: board
+#: view:res.log.report:0
+#: field:res.log.report,name:0
+msgid "Year"
+msgstr "Mobú"
+
+#. module: board
+#: view:board.menu.create:0
+msgid "Cancel"
+msgstr "Tika"
+
+#. module: board
+#: view:board.board:0
+msgid "Dashboard View"
+msgstr ""
+
+#. module: board
+#: code:addons/board/wizard/board_menu_create.py:46
+#, python-format
+msgid "Please Insert Dashboard View(s) !"
+msgstr ""
+
+#. module: board
+#: view:board.note:0
+#: field:board.note,name:0
+msgid "Subject"
+msgstr ""
diff --git a/addons/caldav/i18n/ca.po b/addons/caldav/i18n/ca.po
new file mode 100644
index 00000000000..0d2cd8ec58e
--- /dev/null
+++ b/addons/caldav/i18n/ca.po
@@ -0,0 +1,818 @@
+# Catalan translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-04-15 16:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan <ca@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-04-16 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Value Mapping"
+msgstr ""
+
+#. module: caldav
+#: help:caldav.browse,url:0
+msgid "Url of the caldav server, use for synchronization"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.alias,name:0
+msgid "Filename"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_export
+msgid "Event Export"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Provide path for Remote Calendar"
+msgstr ""
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
+msgid "Import .ics File"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.export:0
+msgid "_Close"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Attendee"
+msgstr ""
+
+#. module: caldav
+#: sql_constraint:basic.calendar.fields:0
+msgid "Can not map a field more than once"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:772
+#: code:addons/caldav/calendar.py:861
+#: code:addons/caldav/wizard/calendar_event_import.py:63
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.lines,object_id:0
+msgid "Object"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Todo"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_user_preference
+msgid "User preference Form"
+msgstr ""
+
+#. module: caldav
+#: field:user.preference,service:0
+msgid "Services"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Expression as constant"
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "Evolution"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: view:calendar.event.subscribe:0
+msgid "Ok"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:861
+#, python-format
+msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
+msgstr ""
+
+#. module: caldav
+#: field:calendar.event.export,name:0
+msgid "File name"
+msgstr ""
+
+#. module: caldav
+#: field:caldav.browse,url:0
+msgid "Caldav Server"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: caldav
+#: help:caldav.browse,caldav_doc_file:0
+msgid "download full caldav Documentation."
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "iPhone"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:32
+#, python-format
+msgid ""
+"\n"
+"  * Webdav server that provides remote access to calendar\n"
+"  * Synchronisation of calendar using WebDAV\n"
+"  * Customize calendar event and todo attribute with any of OpenERP model\n"
+"  * Provides iCal Import/Export functionality\n"
+"\n"
+"    To access Calendars using CalDAV clients, point them to:\n"
+"        "
+"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
+"\n"
+"    To access OpenERP Calendar using WebCal to remote site use the URL "
+"like:\n"
+"        "
+"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
+"\n"
+"      Where,\n"
+"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
+"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
+"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
+"created\n"
+"        CALENDAR_NAME: Name of calendar to access\n"
+"     "
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:147
+#, python-format
+msgid ""
+"\n"
+"Prerequire\n"
+"----------\n"
+"If you are using thunderbird, first you need to install the lightning "
+"module\n"
+"http://www.mozilla.org/projects/calendar/lightning/\n"
+"\n"
+"configuration\n"
+"-------------\n"
+"\n"
+"1. Go to Calendar View\n"
+"\n"
+"2. File -> New Calendar\n"
+"\n"
+"3. Chosse \"On the Network\"\n"
+"\n"
+"4. for format choose CalDav\n"
+"   and as location the url given above (ie : "
+"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
+"   \n"
+"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
+"\"alarm\"\n"
+"\n"
+"6. Then put your openerp login and password (to give the password only check "
+"the box \"Use password Manager to remember this password\"\n"
+"\n"
+"7. Then Finish, your meetings should appear now in your calendar view\n"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar,type:0
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "TODO"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.export:0
+msgid "Export ICS"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Use the field"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:772
+#, python-format
+msgid "Can not create line \"%s\" more than once"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar,line_ids:0
+#: model:ir.model,name:caldav.model_basic_calendar_lines
+msgid "Calendar Lines"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_subscribe
+msgid "Event subscribe"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "Import ICS"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: view:calendar.event.subscribe:0
+#: view:user.preference:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_event
+msgid "basic.calendar.event"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: selection:basic.calendar,type:0
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Event"
+msgstr ""
+
+#. module: caldav
+#: field:document.directory,calendar_collection:0
+#: field:user.preference,collection:0
+msgid "Calendar Collection"
+msgstr ""
+
+#. module: caldav
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr ""
+
+#. module: caldav
+#: view:user.preference:0
+msgid "_Open"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,type:0
+#: field:basic.calendar.attributes,type:0
+#: field:basic.calendar.fields,type_id:0
+#: field:basic.calendar.lines,name:0
+msgid "Type"
+msgstr ""
+
+#. module: caldav
+#: help:calendar.event.export,name:0
+msgid "Save in .ics format"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:1275
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:128
+#, python-format
+msgid ""
+"\n"
+"    1. Go to Calendar View\n"
+"\n"
+"    2. File -> New -> Calendar\n"
+"\n"
+"    3. Fill the form \n"
+"        - type : CalDav\n"
+"        - name : Whaterver you want (ie : Meeting)\n"
+"        - url : "
+"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
+"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
+"given on the top of this window\n"
+"        - uncheck \"User SSL\"\n"
+"        - Username : Your username (ie : Demo)\n"
+"        - Refresh : everytime you want that evolution synchronize the data "
+"with the server\n"
+"\n"
+"    4. Click ok and give your openerp password\n"
+"\n"
+"    5. A new calendar named with the name you gave should appear on the left "
+"side.     \n"
+"     "
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_attributes
+msgid "Calendar attributes"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_caldav_browse
+msgid "Caldav Browse"
+msgstr ""
+
+#. module: caldav
+#: model:ir.module.module,description:caldav.module_meta_information
+msgid ""
+"\n"
+"    This module Contains basic functionality for caldav system like:  \n"
+"  - Webdav server that provides remote access to calendar\n"
+"  - Synchronisation of calendar using WebDAV\n"
+"  - Customize calendar event and todo attribute with any of OpenERP model\n"
+"  - Provides iCal Import/Export functionality\n"
+"\n"
+"    To access Calendars using CalDAV clients, point them to:\n"
+"        "
+"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
+"\n"
+"    To access OpenERP Calendar using WebCal to remote site use the URL "
+"like:\n"
+"        "
+"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
+"\n"
+"      Where,\n"
+"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
+"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
+"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
+"created\n"
+"        CALENDAR_NAME: Name of calendar to access\n"
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "Android based device"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,create_date:0
+msgid "Created Date"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Attributes Mapping"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_document_directory
+msgid "Directory"
+msgstr ""
+
+#. module: caldav
+#: field:calendar.event.subscribe,url_path:0
+msgid "Provide path for remote calendar"
+msgstr ""
+
+#. module: caldav
+#: view:caldav.browse:0
+msgid "_Ok"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.lines,domain:0
+msgid "Domain"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "_Subscribe"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,user_id:0
+msgid "Owner"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar.alias,cal_line_id:0
+#: field:basic.calendar.lines,calendar_id:0
+#: model:ir.ui.menu,name:caldav.menu_calendar
+#: field:user.preference,calendar:0
+msgid "Calendar"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:41
+#, python-format
+msgid ""
+"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_import.py:63
+#, python-format
+msgid "Invalid format of the ics, file can not be imported"
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,service:0
+msgid "CalDAV"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,field_id:0
+msgid "OpenObject Field"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.alias,res_id:0
+msgid "Res. ID"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Message..."
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "Other"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar,has_webcal:0
+msgid "WebCal"
+msgstr ""
+
+#. module: caldav
+#: view:document.directory:0
+#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
+#: model:ir.ui.menu,name:caldav.menu_calendar_collection
+msgid "Calendar Collections"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:798
+#: sql_constraint:basic.calendar.alias:0
+#, python-format
+msgid "The same filename cannot apply to two records!"
+msgstr ""
+
+#. module: caldav
+#: sql_constraint:document.directory:0
+msgid "Directory cannot be parent of itself!"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:document.directory,calendar_ids:0
+#: model:ir.actions.act_window,name:caldav.action_caldav_form
+#: model:ir.ui.menu,name:caldav.menu_caldav_directories
+msgid "Calendars"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,collection_id:0
+msgid "Collection"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,write_date:0
+msgid "Write Date"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:104
+#, python-format
+msgid ""
+"\n"
+"Prerequire\n"
+"----------\n"
+"There is no buit-in way to synchronize calendar with caldav.\n"
+"So you need to install a third part software : Calendar (CalDav) \n"
+"for now it's the only one\n"
+"\n"
+"configuration\n"
+"-------------\n"
+"\n"
+"1. Open Calendar Sync\n"
+"   I'll get an interface with 2 tabs\n"
+"   Stay on the first one\n"
+"   \n"
+"2. CaDAV Calendar URL : put the URL given above (ie : "
+"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
+"\n"
+"3. Put your openerp username and password\n"
+"\n"
+"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
+"\n"
+"5. Then you can synchronize manually or custom the settings to synchronize "
+"every x minutes.\n"
+"    \n"
+"    "
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:53
+#, python-format
+msgid ""
+"\n"
+"    For SSL specific configuration see the documentation below\n"
+"\n"
+"Now, to setup the calendars, you need to:\n"
+"\n"
+"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
+"page.\n"
+"2. Go to \"Add account...\"\n"
+"3. Click on \"Other\"\n"
+"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
+"\n"
+"5. Enter the host's name \n"
+"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
+"openerp.com is the host)\n"
+"\n"
+"6. Fill Username and password with your openerp login and password\n"
+"\n"
+"7. As a description, you can either leave the server's name or\n"
+"   something like \"OpenERP calendars\".\n"
+"\n"
+"9. If you are not using a SSL server, you'll get an error, do not worry and "
+"push \"Continue\"\n"
+"\n"
+"10. Then click to \"Advanced Settings\" to specify the right\n"
+"    ports and paths. \n"
+"    \n"
+"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
+"\n"
+"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
+"    the url given by the wizard (ie : "
+"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
+"\n"
+"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
+"    and verify it can use the account.\n"
+"\n"
+"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
+"    Your OpenERP calendars will be visible inside the selection of the\n"
+"    \"Calendars\" button.\n"
+"    Note that when creating a new calendar entry, you will have to specify\n"
+"    which calendar it should be saved at.\n"
+"\n"
+"\n"
+"\n"
+"IF you need SSL (and your certificate is not a verified one, as usual),\n"
+"then you first will need to let the iPhone trust that. Follow these\n"
+"steps:\n"
+"\n"
+"    s1. Open Safari and enter the https location of the OpenERP server:\n"
+"      https://my.server.ip:8071/\n"
+"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
+"      is the default 8071)\n"
+"    s2. Safari will try to connect and issue a warning about the "
+"certificate\n"
+"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
+"      now trusts it.   \n"
+"    "
+msgstr ""
+
+#. module: caldav
+#: sql_constraint:document.directory:0
+msgid "The directory name must be unique !"
+msgstr ""
+
+#. module: caldav
+#: view:user.preference:0
+msgid "User Preference"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
+#, python-format
+msgid "Please provide Proper URL !"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_timezone
+msgid "basic.calendar.timezone"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,expr:0
+msgid "Expression"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_attendee
+msgid "basic.calendar.attendee"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_alias
+msgid "basic.calendar.alias"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: field:calendar.event.import,file_path:0
+msgid "Select ICS file"
+msgstr ""
+
+#. module: caldav
+#: field:caldav.browse,caldav_doc_file:0
+msgid "Caldav Document"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.lines,mapping_ids:0
+msgid "Fields Mapping"
+msgstr ""
+
+#. module: caldav
+#: view:caldav.browse:0
+msgid "Browse caldav"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar
+msgid "basic.calendar"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Other Info"
+msgstr ""
+
+#. module: caldav
+#: field:user.preference,device:0
+msgid "Software/Devices"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar,has_webcal:0
+msgid ""
+"Also export a <name>.ics entry next to the calendar folder, with WebCal "
+"content."
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,fn:0
+msgid "Function"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar,description:0
+#: view:caldav.browse:0
+#: field:caldav.browse,description:0
+msgid "Description"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar.alias,cal_line_id:0
+msgid "The calendar/line this mapping applies to"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,mapping:0
+msgid "Mapping"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_import.py:86
+#, python-format
+msgid "Import Sucessful"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "_Import"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_import
+msgid "Event Import"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Interval in hours"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Subscribe to Remote Calendar"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar,calendar_color:0
+msgid "For supporting clients, the color of the calendar entries"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,name:0
+#: field:basic.calendar.attributes,name:0
+#: field:basic.calendar.fields,name:0
+msgid "Name"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Alarm"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_alarm
+msgid "basic.calendar.alarm"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:1275
+#, python-format
+msgid "Attendee must have an Email Id"
+msgstr ""
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
+msgid "Export .ics File"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:41
+#, python-format
+msgid "vobject Import Error!"
+msgstr ""
+
+#. module: caldav
+#: field:calendar.event.export,file_path:0
+msgid "Save ICS file"
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "Sunbird/Thunderbird"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,calendar_order:0
+msgid "Order"
+msgstr ""
+
+#. module: caldav
+#: model:ir.module.module,shortdesc:caldav.module_meta_information
+msgid "Share Calendar using CalDAV"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,calendar_color:0
+msgid "Color"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "MY"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_fields
+msgid "Calendar fields"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "Import Message"
+msgstr ""
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
+msgid "Subscribe"
+msgstr ""
+
+#. module: caldav
+#: sql_constraint:document.directory:0
+msgid "Directory must have a parent or a storage"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_todo
+msgid "basic.calendar.todo"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar,calendar_order:0
+msgid "For supporting clients, the order of this folder among the calendars"
+msgstr ""
diff --git a/addons/crm/i18n/ru.po b/addons/crm/i18n/ru.po
index f900b3b37b6..21c2bb2263d 100644
--- a/addons/crm/i18n/ru.po
+++ b/addons/crm/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-03-31 18:13+0000\n"
+"PO-Revision-Date: 2011-04-15 19:44+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-01 04:47+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-16 04:58+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3218,7 +3218,7 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,exdate:0
 msgid "Exception Date/Times"
-msgstr ""
+msgstr "Дата/время исключительной ситуации"
 
 #. module: crm
 #: selection:crm.meeting,class:0
diff --git a/addons/crm_fundraising/i18n/pt_BR.po b/addons/crm_fundraising/i18n/pt_BR.po
index 5aad1af6fe1..fac5dd8283b 100644
--- a/addons/crm_fundraising/i18n/pt_BR.po
+++ b/addons/crm_fundraising/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-02-01 01:58+0000\n"
-"Last-Translator: Adriano Prado <adrianojprado@hotmail.com>\n"
+"PO-Revision-Date: 2011-04-16 20:51+0000\n"
+"Last-Translator: Emerson <Unknown>\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: 2011-02-02 04:41+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-17 04:36+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,planned_revenue:0
@@ -109,7 +109,7 @@ msgstr "Valor"
 #. module: crm_fundraising
 #: model:crm.case.categ,name:crm_fundraising.categ_fund4
 msgid "Arts And Culture"
-msgstr ""
+msgstr "Artes E Cultura"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
diff --git a/addons/email_template/i18n/ca.po b/addons/email_template/i18n/ca.po
new file mode 100644
index 00000000000..ba1128aeedb
--- /dev/null
+++ b/addons/email_template/i18n/ca.po
@@ -0,0 +1,1278 @@
+# Catalan translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-16 11:56+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan <ca@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-04-17 04:36+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: email_template
+#: help:email_template.account,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Email Account Configuration"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:195
+#, python-format
+msgid "Emails for multiple items saved in outbox."
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
+#, python-format
+msgid ""
+"No personal email accounts are configured for you. \n"
+"Either ask admin to enforce an account for this template or get yourself a "
+"personal email account."
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Personal Emails"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,file_name:0
+msgid "Report Filename"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Email Content  "
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send mail Wizard"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Plain Text & HTML with no attachments"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,model_object_field:0
+msgid ""
+"Select the field from the model you want to use.\n"
+"If it is a relationship field you will be able to choose the nested values "
+"in the box below\n"
+"(Note:If there are no values make sure you have selected the correct model)"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,body_html:0
+#: field:email_template.preview,body_text:0
+#: field:email_template.send.wizard,body_html:0
+#: field:email_template.send.wizard,body_text:0
+msgid "Body"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:304
+#, python-format
+msgid "Deletion of Record failed"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,company:0
+msgid ""
+"Select if this mail account does not belong to specific user but to the "
+"organization as a whole. eg: info@companydomain.com"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send now"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,state:0
+msgid "Not Applicable"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+#: model:ir.ui.menu,name:email_template.menu_email_account_all_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_account_all
+msgid "Email Accounts"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send all mails"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,smtpuname:0
+msgid ""
+"Specify the username if your SMTP server requires authentication, otherwise "
+"leave it empty."
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,server_ref:0
+msgid "Server Reference of mail"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+#: selection:email_template.account,state:0
+msgid "Approved"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,def_cc:0
+msgid ""
+"Carbon Copy address(es), comma-separated. Placeholders can be used here. "
+"e.g. ${object.email_cc}"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Account"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,table_html:0
+msgid "HTML code"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Send Mail"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,name:0
+msgid ""
+"The description is used as the Sender name along with the provided From "
+"Email, unless it is already specified in the From Email, e.g: John Doe "
+"<john@doe.com>"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,from_account:0
+msgid "Email Account"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
+#, python-format
+msgid "Email sending failed for one or more objects."
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"Add here all attachments of the current document you want to include in the "
+"Email."
+msgstr ""
+
+#. module: email_template
+#: help:email.template,lang:0
+msgid ""
+"The default language for the email. Placeholders can be used here. eg. "
+"${object.partner_id.lang}"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,sub_model_object_field:0
+msgid ""
+"When you choose relationship fields this field will specify the sub value "
+"you can use."
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Wizard Complete"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,reply_to:0
+#: field:email_template.mailbox,reply_to:0
+#: field:email_template.preview,reply_to:0
+#: field:email_template.send.wizard,reply_to:0
+msgid "Reply-To"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Delete Action"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Approve Account"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,rel_model_ref:0
+#: field:email_template.send.wizard,rel_model_ref:0
+msgid "Referred Document"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,full_success:0
+msgid "Complete Success"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Both HTML & Text (Mixed)"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "OK"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,auto_delete:0
+msgid "Auto Delete"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Both HTML & Text (Alternative)"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,requested:0
+msgid "No of requested Mails"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_body_text:0
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,body_text:0
+msgid "Standard Body (Text)"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,attachment_ids:0
+msgid "Attached Files"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtpssl:0
+msgid "SSL/TLS (only in python 2.6)"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,email_id:0
+msgid "From Email"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:304
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.action_email_template_account_tree_all
+msgid "Accounts"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Body(Text)"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Company Emails"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"Tip: Multiple emails are sent in the same language (the first one is "
+"proposed). We suggest you send emails in groups according to language."
+msgstr ""
+
+#. module: email_template
+#: help:email_template.preview,reply_to:0
+#: help:email_template.send.wizard,reply_to:0
+msgid ""
+"The address recipients should reply to, if different from the From address. "
+"Placeholders can be used here."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_subject:0
+#: field:email_template.mailbox,subject:0
+#: field:email_template.preview,subject:0
+#: field:email_template.send.wizard,subject:0
+msgid "Subject"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:256
+#, python-format
+msgid "Reason: %s"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,email_from:0
+msgid "From"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,ref_template:0
+#: field:email_template.send.wizard,ref_template:0
+msgid "Template"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:367
+#, python-format
+msgid ""
+"Mail from Account %s failed. Probable Reason: Server Send Error\n"
+" Description: %s"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Insert Simple Field"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Body(Html)"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,def_bcc:0
+msgid ""
+"Blind Carbon Copy address(es), comma-separated. Placeholders can be used "
+"here. e.g. ${object.email_bcc}"
+msgstr ""
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
+msgid "Template Preview"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_body_html:0
+msgid "Body (Text-Web Client Only)"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,state:0
+#: view:email_template.mailbox:0
+msgid "State"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,ref_ir_value:0
+msgid "Wizard Button"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,email_id:0
+msgid "eg: 'john@doe.com' or 'John Doe <john@doe.com>'"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: field:email.template,object_name:0
+msgid "Resource"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:255
+#, python-format
+msgid "Out going connection test failed"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:371
+#, python-format
+msgid "Mail from Account %s successfully Sent."
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Standard Body"
+msgstr ""
+
+#. module: email_template
+#: selection:email.template,template_language:0
+msgid "Mako Templates"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,def_body_html:0
+#: help:email.template,def_body_text:0
+msgid "The text version of the mail"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:449
+#, python-format
+msgid " (Email Attachment)"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,folder:0
+msgid "Sent Items"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Test Outgoing Connection"
+msgstr ""
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
+msgid "Mailbox"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,reply_to:0
+msgid ""
+"The address recipients should reply to, if different from the From address. "
+"Placeholders can be used here. e.g. ${object.email_reply_to}"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,ref_ir_value:0
+msgid ""
+"Button in the side bar of the form view of this Resource that will invoke "
+"the Window Action"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,account_id:0
+msgid "User account"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,signature:0
+msgid "Attach my signature to mail"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:255
+#: view:email.template:0
+#, python-format
+msgid "Report"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,sub_model_object_field:0
+msgid "Sub Field"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.mailbox:0
+msgid "Advanced"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "My Emails"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Expression Builder"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,sub_object:0
+msgid ""
+"When a relation field is used this field will show you the type of field you "
+"have selected"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "HTML Body"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Suspend Account"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,null_value:0
+msgid "This Value is used if the field is empty"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Preview Template"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtpserver:0
+msgid "Server"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,copyvalue:0
+msgid ""
+"Copy and paste the value in the location you want to use a system value."
+msgstr ""
+
+#. module: email_template
+#: help:email.template,track_campaign_item:0
+msgid ""
+"Enable this is you wish to include a special tracking marker in outgoing "
+"emails so you can identify replies and link them back to the corresponding "
+"resource record. This is useful for CRM leads for example"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Body (Raw HTML)"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,use_sign:0
+msgid "Signature"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,sub_object:0
+msgid "Sub-model"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Options"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Body (Plain Text)"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Body (Text)"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,date_mail:0
+msgid "Rec/Sent Date"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,state:0
+msgid "Initiated"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,report_template:0
+msgid "Report to send"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Server Information"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,generated:0
+msgid "No of generated Mails"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Mail Details"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:235
+#, python-format
+msgid "SMTP SERVER or PORT not specified"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Note: This is Raw HTML."
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Group by..."
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Multiple Mail Wizard Step 1"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,user:0
+msgid "Related User"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,body_html:0
+msgid "Body (Rich Text Clients Only)"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,company:0
+msgid "Yes"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,ref_ir_act_window:0
+msgid "Window Action"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "HTML, otherwise Text"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Drafts"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,company:0
+msgid "No"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtpport:0
+msgid "SMTP Port"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,mail_type:0
+msgid "Mail Contents"
+msgstr ""
+
+#. module: email_template
+#: sql_constraint:email.template:0
+msgid "The template name must be unique !"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_bcc:0
+#: field:email_template.mailbox,email_bcc:0
+#: field:email_template.preview,bcc:0
+#: field:email_template.send.wizard,bcc:0
+msgid "BCC"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Plain Text"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Draft"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,model_int_name:0
+msgid "Model Internal Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,message_id:0
+#: field:email_template.mailbox,message_id:0
+#: field:email_template.preview,message_id:0
+#: field:email_template.send.wizard,message_id:0
+msgid "Message-ID"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.mailbox,server_ref:0
+msgid "Applicable for inward items only"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"After clicking send all mails, mails will be sent to outbox and cleared in "
+"next Send/Recieve"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,state:0
+#: field:email_template.send.wizard,state:0
+msgid "Status"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Outgoing"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:427
+#, python-format
+msgid "Datetime Extraction failed.Date:%s                       \tError:%s"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,use_sign:0
+msgid "the signature from the User details will be appended to the mail"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,from:0
+msgid "From Account"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Intermixed content"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Request Re-activation"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_tree_all
+#: model:ir.ui.menu,name:email_template.menu_email_template_all
+#: model:ir.ui.menu,name:email_template.menu_email_template_all_tools
+msgid "Email Templates"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtpuname:0
+msgid "User Name"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,user:0
+msgid "User"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Advanced Options"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Outbox"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Save in Drafts"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:362
+#, python-format
+msgid ""
+"Mail from Account %s failed. Probable Reason:MIME Error\n"
+"Description: %s"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtptls:0
+msgid "TLS"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,lang:0
+msgid "Language"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:275
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:362
+#: code:addons/email_template/email_template_account.py:371
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:424
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
+#: model:ir.ui.menu,name:email_template.menu_email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_config_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
+#: model:ir.ui.menu,name:email_template.menu_email_template_tools
+#, python-format
+msgid "Email Template"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Send/Receive"
+msgstr ""
+
+#. module: email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
+msgid "Personal Mails"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+#: selection:email_template.account,state:0
+msgid "Suspended"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,allowed_groups:0
+msgid ""
+"Only users from these groups will be allowed to send mails from this Template"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:284
+#, python-format
+msgid "Send Mail (%s)"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,def_subject:0
+msgid "The subject of email. Placeholders can be used here."
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,report:0
+msgid "Report File Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,copyvalue:0
+msgid "Expression"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,history:0
+msgid "History"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,attachments_ids:0
+#: view:email_template.send.wizard:0
+#: field:email_template.send.wizard,attachment_ids:0
+msgid "Attachments"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,to:0
+#: field:email_template.send.wizard,to:0
+msgid "To"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Text, otherwise HTML"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:319
+#, python-format
+msgid "Copy of template %s"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Discard Mail"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template
+msgid "Email Templates for Models"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Close"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_mailbox.py:49
+#, python-format
+msgid "Error sending mail: %s"
+msgstr ""
+
+#. module: email_template
+#: constraint:email_template.account:0
+msgid "Error: You are not allowed to have more than 1 account."
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Body (HTML-Web Client Only)"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:253
+#, python-format
+msgid "%s (Email Attachment)"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,state:0
+msgid "Sending"
+msgstr ""
+
+#. module: email_template
+#: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
+msgid ""
+"An email template is an email document that will be sent as part of a "
+"marketing campaign. You can personalize it according to specific customer "
+"profile fields, so that a partner name or other partner related information "
+"may be inserted automatically."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,allowed_groups:0
+msgid "Allowed User Groups"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,model_object_field:0
+msgid "Field"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "User Information"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Actions"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:363
+#: code:addons/email_template/email_template_account.py:368
+#, python-format
+msgid ""
+"Server Send Error\n"
+"Description: %s"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,file_name:0
+msgid ""
+"Name of the generated report file. Placeholders can be used in the filename. "
+"eg: 2009_SO003.pdf"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.mailbox,date_mail:0
+msgid "Date on which Email Sent or Received"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Trash"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_mailbox
+msgid "Email Mailbox"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_mailbox.py:116
+#, python-format
+msgid ""
+"Sending of Mail %s failed. Probable Reason:Could not login to server\n"
+"Error: %s"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
+#, python-format
+msgid "Missing mail account"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:250
+#, python-format
+msgid "SMTP Test Connection Was Successful"
+msgstr ""
+
+#. module: email_template
+#: model:ir.module.module,shortdesc:email_template.module_meta_information
+msgid "Email Template for OpenERP"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,name:0
+msgid "Description"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Create Action"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,smtpserver:0
+msgid "Enter name of outgoing server, eg: smtp.yourdomain.com"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,attachment_ids:0
+msgid ""
+"You may attach existing files to this template, so they will be added in all "
+"emails created from this template"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,message_id:0
+msgid ""
+"Specify the Message-ID SMTP header to use in outgoing emails. Please note "
+"that this overrides the Resource tracking option! Placeholders can be used "
+"here."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_to:0
+#: field:email_template.mailbox,email_to:0
+msgid "Recipient (To)"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,null_value:0
+msgid "Null Value"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,template_language:0
+msgid "Templating Language"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_cc:0
+#: field:email_template.mailbox,email_cc:0
+#: field:email_template.preview,cc:0
+#: field:email_template.send.wizard,cc:0
+msgid "CC"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Sent"
+msgstr ""
+
+#. module: email_template
+#: sql_constraint:email_template.account:0
+msgid "Another setting already exists with this email ID !"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,ref_ir_act_window:0
+msgid "Action that will open this email template on Resource records"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtppass:0
+msgid "Password"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.preview,message_id:0
+#: help:email_template.send.wizard,message_id:0
+msgid ""
+"The Message-ID header value, if you need tospecify it, for example to "
+"automatically recognize the replies later. Placeholders can be used here."
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
+msgid "Emails"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Templates"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,report:0
+msgid "Report Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,name:0
+msgid "Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,track_campaign_item:0
+msgid "Resource Tracking"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_preview
+msgid "Email Template Preview"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Email Preview"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,def_to:0
+msgid ""
+"The Recipient of email. Placeholders can be used here. e.g. "
+"${object.email_to}"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Existing files"
+msgstr ""
+
+#. module: email_template
+#: model:ir.module.module,description:email_template.module_meta_information
+msgid ""
+"\n"
+"    Email Template is extraction of Power Email basically just to send the "
+"emails.\n"
+"    "
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Body (HTML)"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,table_html:0
+msgid ""
+"Copy this html code to your HTML message body for displaying the info in "
+"your mail."
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_account
+msgid "email_template.account"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,rel_model:0
+#: field:email_template.send.wizard,rel_model:0
+msgid "Model"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:236
+#, python-format
+msgid "Core connection for the given ID does not exist"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,company:0
+msgid "Corporate"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:275
+#, python-format
+msgid ""
+"Mail from Account %s failed on login. Probable Reason:Could not login to "
+"server\n"
+"Error: %s"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_send_wizard
+msgid "This is the wizard for sending mail"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Addresses"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,from_account:0
+msgid "Emails will be sent from this approved account."
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,send_pref:0
+msgid "Mail Format"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,folder:0
+msgid "Folder"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Company Accounts"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,smtpport:0
+msgid "Enter port number, eg: 25 or 587"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
+#, python-format
+msgid "email-template"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:375
+#, python-format
+msgid "Mail from Account %s failed. Probable Reason:Account not approved"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Simple Mail Wizard Step 1"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Has Attachments"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:452
+#: code:addons/email_template/wizard/email_template_send_wizard.py:256
+#, python-format
+msgid "No Description"
+msgstr ""
diff --git a/addons/email_template/i18n/pt_BR.po b/addons/email_template/i18n/pt_BR.po
index 31c40f452d3..8138216ef67 100644
--- a/addons/email_template/i18n/pt_BR.po
+++ b/addons/email_template/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-03-26 15:24+0000\n"
+"PO-Revision-Date: 2011-04-16 20:56+0000\n"
 "Last-Translator: Emerson <Unknown>\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: 2011-03-27 04:53+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-17 04:36+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: email_template
 #: help:email_template.account,auto_delete:0
@@ -142,7 +142,7 @@ msgstr ""
 #. module: email_template
 #: field:email_template.mailbox,server_ref:0
 msgid "Server Reference of mail"
-msgstr ""
+msgstr "Referência do Servidor de email"
 
 #. module: email_template
 #: view:email_template.account:0
@@ -237,7 +237,7 @@ msgstr "Responder-Para"
 #. module: email_template
 #: view:email.template:0
 msgid "Delete Action"
-msgstr ""
+msgstr "Excluir Ação"
 
 #. module: email_template
 #: view:email_template.account:0
@@ -375,6 +375,8 @@ msgid ""
 "Mail from Account %s failed. Probable Reason: Server Send Error\n"
 " Description: %s"
 msgstr ""
+"O email da conta %s falhou. Razão Provável: Erro Enviado pelo Servidor\n"
+" Descrição: %s"
 
 #. module: email_template
 #: view:email.template:0
@@ -727,7 +729,7 @@ msgstr "Rascunho"
 #. module: email_template
 #: field:email.template,model_int_name:0
 msgid "Model Internal Name"
-msgstr ""
+msgstr "Nome Interno do Modelo"
 
 #. module: email_template
 #: field:email.template,message_id:0
diff --git a/addons/survey/i18n/ca.po b/addons/survey/i18n/ca.po
new file mode 100644
index 00000000000..858f5b3952b
--- /dev/null
+++ b/addons/survey/i18n/ca.po
@@ -0,0 +1,1717 @@
+# Catalan translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-03 16:58+0000\n"
+"PO-Revision-Date: 2011-04-16 13:20+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan <ca@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-04-17 04:36+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+
+#. module: survey
+#: view:survey.print:0
+#: view:survey.print.answer:0
+msgid "Print Option"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:422
+#, python-format
+msgid ""
+"Minimum Required Answer you                                     entered is "
+"greater than the number of answer.                                      "
+"Please use a number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: view:survey.question.wiz:0
+msgid "Your Messages"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_valid_type:0
+#: field:survey.question,validation_type:0
+msgid "Text Validation"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:434
+#, python-format
+msgid ""
+"Maximum Required Answer you                                     entered for "
+"your maximum is greater than the number of answer.                           "
+"           Please use a number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: field:survey,invited_user_ids:0
+msgid "Invited User"
+msgstr ""
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Character"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_form1
+#: model:ir.ui.menu,name:survey.menu_print_survey_form
+#: model:ir.ui.menu,name:survey.menu_reporting
+#: model:ir.ui.menu,name:survey.menu_survey_form
+#: model:ir.ui.menu,name:survey.menu_surveys
+msgid "Surveys"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Set to draft"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,in_visible_answer_type:0
+msgid "Is Answer Type Invisible?"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+#: view:survey.request:0
+msgid "Group By..."
+msgstr ""
+
+#. module: survey
+#: view:survey.send.invitation.log:0
+msgid "Results :"
+msgstr ""
+
+#. module: survey
+#: view:survey.request:0
+msgid "Survey Request"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "A Range"
+msgstr ""
+
+#. module: survey
+#: view:survey.response.line:0
+msgid "Table Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.history,date:0
+msgid "Date started"
+msgstr ""
+
+#. module: survey
+#: field:survey,history:0
+msgid "History Lines"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:448
+#, python-format
+msgid ""
+"You must enter one or more menu                                 choices in "
+"column heading (white spaces not allowed)"
+msgstr ""
+
+#. module: survey
+#: field:survey.question.column.heading,in_visible_menu_choice:0
+msgid "Is Menu Choice Invisible??"
+msgstr ""
+
+#. module: survey
+#: field:survey.send.invitation,mail:0
+msgid "Body"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,allow_comment:0
+msgid "Allow Comment Field"
+msgstr ""
+
+#. module: survey
+#: selection:survey.print,paper_size:0
+#: selection:survey.print.answer,paper_size:0
+msgid "A4 (210mm x 297mm)"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_maximum_date:0
+#: field:survey.question,validation_maximum_date:0
+msgid "Maximum date"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,in_visible_menu_choice:0
+msgid "Is Menu Choice Invisible?"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Completed"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "Exactly"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Open Date"
+msgstr ""
+
+#. module: survey
+#: view:survey.request:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,is_comment_require:0
+msgid "Add Comment Field"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:401
+#, python-format
+msgid ""
+"#Required Answer you entered                                     is greater "
+"than the number of answer.                                     Please use a "
+"number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: field:survey.question,tot_resp:0
+msgid "Total Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.tbl.column.heading,name:0
+msgid "Row Number"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_name_wiz
+msgid "survey.name.wiz"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_question_form
+msgid "Survey Questions"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Matrix of Choices (Only One Answers Per Row)"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:475
+#, python-format
+msgid ""
+"Maximum Required Answer you entered for your maximum is greater than the "
+"number of answer. Please use a number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_question_message
+#: model:ir.model,name:survey.model_survey_question
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Survey Question"
+msgstr ""
+
+#. module: survey
+#: view:survey.question.column.heading:0
+msgid "Use if question type is rating_scale"
+msgstr ""
+
+#. module: survey
+#: field:survey.print,page_number:0
+#: field:survey.print.answer,page_number:0
+msgid "Include Page Number"
+msgstr ""
+
+#. module: survey
+#: view:survey.page:0
+#: view:survey.question:0
+#: view:survey.send.invitation.log:0
+msgid "Ok"
+msgstr ""
+
+#. module: survey
+#: field:survey.page,title:0
+msgid "Page Title"
+msgstr ""
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_define_survey
+msgid "Define Surveys"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_history
+msgid "Survey History"
+msgstr ""
+
+#. module: survey
+#: field:survey.response.answer,comment:0
+#: field:survey.response.line,comment:0
+msgid "Notes"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.request:0
+msgid "Search Survey"
+msgstr ""
+
+#. module: survey
+#: field:survey.response.answer,answer:0
+#: field:survey.tbl.column.heading,value:0
+msgid "Value"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,column_heading_ids:0
+msgid " Column heading"
+msgstr ""
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_run_survey_form
+msgid "Answer a Survey"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:92
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: survey
+#: field:survey,tot_comp_survey:0
+msgid "Total Completed Survey"
+msgstr ""
+
+#. module: survey
+#: view:survey.response.answer:0
+msgid "(Use Only Question Type is matrix_of_drop_down_menus)"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.report.xml,name:survey.survey_analysis
+msgid "Survey Statistics"
+msgstr ""
+
+#. module: survey
+#: selection:survey,state:0
+#: view:survey.request:0
+#: selection:survey.request,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Rating Scale"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_field_type:0
+msgid "Comment Field Type"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:375
+#: code:addons/survey/survey.py:387
+#: code:addons/survey/survey.py:401
+#: code:addons/survey/survey.py:406
+#: code:addons/survey/survey.py:416
+#: code:addons/survey/survey.py:422
+#: code:addons/survey/survey.py:428
+#: code:addons/survey/survey.py:434
+#: code:addons/survey/survey.py:438
+#: code:addons/survey/survey.py:444
+#: code:addons/survey/survey.py:448
+#: code:addons/survey/survey.py:458
+#: code:addons/survey/survey.py:462
+#: code:addons/survey/survey.py:467
+#: code:addons/survey/survey.py:473
+#: code:addons/survey/survey.py:475
+#: code:addons/survey/survey.py:477
+#: code:addons/survey/survey.py:482
+#: code:addons/survey/survey.py:484
+#: code:addons/survey/survey.py:642
+#: code:addons/survey/wizard/survey_answer.py:124
+#: code:addons/survey/wizard/survey_answer.py:131
+#: code:addons/survey/wizard/survey_answer.py:699
+#: code:addons/survey/wizard/survey_answer.py:738
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:787
+#: code:addons/survey/wizard/survey_answer.py:792
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:811
+#: code:addons/survey/wizard/survey_answer.py:820
+#: code:addons/survey/wizard/survey_answer.py:825
+#: code:addons/survey/wizard/survey_answer.py:899
+#: code:addons/survey/wizard/survey_answer.py:935
+#: code:addons/survey/wizard/survey_answer.py:953
+#: code:addons/survey/wizard/survey_answer.py:981
+#: code:addons/survey/wizard/survey_answer.py:984
+#: code:addons/survey/wizard/survey_answer.py:987
+#: code:addons/survey/wizard/survey_answer.py:999
+#: code:addons/survey/wizard/survey_answer.py:1006
+#: code:addons/survey/wizard/survey_answer.py:1009
+#: code:addons/survey/wizard/survey_selection.py:134
+#: code:addons/survey/wizard/survey_selection.py:138
+#: code:addons/survey/wizard/survey_send_invitation.py:74
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,comment_field_type:0
+msgid "Single Line Of Text"
+msgstr ""
+
+#. module: survey
+#: view:survey.send.invitation:0
+#: field:survey.send.invitation,send_mail_existing:0
+msgid "Send reminder for existing user"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Multiple Choice (Multiple Answer)"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Edit Survey"
+msgstr ""
+
+#. module: survey
+#: view:survey.response.line:0
+msgid "Survey Answer Line"
+msgstr ""
+
+#. module: survey
+#: field:survey.question.column.heading,menu_choice:0
+msgid "Menu Choice"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "At Most"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,is_validation_require:0
+msgid "Validate Text"
+msgstr ""
+
+#. module: survey
+#: field:survey.response.line,single_text:0
+msgid "Text"
+msgstr ""
+
+#. module: survey
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: survey
+#: selection:survey.print,paper_size:0
+#: selection:survey.print.answer,paper_size:0
+msgid "Letter (8.5\" x 11\")"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: field:survey,responsible_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_request
+msgid "survey.request"
+msgstr ""
+
+#. module: survey
+#: field:survey.send.invitation,mail_subject:0
+#: field:survey.send.invitation,mail_subject_existing:0
+msgid "Subject"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_maximum_float:0
+#: field:survey.question,validation_maximum_float:0
+msgid "Maximum decimal number"
+msgstr ""
+
+#. module: survey
+#: selection:survey.request,state:0
+msgid "Wating Answer"
+msgstr ""
+
+#. module: survey
+#: view:survey.request:0
+msgid "Late"
+msgstr ""
+
+#. module: survey
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: survey
+#: field:survey.send.invitation,mail_from:0
+msgid "From"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Don't Validate Comment Text."
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be A Whole Number"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,question_id:0
+#: field:survey.page,question_ids:0
+#: field:survey.question,question:0
+#: field:survey.question.column.heading,question_id:0
+#: field:survey.response.line,question_id:0
+msgid "Question"
+msgstr ""
+
+#. module: survey
+#: view:survey.page:0
+msgid "Search Survey Page"
+msgstr ""
+
+#. module: survey
+#: view:survey.send.invitation:0
+msgid "Send"
+msgstr ""
+
+#. module: survey
+#: field:survey.question.wiz,name:0
+msgid "Number"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:444
+#, python-format
+msgid ""
+"You must enter one or more menu choices                                 in "
+"column heading"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,help:survey.action_survey_form1
+msgid ""
+"You can create survey for different purposes: recruitment interviews, "
+"employee's periodical evaluations, marketing campaigns, etc. A survey is "
+"made of pages containing questions of several types: text, multiple choices, "
+"etc. You can edit survey manually or click on the 'Edit Survey' for a "
+"WYSIWYG interface."
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.request:0
+#: field:survey.request,state:0
+msgid "State"
+msgstr ""
+
+#. module: survey
+#: view:survey.request:0
+msgid "Evaluation Plan Phase"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Between"
+msgstr ""
+
+#. module: survey
+#: view:survey.print:0
+#: view:survey.print.answer:0
+#: view:survey.print.statistics:0
+msgid "Print"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,make_comment_field:0
+msgid "Make Comment Field an Answer Choice"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: field:survey,type:0
+msgid "Type"
+msgstr ""
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Email"
+msgstr ""
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_answer_surveys
+msgid "Answer Surveys"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response,state:0
+msgid "Not Finished"
+msgstr ""
+
+#. module: survey
+#: view:survey.print:0
+msgid "Survey Print"
+msgstr ""
+
+#. module: survey
+#: view:survey.send.invitation:0
+msgid "Select Partner"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,type:0
+msgid "Question Type"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:131
+#, python-format
+msgid "You can not answer this survey more than %s times"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_answer
+msgid "Answers"
+msgstr ""
+
+#. module: survey
+#: model:ir.module.module,description:survey.module_meta_information
+msgid ""
+"\n"
+"    This module is used for surveying. It depends on the answers or reviews "
+"of some questions by different users.\n"
+"    A survey may have multiple pages. Each page may contain multiple "
+"questions and each question may have multiple answers.\n"
+"    Different users may give different answers of question and according to "
+"that survey is done. \n"
+"    Partners are also sent mails with user name and password for the "
+"invitation of the survey\n"
+"    "
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:124
+#, python-format
+msgid "You can not answer because the survey is not open"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response,response_type:0
+msgid "Link"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_type_form
+#: model:ir.model,name:survey.model_survey_type
+#: view:survey.type:0
+msgid "Survey Type"
+msgstr ""
+
+#. module: survey
+#: field:survey.page,sequence:0
+msgid "Page Nr"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+#: field:survey.question,descriptive_text:0
+#: selection:survey.question,type:0
+msgid "Descriptive Text"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,minimum_req_ans:0
+msgid "Minimum Required Answer"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:484
+#, python-format
+msgid ""
+"You must enter one or more menu choices in column heading (white spaces not "
+"allowed)"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,req_error_msg:0
+msgid "Error Message"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:482
+#, python-format
+msgid "You must enter one or more menu choices in column heading"
+msgstr ""
+
+#. module: survey
+#: field:survey.request,date_deadline:0
+msgid "Deadline date"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be A Date"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_print
+msgid "survey.print"
+msgstr ""
+
+#. module: survey
+#: view:survey.question.column.heading:0
+#: field:survey.question.column.heading,title:0
+msgid "Column Heading"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,is_require_answer:0
+msgid "Require Answer to Question"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_request_tree
+#: model:ir.ui.menu,name:survey.menu_survey_type_form1
+msgid "Survey Requests"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:375
+#: code:addons/survey/survey.py:462
+#, python-format
+msgid "You must enter one or more column heading."
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:953
+#, python-format
+msgid "Please enter an integer value"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_browse_answer
+msgid "survey.browse.answer"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,comment_field_type:0
+msgid "Paragraph of Text"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:428
+#, python-format
+msgid ""
+"Maximum Required Answer you                                     entered for "
+"your maximum is greater than the number of answer.                           "
+"          Please use a number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: view:survey.request:0
+msgid "Watting Answer"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "When the question is not answered, display this error message:"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Options"
+msgstr ""
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_browse_survey_response
+msgid "Browse Answers"
+msgstr ""
+
+#. module: survey
+#: field:survey.response.answer,comment_field:0
+#: view:survey.response.line:0
+msgid "Comment"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_answer
+#: model:ir.model,name:survey.model_survey_response_answer
+#: view:survey.answer:0
+#: view:survey.response:0
+#: view:survey.response.answer:0
+#: view:survey.response.line:0
+msgid "Survey Answer"
+msgstr ""
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Selection"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_browse_survey_response
+#: view:survey:0
+msgid "Answer Survey"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Comment Field"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response,response_type:0
+msgid "Manually"
+msgstr ""
+
+#. module: survey
+#: help:survey,responsible_id:0
+msgid "User responsible for survey"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_column:0
+msgid "Add comment column in matrix"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,response:0
+msgid "#Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.print,without_pagebreak:0
+#: field:survey.print.answer,without_pagebreak:0
+msgid "Print Without Page Breaks"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "When the comment is an invalid format, display this error message"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_selection.py:138
+#, python-format
+msgid ""
+"You can not give more response. Please contact the author of this survey for "
+"further assistance."
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_page_question
+#: model:ir.actions.act_window,name:survey.act_survey_question
+msgid "Questions"
+msgstr ""
+
+#. module: survey
+#: help:survey,response_user:0
+msgid "Set to one if  you require only one Answer per user"
+msgstr ""
+
+#. module: survey
+#: field:survey,users:0
+msgid "Users"
+msgstr ""
+
+#. module: survey
+#: view:survey.send.invitation:0
+msgid "Message"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.request:0
+msgid "MY"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,maximum_req_ans:0
+msgid "Maximum Required Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.name.wiz,page_no:0
+msgid "Page Number"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:92
+#, python-format
+msgid "Cannot locate survey for the question wizard!"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "and"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_print_statistics
+#: view:survey.print.statistics:0
+msgid "Survey Print Statistics"
+msgstr ""
+
+#. module: survey
+#: field:survey.send.invitation.log,note:0
+msgid "Log"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "When the choices do not add up correctly, display this error message"
+msgstr ""
+
+#. module: survey
+#: field:survey,date_close:0
+msgid "Survey Close Date"
+msgstr ""
+
+#. module: survey
+#: field:survey,date_open:0
+msgid "Survey Open Date"
+msgstr ""
+
+#. module: survey
+#: field:survey.question.column.heading,in_visible_rating_weight:0
+msgid "Is Rating Scale Invisible ??"
+msgstr ""
+
+#. module: survey
+#: view:survey.browse.answer:0
+#: view:survey.name.wiz:0
+msgid "Start"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:477
+#, python-format
+msgid "Maximum Required Answer is greater than Minimum Required Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_maximum_no:0
+#: field:survey.question,validation_maximum_no:0
+msgid "Maximum number"
+msgstr ""
+
+#. module: survey
+#: selection:survey,state:0
+#: selection:survey.request,state:0
+#: selection:survey.response.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_print_statistics
+msgid "survey.print.statistics"
+msgstr ""
+
+#. module: survey
+#: selection:survey,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Matrix of Drop-down Menus"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: field:survey.answer,answer:0
+#: field:survey.name.wiz,response:0
+#: view:survey.page:0
+#: view:survey.print.answer:0
+#: field:survey.print.answer,response_ids:0
+#: view:survey.question:0
+#: field:survey.question,answer_choice_ids:0
+#: field:survey.request,response:0
+#: field:survey.response,question_ids:0
+#: field:survey.response.answer,answer_id:0
+#: field:survey.response.answer,response_id:0
+#: view:survey.response.line:0
+#: field:survey.response.line,response_answer_ids:0
+#: field:survey.response.line,response_id:0
+#: field:survey.response.line,response_table_ids:0
+#: field:survey.send.invitation,partner_ids:0
+#: field:survey.tbl.column.heading,response_table_id:0
+msgid "Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey,max_response_limit:0
+msgid "Maximum Answer Limit"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_act_view_survey_send_invitation
+msgid "Send Invitations"
+msgstr ""
+
+#. module: survey
+#: field:survey.name.wiz,store_ans:0
+msgid "Store Answer"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Date and Time"
+msgstr ""
+
+#. module: survey
+#: field:survey,state:0
+#: field:survey.response,state:0
+#: field:survey.response.line,state:0
+msgid "Status"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_print
+msgid "Print Survey"
+msgstr ""
+
+#. module: survey
+#: field:survey,send_response:0
+msgid "E-mail Notification on Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.response.answer,value_choice:0
+msgid "Value Choice"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Started"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_print_answer
+#: view:survey:0
+#: view:survey.print.answer:0
+msgid "Print Answer"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Multiple Textboxes"
+msgstr ""
+
+#. module: survey
+#: selection:survey.print,orientation:0
+#: selection:survey.print.answer,orientation:0
+msgid "Landscape(Horizontal)"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,no_of_rows:0
+msgid "No of Rows"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.name.wiz:0
+msgid "Survey Details"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Multiple Textboxes With Different Type"
+msgstr ""
+
+#. module: survey
+#: view:survey.question.column.heading:0
+msgid "Menu Choices (each choice on separate lines)"
+msgstr ""
+
+#. module: survey
+#: field:survey.response,response_type:0
+msgid "Answer Type"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Validation"
+msgstr ""
+
+#. module: survey
+#: view:survey.request:0
+#: selection:survey.request,state:0
+msgid "Waiting Answer"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be A Decimal Number"
+msgstr ""
+
+#. module: survey
+#: field:res.users,survey_id:0
+msgid "Groups"
+msgstr ""
+
+#. module: survey
+#: selection:survey.answer,type:0
+#: selection:survey.question,type:0
+msgid "Date"
+msgstr ""
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Integer"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_send_invitation
+msgid "survey.send.invitation"
+msgstr ""
+
+#. module: survey
+#: field:survey.history,user_id:0
+#: view:survey.request:0
+#: field:survey.request,user_id:0
+#: field:survey.response,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: survey
+#: field:survey.name.wiz,transfer:0
+msgid "Page Transfer"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response.line,state:0
+msgid "Skiped"
+msgstr ""
+
+#. module: survey
+#: field:survey.print,paper_size:0
+#: field:survey.print.answer,paper_size:0
+msgid "Paper Size"
+msgstr ""
+
+#. module: survey
+#: field:survey.response.answer,column_id:0
+#: field:survey.tbl.column.heading,column_id:0
+msgid "Column"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_tbl_column_heading
+msgid "survey.tbl.column.heading"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_response_line
+msgid "Survey Response Line"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_selection.py:134
+#, python-format
+msgid "You can not give response for this survey more than %s times"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.report.xml,name:survey.report_survey_form
+#: model:ir.model,name:survey.model_survey
+#: view:survey:0
+#: view:survey.browse.answer:0
+#: field:survey.browse.answer,survey_id:0
+#: field:survey.history,survey_id:0
+#: view:survey.name.wiz:0
+#: field:survey.name.wiz,survey_id:0
+#: view:survey.page:0
+#: field:survey.page,survey_id:0
+#: view:survey.print:0
+#: field:survey.print,survey_ids:0
+#: field:survey.print.statistics,survey_ids:0
+#: field:survey.question,survey:0
+#: view:survey.request:0
+#: field:survey.request,survey_id:0
+#: field:survey.response,survey_id:0
+msgid "Survey"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,in_visible_rating_weight:0
+msgid "Is Rating Scale Invisible?"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Numerical Textboxes"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_question_wiz
+msgid "survey.question.wiz"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "History"
+msgstr ""
+
+#. module: survey
+#: help:survey.browse.answer,response_id:0
+msgid ""
+"If this field is empty, all answers of the selected survey will be print."
+msgstr ""
+
+#. module: survey
+#: field:survey.type,code:0
+msgid "Code"
+msgstr ""
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_print_survey_statistics
+msgid "Surveys Statistics"
+msgstr ""
+
+#. module: survey
+#: field:survey.print,orientation:0
+#: field:survey.print.answer,orientation:0
+msgid "Orientation"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.answer:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Seq"
+msgstr ""
+
+#. module: survey
+#: field:survey.request,email:0
+msgid "E-mail"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_minimum_no:0
+#: field:survey.question,validation_minimum_no:0
+msgid "Minimum number"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,req_ans:0
+msgid "#Required Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,sequence:0
+#: field:survey.question,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_label:0
+msgid "Field Label"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Other"
+msgstr ""
+
+#. module: survey
+#: view:survey.request:0
+#: selection:survey.request,state:0
+msgid "Done"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Test Survey"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,rating_allow_one_column_require:0
+msgid "Allow Only One Answer per Column (Forced Ranking)"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.browse.answer:0
+#: view:survey.name.wiz:0
+#: view:survey.print:0
+#: view:survey.print.answer:0
+#: view:survey.print.statistics:0
+#: view:survey.send.invitation:0
+msgid "Cancel"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Close"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_minimum_float:0
+#: field:survey.question,validation_minimum_float:0
+msgid "Minimum decimal number"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: selection:survey,state:0
+msgid "Open"
+msgstr ""
+
+#. module: survey
+#: field:survey,tot_start_survey:0
+msgid "Total Started Survey"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:467
+#, python-format
+msgid ""
+"#Required Answer you entered is greater than the number of answer. Please "
+"use a number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: help:survey,max_response_limit:0
+msgid "Set to one if survey is answerable only once"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response,state:0
+msgid "Finished "
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_question_column_heading
+msgid "Survey Question Column Heading"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,average:0
+msgid "#Avg"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Matrix of Choices (Multiple Answers Per Row)"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_name
+msgid "Give Survey Answer"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Current"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response.line,state:0
+msgid "Answered"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:432
+#, python-format
+msgid "Complete Survey Answer"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Comment/Essay Box"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,type:0
+msgid "Type of Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,required_type:0
+msgid "Respondent must answer"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_send_invitation
+#: view:survey.send.invitation:0
+msgid "Send Invitation"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:792
+#, python-format
+msgid "You cannot select the same answer more than one time"
+msgstr ""
+
+#. module: survey
+#: view:survey.question:0
+msgid "Search Question"
+msgstr ""
+
+#. module: survey
+#: field:survey,title:0
+msgid "Survey Title"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Single Textbox"
+msgstr ""
+
+#. module: survey
+#: field:survey,note:0
+#: field:survey.name.wiz,note:0
+#: view:survey.page:0
+#: field:survey.page,note:0
+#: view:survey.response.line:0
+msgid "Description"
+msgstr ""
+
+#. module: survey
+#: view:survey.name.wiz:0
+msgid "Select Survey"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "At Least"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_send_invitation_log
+#: model:ir.model,name:survey.model_survey_send_invitation_log
+msgid "survey.send.invitation.log"
+msgstr ""
+
+#. module: survey
+#: selection:survey.print,orientation:0
+#: selection:survey.print.answer,orientation:0
+msgid "Portrait(Vertical)"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be Specific Length"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: field:survey.question,page_id:0
+msgid "Survey Page"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Required Answer"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:473
+#, python-format
+msgid ""
+"Minimum Required Answer you entered is greater than the number of answer. "
+"Please use a number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:458
+#, python-format
+msgid "You must enter one or more answer."
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.report.xml,name:survey.survey_browse_response
+#: field:survey.browse.answer,response_id:0
+msgid "Survey Answers"
+msgstr ""
+
+#. module: survey
+#: view:survey.browse.answer:0
+msgid "Select Survey and related answer"
+msgstr ""
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_print_survey_answer
+msgid "Surveys Answers"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_pages
+msgid "Pages"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:406
+#, python-format
+msgid ""
+"#Required Answer you entered is                                     greater "
+"than the number of answer.                                    Please use a "
+"number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:984
+#, python-format
+msgid "You cannot select same answer more than one time'"
+msgstr ""
+
+#. module: survey
+#: selection:survey.print,paper_size:0
+#: selection:survey.print.answer,paper_size:0
+msgid "Legal (8.5\" x 14\")"
+msgstr ""
+
+#. module: survey
+#: field:survey.type,name:0
+msgid "Name"
+msgstr ""
+
+#. module: survey
+#: view:survey.page:0
+msgid "#Questions"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_response
+msgid "survey.response"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_valid_err_msg:0
+#: field:survey.question,make_comment_field_err_msg:0
+#: field:survey.question,numeric_required_sum_err_msg:0
+#: field:survey.question,validation_valid_err_msg:0
+msgid "Error message"
+msgstr ""
+
+#. module: survey
+#: model:ir.module.module,shortdesc:survey.module_meta_information
+msgid "Survey Module"
+msgstr ""
+
+#. module: survey
+#: view:survey.send.invitation:0
+#: field:survey.send.invitation,send_mail:0
+msgid "Send mail for new user"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:387
+#, python-format
+msgid "You must enter one or more Answer."
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:416
+#, python-format
+msgid ""
+"Minimum Required Answer                                     you entered is "
+"greater than the number of answer.                                    Please "
+"use a number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,menu_choice:0
+msgid "Menu Choices"
+msgstr ""
+
+#. module: survey
+#: field:survey,page_ids:0
+#: view:survey.question:0
+#: field:survey.response.line,page_id:0
+msgid "Page"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:438
+#, python-format
+msgid ""
+"Maximum Required Answer is greater                                     than "
+"Minimum Required Answer"
+msgstr ""
+
+#. module: survey
+#: view:survey.send.invitation.log:0
+msgid "User creation"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "All"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be An Email Address"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Multiple Choice (Only One Answer)"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,in_visible_answer_type:0
+msgid "Is Answer Type Invisible??"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_print_answer
+msgid "survey.print.answer"
+msgstr ""
+
+#. module: survey
+#: view:survey.answer:0
+msgid "Menu Choices (each choice on separate by lines)"
+msgstr ""
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Float"
+msgstr ""
+
+#. module: survey
+#: view:survey.response.line:0
+msgid "Single Textboxes"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_send_invitation.py:74
+#, python-format
+msgid "%sSurvey is not in open state"
+msgstr ""
+
+#. module: survey
+#: field:survey.question.column.heading,rating_weight:0
+msgid "Weight"
+msgstr ""
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Date & Time"
+msgstr ""
+
+#. module: survey
+#: field:survey.response,date_create:0
+#: field:survey.response.line,date_create:0
+msgid "Create Date"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,column_name:0
+msgid "Column Name"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_page_form
+#: model:ir.model,name:survey.model_survey_page
+#: model:ir.ui.menu,name:survey.menu_survey_page_form1
+#: view:survey.page:0
+msgid "Survey Pages"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,numeric_required_sum:0
+msgid "Sum of all choices"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+#: view:survey.response.line:0
+msgid "Table"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:642
+#, python-format
+msgid "You cannot duplicate the resource!"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_minimum_date:0
+#: field:survey.question,validation_minimum_date:0
+msgid "Minimum date"
+msgstr ""
+
+#. module: survey
+#: field:survey,response_user:0
+msgid "Maximum Answer per User"
+msgstr ""
+
+#. module: survey
+#: field:survey.name.wiz,page:0
+msgid "Page Position"
+msgstr ""
diff --git a/addons/survey/i18n/pt_BR.po b/addons/survey/i18n/pt_BR.po
index e6c29033c86..179c4ec5937 100644
--- a/addons/survey/i18n/pt_BR.po
+++ b/addons/survey/i18n/pt_BR.po
@@ -8,20 +8,20 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2011-03-01 00:32+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2011-04-16 21:15+0000\n"
+"Last-Translator: ERIVELTON PIRES GUEDES <Unknown>\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: 2011-03-02 04:38+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-17 04:36+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: survey
 #: view:survey.print:0
 #: view:survey.print.answer:0
 msgid "Print Option"
-msgstr ""
+msgstr "Opções de Impressão"
 
 #. module: survey
 #: code:addons/survey/survey.py:422
@@ -103,7 +103,7 @@ msgstr "Requisitar Pesquisa"
 #. module: survey
 #: selection:survey.question,required_type:0
 msgid "A Range"
-msgstr ""
+msgstr "Um Intervalo"
 
 #. module: survey
 #: view:survey.response.line:0
@@ -113,7 +113,7 @@ msgstr "Tabela de Resposta"
 #. module: survey
 #: field:survey.history,date:0
 msgid "Date started"
-msgstr ""
+msgstr "Data iniciada"
 
 #. module: survey
 #: field:survey,history:0
@@ -127,6 +127,8 @@ msgid ""
 "You must enter one or more menu                                 choices in "
 "column heading (white spaces not allowed)"
 msgstr ""
+"Você deve escolher uma ou mais opções de menu no cabeçalho da coluna "
+"(espaços em branco não são permitidos)"
 
 #. module: survey
 #: field:survey.question.column.heading,in_visible_menu_choice:0
@@ -392,7 +394,7 @@ msgstr "Linha Simples de Texto"
 #: view:survey.send.invitation:0
 #: field:survey.send.invitation,send_mail_existing:0
 msgid "Send reminder for existing user"
-msgstr ""
+msgstr "Enviar lembrete para usuário existente"
 
 #. module: survey
 #: selection:survey.question,type:0
@@ -462,7 +464,7 @@ msgstr "Assunto"
 #: field:survey.question,comment_maximum_float:0
 #: field:survey.question,validation_maximum_float:0
 msgid "Maximum decimal number"
-msgstr ""
+msgstr "Máximo número decimal"
 
 #. module: survey
 #: selection:survey.request,state:0
@@ -494,7 +496,7 @@ msgstr ""
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
 msgid "Must Be A Whole Number"
-msgstr ""
+msgstr "Precisa Ser Um Número Completo"
 
 #. module: survey
 #: field:survey.answer,question_id:0
@@ -527,6 +529,7 @@ msgid ""
 "You must enter one or more menu choices                                 in "
 "column heading"
 msgstr ""
+"Você precisa especificar um ou mais opções de menu no cabeçalho da coluna"
 
 #. module: survey
 #: model:ir.actions.act_window,help:survey.action_survey_form1
@@ -548,7 +551,7 @@ msgstr "Status"
 #. module: survey
 #: view:survey.request:0
 msgid "Evaluation Plan Phase"
-msgstr ""
+msgstr "Fase do Plano de Avaliação"
 
 #. module: survey
 #: view:survey:0
@@ -588,7 +591,7 @@ msgstr "Responder Pesquisas"
 #. module: survey
 #: selection:survey.response,state:0
 msgid "Not Finished"
-msgstr ""
+msgstr "Não Acabado"
 
 #. module: survey
 #: view:survey.print:0
@@ -666,7 +669,7 @@ msgstr "Texto Descritivo"
 #. module: survey
 #: field:survey.question,minimum_req_ans:0
 msgid "Minimum Required Answer"
-msgstr ""
+msgstr "Mínimo de Respostas Necessárias"
 
 #. module: survey
 #: code:addons/survey/survey.py:484
@@ -712,7 +715,7 @@ msgstr "Título de Coluna"
 #. module: survey
 #: field:survey.question,is_require_answer:0
 msgid "Require Answer to Question"
-msgstr ""
+msgstr "Resposta Necessária para a Questão"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_survey_request_tree
@@ -742,7 +745,7 @@ msgstr "survey.browse.answer"
 #. module: survey
 #: selection:survey.question,comment_field_type:0
 msgid "Paragraph of Text"
-msgstr ""
+msgstr "Parágrafo de Texto"
 
 #. module: survey
 #: code:addons/survey/survey.py:428
@@ -756,7 +759,7 @@ msgstr ""
 #. module: survey
 #: view:survey.request:0
 msgid "Watting Answer"
-msgstr ""
+msgstr "Aguardando Resposta"
 
 #. module: survey
 #: view:survey:0
@@ -1010,7 +1013,7 @@ msgstr "Enviar Convites"
 #. module: survey
 #: field:survey.name.wiz,store_ans:0
 msgid "Store Answer"
-msgstr ""
+msgstr "Armazenar Resposta"
 
 #. module: survey
 #: selection:survey.question,type:0
@@ -1054,7 +1057,7 @@ msgstr "Imprimir Resposta"
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Multiple Textboxes"
-msgstr ""
+msgstr "Múltiplas Caixas de Texto"
 
 #. module: survey
 #: selection:survey.print,orientation:0
@@ -1076,7 +1079,7 @@ msgstr "Detalhes da Pesquisa"
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Multiple Textboxes With Different Type"
-msgstr ""
+msgstr "Múltiplas Caixas de Texto Com Diferentes Tipos"
 
 #. module: survey
 #: view:survey.question.column.heading:0
@@ -1097,6 +1100,7 @@ msgstr "Validação"
 
 #. module: survey
 #: view:survey.request:0
+#: selection:survey.request,state:0
 msgid "Waiting Answer"
 msgstr "Aguardando Resposta"
 
@@ -1138,7 +1142,7 @@ msgstr "Usuário"
 #. module: survey
 #: field:survey.name.wiz,transfer:0
 msgid "Page Transfer"
-msgstr ""
+msgstr "Transferência de Página"
 
 #. module: survey
 #: selection:survey.response.line,state:0
@@ -1202,7 +1206,7 @@ msgstr ""
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Numerical Textboxes"
-msgstr ""
+msgstr "Caixas de Texto Numéricas"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_question_wiz
@@ -1463,7 +1467,7 @@ msgstr "Retrato (Vertical)"
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
 msgid "Must Be Specific Length"
-msgstr ""
+msgstr "Deve Ter Tamanho Específico"
 
 #. module: survey
 #: view:survey:0
@@ -1533,7 +1537,7 @@ msgstr "Você não pode selecionar a mesma resposta mais de uma vez"
 #: selection:survey.print,paper_size:0
 #: selection:survey.print.answer,paper_size:0
 msgid "Legal (8.5\" x 14\")"
-msgstr ""
+msgstr "Carta (8.5\" x 14\")"
 
 #. module: survey
 #: field:survey.type,name:0
@@ -1587,7 +1591,7 @@ msgstr ""
 #. module: survey
 #: field:survey.answer,menu_choice:0
 msgid "Menu Choices"
-msgstr ""
+msgstr "Opções de Menu"
 
 #. module: survey
 #: field:survey,page_ids:0
@@ -1638,7 +1642,7 @@ msgstr "survey.print.answer"
 #. module: survey
 #: view:survey.answer:0
 msgid "Menu Choices (each choice on separate by lines)"
-msgstr ""
+msgstr "Menu de opções (cada opção em uma linha separada)"
 
 #. module: survey
 #: selection:survey.answer,type:0
@@ -1688,7 +1692,7 @@ msgstr "Páginas de Pesquisa"
 #. module: survey
 #: field:survey.question,numeric_required_sum:0
 msgid "Sum of all choices"
-msgstr ""
+msgstr "Soma de todas as escolhas"
 
 #. module: survey
 #: selection:survey.question,type:0
diff --git a/addons/wiki/i18n/ru.po b/addons/wiki/i18n/ru.po
index 283ff319c9c..7bb7b2fae3b 100644
--- a/addons/wiki/i18n/ru.po
+++ b/addons/wiki/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-01-12 17:12+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-04-15 20:00+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-01-15 05:44+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-16 04:59+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
@@ -30,7 +30,7 @@ msgstr "Wiki страницы"
 #. module: wiki
 #: field:wiki.groups,method:0
 msgid "Display Method"
-msgstr ""
+msgstr "Метод вывода"
 
 #. module: wiki
 #: view:wiki.wiki:0
@@ -57,7 +57,7 @@ msgstr "Секция"
 #. module: wiki
 #: help:wiki.wiki,toc:0
 msgid "Indicates that this pages have a table of contents or not"
-msgstr ""
+msgstr "Показывает имеется ли содержание на этой странице"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_wiki_history
@@ -68,7 +68,7 @@ msgstr "История Wiki"
 #. module: wiki
 #: field:wiki.wiki,minor_edit:0
 msgid "Minor edit"
-msgstr ""
+msgstr "Малозначимое изменение"
 
 #. module: wiki
 #: view:wiki.wiki:0
@@ -79,18 +79,18 @@ msgstr "Содержание"
 #. module: wiki
 #: field:wiki.wiki,child_ids:0
 msgid "Child Pages"
-msgstr ""
+msgstr "Подчиненные страницы"
 
 #. module: wiki
 #: field:wiki.wiki,parent_id:0
 msgid "Parent Page"
-msgstr ""
+msgstr "Главная страница"
 
 #. module: wiki
 #: view:wiki.wiki:0
 #: field:wiki.wiki,write_uid:0
 msgid "Last Contributor"
-msgstr ""
+msgstr "Последний корректор"
 
 #. module: wiki
 #: field:wiki.create.menu,menu_parent_id:0
@@ -100,7 +100,7 @@ msgstr "Родительское меню"
 #. module: wiki
 #: help:wiki.wiki,group_id:0
 msgid "Topic, also called Wiki Group"
-msgstr ""
+msgstr "Тема, которая также называется Вики группа"
 
 #. module: wiki
 #: field:wiki.groups,name:0
@@ -117,12 +117,12 @@ msgstr "Заголовок"
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_create_menu
 msgid "Wizard Create Menu"
-msgstr ""
+msgstr "Помощник создания меню"
 
 #. module: wiki
 #: field:wiki.wiki,history_id:0
 msgid "History Lines"
-msgstr ""
+msgstr "Строки истории"
 
 #. module: wiki
 #: view:wiki.wiki:0
@@ -144,7 +144,7 @@ msgstr ""
 #. module: wiki
 #: model:ir.module.module,shortdesc:wiki.module_meta_information
 msgid "Document Management - Wiki"
-msgstr ""
+msgstr "Управление документами - Вики"
 
 #. module: wiki
 #: field:wiki.create.menu,menu_name:0
@@ -159,7 +159,7 @@ msgstr "Описание"
 #. module: wiki
 #: field:wiki.wiki,review:0
 msgid "Needs Review"
-msgstr ""
+msgstr "Нуждается в проверке"
 
 #. module: wiki
 #: help:wiki.wiki,review:0
@@ -167,6 +167,8 @@ msgid ""
 "Indicates that this page should be reviewed, raising the attention of other "
 "contributors"
 msgstr ""
+"Указывает, что эта страница должна быть проверена, привлекает внимание "
+"других участников"
 
 #. module: wiki
 #: view:wiki.create.menu:0
@@ -177,7 +179,7 @@ msgstr "Информация меню"
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_wiki_wiki_history
 msgid "Page History"
-msgstr ""
+msgstr "История страницы"
 
 #. module: wiki
 #: selection:wiki.groups,method:0
@@ -244,12 +246,12 @@ msgstr "Описание группы"
 #. module: wiki
 #: help:wiki.wiki,section:0
 msgid "Use page section code like 1.2.1"
-msgstr ""
+msgstr "Используйте код выбора страницы, например: 1.2.1"
 
 #. module: wiki
 #: view:wiki.wiki.page.open:0
 msgid "Want to open a wiki page? "
-msgstr ""
+msgstr "Хотите открыть вики ? "
 
 #. module: wiki
 #: field:wiki.groups,section:0
@@ -311,7 +313,7 @@ msgstr "История всех страниц"
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_wiki
 msgid "wiki.wiki"
-msgstr ""
+msgstr "wiki.wiki"
 
 #. module: wiki
 #: help:wiki.groups,method:0
@@ -342,12 +344,12 @@ msgstr "Главная страница"
 #. module: wiki
 #: help:wiki.wiki,parent_id:0
 msgid "Allows you to link with the other page with in the current topic"
-msgstr ""
+msgstr "Позволяет сделать ссылку на другую страницу в текущем разделе"
 
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Modification Information"
-msgstr ""
+msgstr "Информация об изменениях"
 
 #. module: wiki
 #: model:ir.ui.menu,name:wiki.menu_wiki_configuration
@@ -395,7 +397,7 @@ msgstr "Создать меню"
 #. module: wiki
 #: field:wiki.wiki.history,minor_edit:0
 msgid "This is a major edit ?"
-msgstr ""
+msgstr "Это существенные изменения ?"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_wiki_groups
@@ -404,7 +406,7 @@ msgstr ""
 #: model:ir.ui.menu,name:wiki.menu_action_wiki_groups
 #: view:wiki.groups:0
 msgid "Wiki Groups"
-msgstr ""
+msgstr "Вики группы"
 
 #. module: wiki
 #: view:wiki.wiki:0
@@ -414,7 +416,7 @@ msgstr "Тема"
 #. module: wiki
 #: field:wiki.wiki.history,write_uid:0
 msgid "Modify By"
-msgstr ""
+msgstr "Изменено"
 
 #. module: wiki
 #: code:addons/wiki/web/widgets/wikimarkup/__init__.py:1981
@@ -427,7 +429,7 @@ msgstr "Содержание"
 #: view:wiki.groups:0
 #: view:wiki.wiki.page.open:0
 msgid "Open Wiki Page"
-msgstr ""
+msgstr "Открыть вики-страницу"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_wiki_page_open
@@ -454,7 +456,7 @@ msgstr "Необходима Проверка"
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_wiki_review
 msgid "Pages Waiting Review"
-msgstr ""
+msgstr "Страницы ожидающие проверки"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_wiki_group_open
@@ -514,3 +516,6 @@ msgstr "Страница поиска"
 
 #~ msgid "Size of the field can never be less than 1 !"
 #~ msgstr "Размер поля не может быть меньше 1 !"
+
+#~ msgid "Child Groups"
+#~ msgstr "Подчиненные группы"

From 7c2cc54d102cc0741a635b0fd2b912d67aa463dc Mon Sep 17 00:00:00 2001
From: Rodrigo Fernandez <rodrigo@solucionesprisma.com>
Date: Sun, 17 Apr 2011 16:48:28 +0000
Subject: [PATCH 084/188] Changed the price_include field on VAT taxes from
 False to True

bzr revid: rodrigo@solucionesprisma.com-20110417164828-5b3wvjdhnf9w3d74
---
 addons/l10n_gt/l10n_gt_base.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_gt/l10n_gt_base.xml b/addons/l10n_gt/l10n_gt_base.xml
index 0f6e8da73b9..87b1adb72f7 100644
--- a/addons/l10n_gt/l10n_gt_base.xml
+++ b/addons/l10n_gt/l10n_gt_base.xml
@@ -47,7 +47,7 @@
         <record id="impuestos_plantilla_iva_por_cobrar" model="account.tax.template">
             <field name="chart_template_id" ref="cuentas_plantilla"/>
             <field name="name">IVA por Cobrar</field>
-            <field eval="0.12" name="amount"/>
+            <field name="amount" eval="0.12"/>
             <field name="type">percent</field>
             <field name="account_collected_id" ref="cta110301"/>
             <field name="account_paid_id" ref="cta110301"/>
@@ -56,6 +56,7 @@
             <field name="ref_base_code_id" ref="impuestos_base_iva_compras"/>
             <field name="ref_tax_code_id" ref="impuestos_iva_por_cobrar"/>
             <field name="type_tax_use">purchase</field>
+            <field name="price_include" eval="True"/>
         </record>
 
         <!-- Ventas e IVA por Pagar -->
@@ -63,7 +64,7 @@
         <record id="impuestos_plantilla_iva_por_pagar" model="account.tax.template">
             <field name="chart_template_id" ref="cuentas_plantilla"/>
             <field name="name">IVA por Pagar</field>
-            <field eval="0.12" name="amount"/>
+            <field name="amount" eval="0.12"/>
             <field name="type">percent</field>
             <field name="account_collected_id" ref="cta210201"/>
             <field name="account_paid_id" ref="cta210201"/>
@@ -72,6 +73,7 @@
             <field name="ref_base_code_id" ref="impuestos_base_iva_ventas"/>
             <field name="ref_tax_code_id" ref="impuestos_iva_por_pagar"/>
             <field name="type_tax_use">sale</field>
+            <field name="price_include" eval="True"/>
         </record>
 
     </data>

From 24677a0bf1fcf5765345fd25c1e0c568c52c33af Mon Sep 17 00:00:00 2001
From: skh <skh@tinyerp.com>
Date: Mon, 18 Apr 2011 12:52:09 +0530
Subject: [PATCH 085/188] [FIX] The configuration is mismatch compare to sale
 order field

bzr revid: skh@tinyerp.com-20110418072209-zubjokkl82uupp41
---
 addons/sale/sale.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index f80d610eb03..4bb8bc75885 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1180,12 +1180,14 @@ class sale_config_picking_policy(osv.osv_memory):
         'picking_policy': fields.selection([
             ('direct', 'Direct Delivery'),
             ('one', 'All at Once')
-        ], 'Picking Default Policy', required=True, help="The Shipping Policy is used to configure per order if you want to deliver as soon as possible when one product is available or you wait that all products are available.."),
+        ], 'Picking Default Policy', required=True, help="If you are sure that you have enough stock to send complete order at once please select 'All at Once'. If you want to send the order in the partial shipments please select 'Direct Delivery'..."),
         'order_policy': fields.selection([
             ('manual', 'Invoice Based on Sales Orders'),
             ('picking', 'Invoice Based on Deliveries'),
         ], 'Shipping Default Policy', required=True,
-           help="You can generate invoices based on sales orders or based on shippings."),
+           help="""The Shipping Policy is used to synchronise invoice and delivery operations.
+        - The "Invoice Based on Sales Orders" choice will create the picking order directly and wait for the user to manually click on the 'Invoice' button to generate the draft invoice.  
+        - The "Invoice Based on Deliveries" choice is used to create an invoice during the picking process."""),
         'step': fields.selection([
             ('one', 'Delivery Order Only'),
             ('two', 'Picking List & Delivery Order')

From 2199cd7f34272b5bae97233e25b0d303c5ef0e16 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Mon, 18 Apr 2011 14:50:07 +0530
Subject: [PATCH 086/188] [FIX] hr_holiday: The Flow of Hr Holiday is working
 Wrong, it should Got to end at end but not to Second_validation or refuse.

bzr revid: ara@tinyerp.com-20110418092007-nus4n0g7lexwh7j1
---
 addons/hr_holidays/hr_holidays.py       | 1 +
 addons/hr_holidays/hr_holidays_view.xml | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 131d38d7001..8cd64585603 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -217,6 +217,7 @@ class hr_holidays(osv.osv):
         })
         wf_service = netsvc.LocalService("workflow")
         for id in ids:
+            wf_service.trg_delete(uid, 'hr.holidays', id, cr)
             wf_service.trg_create(uid, 'hr.holidays', id, cr)
         return True
 
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 7740470ccc7..7c429c37310 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -93,11 +93,11 @@
                             <newline/>
                             <field name="state" colspan="2"/>
                             <group colspan="2" col="6">
-                                <button string="Refuse" name="refuse" states="confirm" type="workflow" icon="gtk-no" groups="base.group_hr_user,base.group_hr_manager"/>
+                                <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user,base.group_hr_manager"/>
                                 <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
                                 <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
                                 <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
-                                <button string="Set to Draft" name="set_to_draft" states="refuse,validate,validate1" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
+                                <button string="Set to Draft" name="set_to_draft" states="refuse,validate" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
                             </group>
                         </page>
                     </notebook>
@@ -135,11 +135,11 @@
                         <newline/>
                         <field name="state" colspan="2"/>
                         <group colspan="2" col="6">
-                            <button string="Refuse" name="refuse" states="confirm" type="workflow" icon="gtk-no" groups="base.group_hr_user"/>
+                            <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user"/>
                             <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
                             <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
                             <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
-                            <button string="Set to Draft" name="set_to_draft" states="cancel,validate,validate1" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
+                            <button string="Set to Draft" name="set_to_draft" states="cancel,validate" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
                         </group>
                     </page>
                 </notebook>

From 2c3c064a2237e21788226056d14362200cfc0d6d Mon Sep 17 00:00:00 2001
From: "tfr@openerp.com" <>
Date: Mon, 18 Apr 2011 14:00:34 +0200
Subject: [PATCH 087/188] [CLEAN] remove duplicate method _check_dates in
 project

bzr revid: tfr@openerp.com-20110418120034-jkmu9jar833b2w2d
---
 addons/project/project.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 134364d8b1a..7fbe39219a8 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -405,12 +405,6 @@ class task(osv.osv):
                  default.update({'name':new_name})
         return super(task, self).copy_data(cr, uid, id, default, context)
 
-    def _check_dates(self, cr, uid, ids, context=None):
-        task = self.read(cr, uid, ids[0], ['date_start', 'date_end'])
-        if task['date_start'] and task['date_end']:
-             if task['date_start'] > task['date_end']:
-                 return False
-        return True
 
     def _is_template(self, cr, uid, ids, field_name, arg, context=None):
         res = {}

From 7f52403414feb08a1133cbe50e77c64514bdeca0 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Mon, 18 Apr 2011 17:42:56 +0530
Subject: [PATCH 088/188] [FIX] point_of_sale: output opration wizard not
 working

bzr revid: ara@tinyerp.com-20110418121256-a9ai8qykk330tj9v
---
 addons/point_of_sale/wizard/pos_box_out.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/point_of_sale/wizard/pos_box_out.py b/addons/point_of_sale/wizard/pos_box_out.py
index a05c5f579e1..f5a70789ee0 100644
--- a/addons/point_of_sale/wizard/pos_box_out.py
+++ b/addons/point_of_sale/wizard/pos_box_out.py
@@ -94,9 +94,9 @@ class pos_box_out(osv.osv_memory):
                 val = (res_obj.browse(cr, uid, uid).company_id.max_diff or 0.0) + am
                 raise osv.except_osv(_('Error !'), _('The maximum value you can still withdraw is exceeded. \n Remaining value is equal to %d ')%(val))
 
-            acc_id = product_obj.browse(cr, uid, data['product_id'], context=context).property_account_income
+            acc_id = productp_obj.browse(cr, uid, data['product_id'], context=context).property_account_income
             if not acc_id:
-                raise osv.except_osv(_('Error !'), _('please check that account is set to %s')%(product_obj.browse(cr, uid, data['product_id'], context=context).name))
+                raise osv.except_osv(_('Error !'), _('please check that account is set to %s')%(productp_obj.browse(cr, uid, data['product_id'], context=context).name))
             if not statement_id:
                 raise osv.except_osv(_('Error !'), _('You have to open at least one cashbox'))
             if statement_id:
@@ -119,7 +119,7 @@ class pos_box_out(osv.osv_memory):
             if productp_obj.browse(cr, uid, data['product_id'], context=context).am_out:
                 vals['am_out'] = True
             vals['ref'] = data['ref'] or ''
-            vals['name'] = "%s: %s " % (product_obj.browse(cr, uid, data['product_id'], context=context).name, data['name'].decode('utf8'))
+            vals['name'] = "%s: %s " % (productp_obj.browse(cr, uid, data['product_id'], context=context).name, data['name'].decode('utf8'))
             address_u = res_obj.browse(cr, uid, uid, context=context).address_id
             if address_u:
                 vals['partner_id'] = address_u.partner_id and address_u.partner_id.id or None

From e357bf71a67e736ed3dabbf293b358f8f0f45947 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Mon, 18 Apr 2011 18:51:25 +0530
Subject: [PATCH 089/188] [FIX] base_module_doc_rst: InvocationException

bzr revid: ara@tinyerp.com-20110418132125-rf6oe0qz3dhzcazx
---
 addons/base_module_doc_rst/report/report_proximity_graph.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_module_doc_rst/report/report_proximity_graph.py b/addons/base_module_doc_rst/report/report_proximity_graph.py
index 2d3704fd5b7..d14d709f501 100644
--- a/addons/base_module_doc_rst/report/report_proximity_graph.py
+++ b/addons/base_module_doc_rst/report/report_proximity_graph.py
@@ -48,7 +48,7 @@ class report_graph(report.interface.report_int):
                     if id:
                         get_dpend_module(id[0].id)
         get_dpend_module(module_id)
-        graph = pydot.Dot(graph_type='digraph',fontsize='10', label="\\nProximity Graph. \\n\\nGray Color:Official Modules, Red  Color:Extra Addons Modules, Blue Color:Community Modules, Purple Color:Unknow Modules"
+        graph = pydot.Dot(graph_type='digraph',fontsize='10', label="\\nProximity Graph. \\n\\nGray Color-Official Modules, Red  Color-Extra Addons Modules, Blue Color-Community Modules, Purple Color-Unknow Modules"
                                      , center='1')
         for node in nodes:
             if node[1] == "official":

From a559335e4378f667b64e551cf304b76b98b913b6 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Mon, 18 Apr 2011 18:55:28 +0530
Subject: [PATCH 090/188] [FIX] mail: fixed subject value while replying emails

bzr revid: rha@tinyerp.com-20110418132528-7jqww9oyzdfxtbdq
---
 addons/mail/wizard/email_compose_message.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/mail/wizard/email_compose_message.py b/addons/mail/wizard/email_compose_message.py
index 8d5274aaa75..3d83848f0ab 100644
--- a/addons/mail/wizard/email_compose_message.py
+++ b/addons/mail/wizard/email_compose_message.py
@@ -115,9 +115,6 @@ class email_compose_message(osv.osv_memory):
         if message_id:
             message_data = message_pool.browse(cr, uid, message_id, context)
             subject = tools.ustr(message_data and message_data.subject or '')
-            if context.get('mail','') == 'reply':
-                subject = "Re :- " + subject
-
             description =  message_data and message_data.body  or ''
             message_body = False
             if context.get('mail','') == 'reply':
@@ -127,6 +124,8 @@ class email_compose_message(osv.osv_memory):
                 sentdate = 'Date: %s' % message_data.date
                 desc = '\n > \t %s' % tools.ustr(description.replace('\n', "\n > \t") or '')
                 description = '\n'.join([header, sender, email_to, sentdate, desc])
+                if not subject.startswith('Re: '):
+                    subject = "Re: " + subject
 
             result.update({
                     'body' : description,

From 2030bc90f9a3243c940cc8f1833d21be2bfa3576 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 19 Apr 2011 04:50:43 +0000
Subject: [PATCH 091/188] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110419045043-ne4koiq8t3z30356
---
 bin/addons/base/i18n/af.po       |   4 +-
 bin/addons/base/i18n/am.po       |   4 +-
 bin/addons/base/i18n/ar.po       |   4 +-
 bin/addons/base/i18n/bg.po       |   4 +-
 bin/addons/base/i18n/bs.po       |   4 +-
 bin/addons/base/i18n/ca.po       |   4 +-
 bin/addons/base/i18n/cs.po       |   4 +-
 bin/addons/base/i18n/da.po       |   4 +-
 bin/addons/base/i18n/de.po       |   4 +-
 bin/addons/base/i18n/el.po       |   4 +-
 bin/addons/base/i18n/en_GB.po    |   4 +-
 bin/addons/base/i18n/es.po       |   4 +-
 bin/addons/base/i18n/es_CL.po    |   4 +-
 bin/addons/base/i18n/es_EC.po    |   4 +-
 bin/addons/base/i18n/et.po       |   4 +-
 bin/addons/base/i18n/eu.po       |   4 +-
 bin/addons/base/i18n/fa.po       |   4 +-
 bin/addons/base/i18n/fa_AF.po    |   4 +-
 bin/addons/base/i18n/fi.po       |   4 +-
 bin/addons/base/i18n/fr.po       |   4 +-
 bin/addons/base/i18n/gl.po       |   4 +-
 bin/addons/base/i18n/he.po       |   4 +-
 bin/addons/base/i18n/hr.po       |   4 +-
 bin/addons/base/i18n/hu.po       |   4 +-
 bin/addons/base/i18n/id.po       |   4 +-
 bin/addons/base/i18n/is.po       |   4 +-
 bin/addons/base/i18n/it.po       |   4 +-
 bin/addons/base/i18n/ja.po       |   4 +-
 bin/addons/base/i18n/ko.po       |   4 +-
 bin/addons/base/i18n/lt.po       |   4 +-
 bin/addons/base/i18n/lv.po       |   4 +-
 bin/addons/base/i18n/mn.po       |   4 +-
 bin/addons/base/i18n/nb.po       |   4 +-
 bin/addons/base/i18n/nl.po       |   6 +-
 bin/addons/base/i18n/nl_BE.po    |   4 +-
 bin/addons/base/i18n/pl.po       |   4 +-
 bin/addons/base/i18n/pt.po       |   4 +-
 bin/addons/base/i18n/pt_BR.po    |   4 +-
 bin/addons/base/i18n/ro.po       |   4 +-
 bin/addons/base/i18n/ru.po       | 122 ++++++++++++++++++++++---------
 bin/addons/base/i18n/sk.po       |   4 +-
 bin/addons/base/i18n/sl.po       |   4 +-
 bin/addons/base/i18n/sq.po       |   4 +-
 bin/addons/base/i18n/sr.po       |   4 +-
 bin/addons/base/i18n/sr@latin.po |   4 +-
 bin/addons/base/i18n/sv.po       |   4 +-
 bin/addons/base/i18n/th.po       |   4 +-
 bin/addons/base/i18n/tlh.po      |   4 +-
 bin/addons/base/i18n/tr.po       |   4 +-
 bin/addons/base/i18n/uk.po       |   4 +-
 bin/addons/base/i18n/ur.po       |   4 +-
 bin/addons/base/i18n/vi.po       |  18 +++--
 bin/addons/base/i18n/zh_CN.po    |   4 +-
 bin/addons/base/i18n/zh_TW.po    |   4 +-
 debian/po/bg.po                  |   4 +-
 debian/po/ca.po                  |   4 +-
 debian/po/cs.po                  |   4 +-
 debian/po/de.po                  |   4 +-
 debian/po/el.po                  |   4 +-
 debian/po/en_GB.po               |   4 +-
 debian/po/es.po                  |   4 +-
 debian/po/es_CL.po               |   4 +-
 debian/po/es_EC.po               |   4 +-
 debian/po/fa.po                  |   4 +-
 debian/po/fi.po                  |   4 +-
 debian/po/fr.po                  |   4 +-
 debian/po/gl.po                  |   4 +-
 debian/po/he.po                  |   4 +-
 debian/po/hr.po                  |   4 +-
 debian/po/hu.po                  |   4 +-
 debian/po/it.po                  |   4 +-
 debian/po/ja.po                  |   4 +-
 debian/po/ko.po                  |   4 +-
 debian/po/lv.po                  |   4 +-
 debian/po/mn.po                  |   4 +-
 debian/po/nb.po                  |   4 +-
 debian/po/nl.po                  |   4 +-
 debian/po/pl.po                  |   4 +-
 debian/po/pt.po                  |   4 +-
 debian/po/pt_BR.po               |   4 +-
 debian/po/ro.po                  |   4 +-
 debian/po/ru.po                  |   4 +-
 debian/po/sk.po                  |   4 +-
 debian/po/sq.po                  |   4 +-
 debian/po/sr.po                  |   4 +-
 debian/po/sv.po                  |   4 +-
 debian/po/tr.po                  |   4 +-
 debian/po/uk.po                  |   4 +-
 debian/po/vi.po                  |   4 +-
 debian/po/zh_CN.po               |   4 +-
 debian/po/zh_TW.po               |   4 +-
 91 files changed, 276 insertions(+), 222 deletions(-)

diff --git a/bin/addons/base/i18n/af.po b/bin/addons/base/i18n/af.po
index 290fd5f2304..103aec7236b 100644
--- a/bin/addons/base/i18n/af.po
+++ b/bin/addons/base/i18n/af.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:49+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:40+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/am.po b/bin/addons/base/i18n/am.po
index 4b094993afb..50c593c3838 100644
--- a/bin/addons/base/i18n/am.po
+++ b/bin/addons/base/i18n/am.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:49+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:40+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/ar.po b/bin/addons/base/i18n/ar.po
index 8baa0e9c4ab..789178750b2 100644
--- a/bin/addons/base/i18n/ar.po
+++ b/bin/addons/base/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:49+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:40+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/bg.po b/bin/addons/base/i18n/bg.po
index 3c0c2397239..01e86fc2c36 100644
--- a/bin/addons/base/i18n/bg.po
+++ b/bin/addons/base/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:50+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/bs.po b/bin/addons/base/i18n/bs.po
index c85db96d9d0..668ae300964 100644
--- a/bin/addons/base/i18n/bs.po
+++ b/bin/addons/base/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:49+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/ca.po b/bin/addons/base/i18n/ca.po
index 50d6366292c..a0339e47061 100644
--- a/bin/addons/base/i18n/ca.po
+++ b/bin/addons/base/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:50+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/cs.po b/bin/addons/base/i18n/cs.po
index 5ef4fd42337..5ed283c690f 100644
--- a/bin/addons/base/i18n/cs.po
+++ b/bin/addons/base/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:50+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/da.po b/bin/addons/base/i18n/da.po
index 4f1a81e8101..150cac70abe 100644
--- a/bin/addons/base/i18n/da.po
+++ b/bin/addons/base/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:50+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/de.po b/bin/addons/base/i18n/de.po
index 6f16b160580..ca85a64983b 100644
--- a/bin/addons/base/i18n/de.po
+++ b/bin/addons/base/i18n/de.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: 2011-04-09 04:51+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:42+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/el.po b/bin/addons/base/i18n/el.po
index 119131b5c99..5032e6beb3f 100644
--- a/bin/addons/base/i18n/el.po
+++ b/bin/addons/base/i18n/el.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:52+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:43+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/bin/addons/base/i18n/en_GB.po b/bin/addons/base/i18n/en_GB.po
index 5ccc7a440b8..63e4faa9418 100644
--- a/bin/addons/base/i18n/en_GB.po
+++ b/bin/addons/base/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:57+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:48+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/es.po b/bin/addons/base/i18n/es.po
index 844ecca994f..306bd03eef9 100644
--- a/bin/addons/base/i18n/es.po
+++ b/bin/addons/base/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:55+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:47+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/es_CL.po b/bin/addons/base/i18n/es_CL.po
index 79375bd3876..bc3020f4a36 100644
--- a/bin/addons/base/i18n/es_CL.po
+++ b/bin/addons/base/i18n/es_CL.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:57+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:48+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/es_EC.po b/bin/addons/base/i18n/es_EC.po
index a46ebe723d3..b4942d6a898 100644
--- a/bin/addons/base/i18n/es_EC.po
+++ b/bin/addons/base/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:58+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:49+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/et.po b/bin/addons/base/i18n/et.po
index 3590c222e88..7d399d8ed6a 100644
--- a/bin/addons/base/i18n/et.po
+++ b/bin/addons/base/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:51+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:42+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/eu.po b/bin/addons/base/i18n/eu.po
index 3dbadd6a886..05f3ee08b1a 100644
--- a/bin/addons/base/i18n/eu.po
+++ b/bin/addons/base/i18n/eu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:49+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:40+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/fa.po b/bin/addons/base/i18n/fa.po
index e4b5dd3395f..6f2ca1d3994 100644
--- a/bin/addons/base/i18n/fa.po
+++ b/bin/addons/base/i18n/fa.po
@@ -9,8 +9,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:54+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:45+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 "X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
 "X-Poedit-Language: Persian\n"
 
diff --git a/bin/addons/base/i18n/fa_AF.po b/bin/addons/base/i18n/fa_AF.po
index 83780362eca..f30fd952992 100644
--- a/bin/addons/base/i18n/fa_AF.po
+++ b/bin/addons/base/i18n/fa_AF.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:58+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:49+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/fi.po b/bin/addons/base/i18n/fi.po
index 32e145c153f..25257a41706 100644
--- a/bin/addons/base/i18n/fi.po
+++ b/bin/addons/base/i18n/fi.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:51+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:42+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/fr.po b/bin/addons/base/i18n/fr.po
index 11a14a34072..7f5ea7a73b4 100644
--- a/bin/addons/base/i18n/fr.po
+++ b/bin/addons/base/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:51+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:42+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/gl.po b/bin/addons/base/i18n/gl.po
index 8be8f25f964..2919ed6a67c 100644
--- a/bin/addons/base/i18n/gl.po
+++ b/bin/addons/base/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:51+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:42+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/he.po b/bin/addons/base/i18n/he.po
index 47696150834..b514fe214db 100644
--- a/bin/addons/base/i18n/he.po
+++ b/bin/addons/base/i18n/he.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:52+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:43+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po
index f5e875a42c1..ba56818bc70 100644
--- a/bin/addons/base/i18n/hr.po
+++ b/bin/addons/base/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:55+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:46+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 "Language: hr\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/hu.po b/bin/addons/base/i18n/hu.po
index 48d704160e7..75e1b487555 100644
--- a/bin/addons/base/i18n/hu.po
+++ b/bin/addons/base/i18n/hu.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:52+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:43+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/id.po b/bin/addons/base/i18n/id.po
index 784609da885..236d4d7549e 100644
--- a/bin/addons/base/i18n/id.po
+++ b/bin/addons/base/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:52+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:43+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/is.po b/bin/addons/base/i18n/is.po
index de51518f8d8..e0dd68512e2 100644
--- a/bin/addons/base/i18n/is.po
+++ b/bin/addons/base/i18n/is.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:52+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:43+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/it.po b/bin/addons/base/i18n/it.po
index 4b658e70064..62593446b37 100644
--- a/bin/addons/base/i18n/it.po
+++ b/bin/addons/base/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:53+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:44+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po
index 0d71b875f72..80d89c416bc 100644
--- a/bin/addons/base/i18n/ja.po
+++ b/bin/addons/base/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:53+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:44+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/ko.po b/bin/addons/base/i18n/ko.po
index ae16ee197a6..b192364ed8f 100644
--- a/bin/addons/base/i18n/ko.po
+++ b/bin/addons/base/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:53+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:44+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/lt.po b/bin/addons/base/i18n/lt.po
index 8cd0811d7cb..c7ad2dbbdac 100644
--- a/bin/addons/base/i18n/lt.po
+++ b/bin/addons/base/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:53+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:44+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/lv.po b/bin/addons/base/i18n/lv.po
index 661d9b0509e..387b975bfdd 100644
--- a/bin/addons/base/i18n/lv.po
+++ b/bin/addons/base/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:53+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:44+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/mn.po b/bin/addons/base/i18n/mn.po
index eea96c609d7..c88f6a637cc 100644
--- a/bin/addons/base/i18n/mn.po
+++ b/bin/addons/base/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:53+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:44+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/nb.po b/bin/addons/base/i18n/nb.po
index 5303a2e26cd..d230e1b2770 100644
--- a/bin/addons/base/i18n/nb.po
+++ b/bin/addons/base/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:54+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:45+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/nl.po b/bin/addons/base/i18n/nl.po
index 00e24675f38..a212b9a9823 100644
--- a/bin/addons/base/i18n/nl.po
+++ b/bin/addons/base/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:50+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -918,7 +918,7 @@ msgstr "Toegang verwijderen"
 #. module: base
 #: model:res.country,name:base.ne
 msgid "Niger"
-msgstr "Nigeria"
+msgstr "Niger"
 
 #. module: base
 #: selection:base.language.install,lang:0
diff --git a/bin/addons/base/i18n/nl_BE.po b/bin/addons/base/i18n/nl_BE.po
index 6a43a00cb10..6565a0a7b94 100644
--- a/bin/addons/base/i18n/nl_BE.po
+++ b/bin/addons/base/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:57+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:48+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/pl.po b/bin/addons/base/i18n/pl.po
index 4ae7b3209e4..609986998bc 100644
--- a/bin/addons/base/i18n/pl.po
+++ b/bin/addons/base/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:54+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:45+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/pt.po b/bin/addons/base/i18n/pt.po
index 516ea0a3a7b..1e61950e3c8 100644
--- a/bin/addons/base/i18n/pt.po
+++ b/bin/addons/base/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:54+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:45+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/pt_BR.po b/bin/addons/base/i18n/pt_BR.po
index a0e7a8e3d8c..ac7d9343ef4 100644
--- a/bin/addons/base/i18n/pt_BR.po
+++ b/bin/addons/base/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:57+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:48+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/ro.po b/bin/addons/base/i18n/ro.po
index c4573a3822b..e1c8534efa9 100644
--- a/bin/addons/base/i18n/ro.po
+++ b/bin/addons/base/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:54+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:45+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/ru.po b/bin/addons/base/i18n/ru.po
index 48d62b57ca6..238dc2f6582 100644
--- a/bin/addons/base/i18n/ru.po
+++ b/bin/addons/base/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:55+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:46+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -181,7 +181,7 @@ msgstr "создано."
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_woodsuppliers0
 msgid "Wood Suppliers"
-msgstr ""
+msgstr "Поставщики древисины"
 
 #. module: base
 #: code:addons/base/module/module.py:303
@@ -440,7 +440,7 @@ msgstr "Запланировать обновление"
 #: code:addons/orm.py:838
 #, python-format
 msgid "Key/value '%s' not found in selection field '%s'"
-msgstr ""
+msgstr "Ключ/значение '%s' не найдено в поле выбора '%s'"
 
 #. module: base
 #: help:res.country,code:0
@@ -515,6 +515,7 @@ msgstr "Описание модели"
 msgid ""
 "Optional model name of the objects on which this action should be visible"
 msgstr ""
+"Необязательное имя модели объектов, для которых действие должно быть видимым"
 
 #. module: base
 #: field:workflow.transition,trigger_expr_id:0
@@ -724,7 +725,7 @@ msgstr "Рабочие дни"
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "Other OSI Approved Licence"
-msgstr ""
+msgstr "Другие лицензии утвержденные OSI"
 
 #. module: base
 #: help:res.config.users,context_lang:0
@@ -863,7 +864,7 @@ msgstr "Переходы состояний"
 #: code:addons/orm.py:4020
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
-msgstr ""
+msgstr "Запись №%d из %s не найдена, нельзя скопировать !"
 
 #. module: base
 #: field:ir.module.module,contributors:0
@@ -965,7 +966,7 @@ msgstr "Маршалловы Острова"
 #: code:addons/base/ir/ir_model.py:328
 #, python-format
 msgid "Changing the model of a field is forbidden!"
-msgstr ""
+msgstr "Изменение модели поля запрещено!"
 
 #. module: base
 #: model:res.country,name:base.ht
@@ -987,6 +988,10 @@ msgid ""
 "reference it\n"
 "- creation/update: a mandatory field is not correctly set"
 msgstr ""
+"Операция не может быть завершена, вероятно, связано со следующим:\n"
+"- удаление: возможно, вы пытаетесь удалить запись в то время как другие "
+"записи, по-прежнему ссылаются на неё\n"
+"- создание/изменение: обязательное поле не корректно"
 
 #. module: base
 #: view:ir.rule:0
@@ -1058,7 +1063,7 @@ msgstr "Нет языка с кодом \"%s\""
 #: code:addons/base/publisher_warranty/publisher_warranty.py:163
 #, python-format
 msgid "Error during communication with the publisher warranty server."
-msgstr ""
+msgstr "Ошибка во время связи с сервером гарантии издателя."
 
 #. module: base
 #: help:ir.actions.server,email:0
@@ -1174,6 +1179,8 @@ msgid ""
 "Access all the fields related to the current object using expressions, i.e. "
 "object.partner_id.name "
 msgstr ""
+"Доступ ко всем полям, связанным с текущим объектом с помощью выражений, "
+"прим.: object.partner_id.name "
 
 #. module: base
 #: model:ir.model,name:base.model_res_country_state
@@ -1612,6 +1619,10 @@ msgid ""
 "access to selected functionalities within the system. Click on 'Done' if you "
 "do not wish to add more users at this stage, you can always do this later."
 msgstr ""
+"Создание дополнительных пользователей и назначение им групп, что позволит им "
+"иметь доступ к отдельным функциям в рамках системы. Нажмите на кнопку "
+"\"Готово\", если вы не хотите добавлять пользователей на данном этапе, вы "
+"всегда можете сделать это позже."
 
 #. module: base
 #: model:res.country,name:base.bz
@@ -1957,6 +1968,8 @@ msgid ""
 "One of the records you are trying to modify has already been deleted "
 "(Document type: %s)."
 msgstr ""
+"Одна из записей, которую вы пытаетесь изменить, уже удалена (Тип документа: "
+"%s)."
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_country
@@ -1965,6 +1978,8 @@ msgid ""
 "partner records. You can create or delete countries to make sure the ones "
 "you are working on will be maintained."
 msgstr ""
+"Отображение и управление списком всех стран, которые могут быть отнесены к "
+"вашим контрагентам. Вы можете создавать или удалять страны в процессе работы."
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_7
@@ -1984,7 +1999,7 @@ msgstr ""
 #. module: base
 #: help:ir.model.fields,model:0
 msgid "The technical name of the model this field belongs to"
-msgstr ""
+msgstr "Техническое название модели к которой относится это поле"
 
 #. module: base
 #: field:ir.actions.server,action_id:0
@@ -2031,7 +2046,7 @@ msgstr "События партнера"
 #. module: base
 #: model:res.widget,title:base.facebook_widget
 msgid "Facebook"
-msgstr ""
+msgstr "Facebook"
 
 #. module: base
 #: model:res.country,name:base.am
@@ -2167,6 +2182,8 @@ msgid ""
 "way you want to print them in letters and other documents. Some example: "
 "Mr., Mrs. "
 msgstr ""
+"Управление обращениями к контактам, доступным в вашей системе, обращения при "
+"печати в письмах и других документах. Например: Г-н, Г-жа. "
 
 #. module: base
 #: field:res.company,rml_footer1:0
@@ -2426,7 +2443,7 @@ msgstr "Фильтры"
 #: code:addons/orm.py:758
 #, python-format
 msgid "Please check that all your lines have %d columns."
-msgstr ""
+msgstr "Проверьте, что во всех строках имеется %d столбцов."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_cron_act
@@ -2446,12 +2463,14 @@ msgstr "Название"
 #: help:ir.property,res_id:0
 msgid "If not set, acts as a default value for new resources"
 msgstr ""
+"Если не установлено, выступает в качестве значения по умолчанию для новых "
+"ресурсов"
 
 #. module: base
 #: code:addons/orm.py:3448
 #, python-format
 msgid "Recursivity Detected."
-msgstr ""
+msgstr "Обнаружена рекурсия."
 
 #. module: base
 #: code:addons/base/module/module.py:262
@@ -2694,6 +2713,8 @@ msgstr "Португалия"
 msgid ""
 "You cannot have multiple records with the same id for the same module !"
 msgstr ""
+"Вы не можете иметь несколько записей с одинаковым идентификатором для одного "
+"модуля !"
 
 #. module: base
 #: field:ir.module.module,certificate:0
@@ -2973,6 +2994,8 @@ msgid ""
 "The selected language has been successfully installed. You must change the "
 "preferences of the user and open a new menu to view the changes."
 msgstr ""
+"Выбранный язык был успешно установлен. Вы должны изменить настройки "
+"пользователя и открыть новое меню для просмотра изменений."
 
 #. module: base
 #: sql_constraint:ir.config_parameter:0
@@ -3099,7 +3122,7 @@ msgstr "Рабочие процессы"
 #. module: base
 #: field:ir.translation,xml_id:0
 msgid "XML Id"
-msgstr ""
+msgstr "XML Id"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_config_user_form
@@ -3176,7 +3199,7 @@ msgstr "Настройка системы выполнена"
 #: code:addons/orm.py:929
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
-msgstr ""
+msgstr "Произошла ошибка при проверке поля(ей)  %s: %s"
 
 #. module: base
 #: view:ir.property:0
@@ -3246,6 +3269,8 @@ msgid ""
 "You can not create this document (%s) ! Be sure your user belongs to one of "
 "these groups: %s."
 msgstr ""
+"Вы не можете создать этот документ (%s) ! Убедитесь, что ваш пользователь "
+"принадлежит к одной из этих групп: %s."
 
 #. module: base
 #: model:res.country,name:base.mu
@@ -3333,7 +3358,7 @@ msgstr "Следующее число"
 #. module: base
 #: help:workflow.transition,condition:0
 msgid "Expression to be satisfied if we want the transition done."
-msgstr ""
+msgstr "Выражение, которое будет выполнено, если мы хотим сделать переход."
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -3412,7 +3437,7 @@ msgstr "Применить для удаления"
 #: code:addons/base/ir/ir_model.py:319
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
-msgstr ""
+msgstr "Нельзя переименовать столбец в %s, потому что он уже существует !"
 
 #. module: base
 #: view:ir.attachment:0
@@ -3826,6 +3851,7 @@ msgstr ""
 #: view:publisher_warranty.contract.wizard:0
 msgid "Please enter the serial key provided in your contract document:"
 msgstr ""
+"Пожалуйста, введите серийный ключ, предоставленный в вашем контракте:"
 
 #. module: base
 #: view:workflow.activity:0
@@ -3838,6 +3864,7 @@ msgstr "Начало процесса"
 #, python-format
 msgid "module base cannot be loaded! (hint: verify addons-path)"
 msgstr ""
+"базовый модуль не может быть загружен! (Подсказка: проверьте addons-path)"
 
 #. module: base
 #: view:res.partner.bank:0
@@ -3972,13 +3999,13 @@ msgstr "ir.actions.url"
 #. module: base
 #: model:res.widget,title:base.currency_converter_widget
 msgid "Currency Converter"
-msgstr ""
+msgstr "Конвертер валют"
 
 #. module: base
 #: code:addons/orm.py:156
 #, python-format
 msgid "Wrong ID for the browse record, got %r, expected an integer."
-msgstr ""
+msgstr "Неверный идентификатор записи, получено %r, ожидалось число."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_addess_tree
@@ -5798,7 +5825,7 @@ msgstr ""
 #. module: base
 #: view:ir.model:0
 msgid "Custom"
-msgstr ""
+msgstr "Пользовательский"
 
 #. module: base
 #: view:res.request:0
@@ -5845,7 +5872,7 @@ msgstr "%I - часы [01,12]."
 #. module: base
 #: selection:publisher_warranty.contract.wizard,state:0
 msgid "Finished"
-msgstr ""
+msgstr "Завершено"
 
 #. module: base
 #: model:res.country,name:base.de
@@ -5901,6 +5928,8 @@ msgstr "Гондурас"
 msgid ""
 "Check out this box if you want to always display tips on each menu action"
 msgstr ""
+"Отметьте этот квадратик, если вы хотите всегда выводить советы для каждого "
+"пункта меню"
 
 #. module: base
 #: model:res.country,name:base.eg
@@ -6295,6 +6324,8 @@ msgid ""
 "OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
 "get the required padding size."
 msgstr ""
+"OpenERP автоматически добавляет несколько '0' слева от 'Следующее число' для "
+" заданного выравнивания."
 
 #. module: base
 #: view:res.lang:0
@@ -6581,7 +6612,7 @@ msgstr "Пиктограмма"
 #. module: base
 #: help:ir.model.fields,model_id:0
 msgid "The model this field belongs to"
-msgstr ""
+msgstr "Модель к которой принадлежит это поле"
 
 #. module: base
 #: model:res.country,name:base.mq
@@ -6675,7 +6706,7 @@ msgstr "Открыть модули"
 #. module: base
 #: model:ir.actions.act_window,help:base.action_res_bank_form
 msgid "Manage bank records you want to be used in the system."
-msgstr ""
+msgstr "Управление банковскими документами используемыми в системе."
 
 #. module: base
 #: view:base.module.import:0
@@ -6719,6 +6750,8 @@ msgid ""
 "The sum of the data (2nd field) is null.\n"
 "We can't draw a pie chart !"
 msgstr ""
+"Сумма данных (второе поле) равно нулю.\n"
+"Мы не можем нарисовать круговую диаграмму !"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_lunch_reporting
@@ -6804,7 +6837,7 @@ msgstr "Начать обновление"
 #: code:addons/base/publisher_warranty/publisher_warranty.py:144
 #, python-format
 msgid "Contract validation error"
-msgstr ""
+msgstr "Ошибка проверки контракта"
 
 #. module: base
 #: field:res.country.state,name:0
@@ -6998,7 +7031,7 @@ msgstr "Настоящее имя пользователя, использует
 #: code:addons/osv.py:156
 #, python-format
 msgid "Integrity Error"
-msgstr ""
+msgstr "Ошибка целостности"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_wizard_screen
@@ -7048,7 +7081,7 @@ msgstr "Аргументы"
 #: code:addons/orm.py:716
 #, python-format
 msgid "Database ID doesn't exist: %s : %s"
-msgstr ""
+msgstr "Идентификатор базы данных не существует:  %s : %s"
 
 #. module: base
 #: selection:ir.module.module,license:0
@@ -7064,7 +7097,7 @@ msgstr "GPL версия 3"
 #: code:addons/orm.py:836
 #, python-format
 msgid "key '%s' not found in selection field '%s'"
-msgstr ""
+msgstr "Ключ '%s' не найден в поле выбора '%s'"
 
 #. module: base
 #: view:partner.wizard.ean.check:0
@@ -7075,7 +7108,7 @@ msgstr "Правильный штрих-код"
 #: code:addons/orm.py:2317
 #, python-format
 msgid "The value \"%s\" for the field \"%s\" is not in the selection"
-msgstr ""
+msgstr "Значение \"%s\" в поле \"%s\" не входит в выбранные"
 
 #. module: base
 #: field:res.partner,customer:0
@@ -7252,6 +7285,9 @@ msgid ""
 "\n"
 "[object with reference: %s - %s]"
 msgstr ""
+"\n"
+"\n"
+"[объект со ссылкой: %s - %s]"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_default
@@ -7605,7 +7641,7 @@ msgstr "workflow.instance"
 #: code:addons/orm.py:278
 #, python-format
 msgid "Unknown attribute %s in %s "
-msgstr ""
+msgstr "Неизвестный атрибут %s в %s "
 
 #. module: base
 #: view:res.lang:0
@@ -7616,7 +7652,7 @@ msgstr "10. %S              ==> 20"
 #: code:addons/fields.py:106
 #, python-format
 msgid "undefined get method !"
-msgstr ""
+msgstr "не определен метод 'get'!"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -7630,6 +7666,8 @@ msgid ""
 "Only specify a value if you want to change the user password. This user will "
 "have to logout and login again!"
 msgstr ""
+"Вводите пароль, только если вы хотите его изменить. Этому пользователю "
+"придется выйти и снова войти !"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_madam
@@ -7655,7 +7693,7 @@ msgstr "Двоичный файл или внешний URL"
 #: field:res.config.users,new_password:0
 #: field:res.users,new_password:0
 msgid "Change password"
-msgstr ""
+msgstr "Сменить пароль"
 
 #. module: base
 #: model:res.country,name:base.nl
@@ -7695,7 +7733,7 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_emails
 #: model:ir.ui.menu,name:base.menu_mail_gateway
 msgid "Emails"
-msgstr ""
+msgstr "Адреса эл.почты"
 
 #. module: base
 #: model:res.country,name:base.cd
@@ -7950,6 +7988,8 @@ msgid ""
 "Name of the method to be called on the object when this scheduler is "
 "executed."
 msgstr ""
+"Название метода который будет вызван из объекта, когда этот планировщик "
+"запустится."
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:219
@@ -8024,7 +8064,7 @@ msgstr "Болгария"
 #. module: base
 #: view:publisher_warranty.contract.wizard:0
 msgid "Publisher warranty contract successfully registered!"
-msgstr ""
+msgstr "Контракт гарантии издателя успешно зарегистрирован !"
 
 #. module: base
 #: model:res.country,name:base.ao
@@ -8580,7 +8620,7 @@ msgstr "Конфигурация системы завершена"
 #. module: base
 #: field:workflow.triggers,instance_id:0
 msgid "Destination Instance"
-msgstr ""
+msgstr "Целевой элемент"
 
 #. module: base
 #: field:ir.actions.act_window,multi:0
@@ -8632,7 +8672,7 @@ msgstr "Ошибка ! Нельзя создать зацикленные мен
 #: model:ir.ui.menu,name:base.menu_publisher_warranty_contract_add
 #: view:publisher_warranty.contract.wizard:0
 msgid "Register a Contract"
-msgstr ""
+msgstr "Зарегистрировать договор"
 
 #. module: base
 #: view:ir.rule:0
@@ -8840,6 +8880,8 @@ msgid ""
 "You can not delete this document (%s) ! Be sure your user belongs to one of "
 "these groups: %s."
 msgstr ""
+"Вы не можете удалить этот документ (%s) ! Убедитесь, что ваш пользователь "
+"принадлежит к одной из этих групп: %s."
 
 #. module: base
 #: model:ir.model,name:base.model_base_module_configuration
@@ -8958,6 +9000,10 @@ msgid ""
 "categories have a hierarchy structure: a partner belonging to a category "
 "also belong to his parent category."
 msgstr ""
+"Управление категориями контрагентов, чтобы лучше классифицировать их для "
+"отслеживания и анализа. Контрагент может принадлежать к нескольким "
+"категориям в иерархической структуре: партнер принадлежащих к категории "
+"также относятся к своей родительской категории."
 
 #. module: base
 #: model:res.country,name:base.az
@@ -9116,6 +9162,10 @@ msgid ""
 "1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
 "106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
+"Формат разделителя должен иметь вид [,n] где 0 < n : начиная с разряда "
+"единиц. -1 завершает разделение. Например, [3,2,-1] представит число 106500 "
+"в виде 1,06,500; [1,2,-1] представит его в виде 106,50,0; [3] представит вид "
+"106,500. В каждом случае ',' используется для разделения разрядов."
 
 #. module: base
 #: view:res.company:0
@@ -9126,7 +9176,7 @@ msgstr "Книжная"
 #: code:addons/base/ir/ir_model.py:317
 #, python-format
 msgid "Can only rename one column at a time!"
-msgstr ""
+msgstr "Можно переименовать только одну колонку за один раз !"
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -9230,6 +9280,8 @@ msgid ""
 "Only one client action will be executed, last client action will be "
 "considered in case of multiple client actions."
 msgstr ""
+"Только одно действие клиента будет выполнено, последнее действие клиента "
+"будет выполнено в случае использования нескольких действий клиента."
 
 #. module: base
 #: view:res.lang:0
diff --git a/bin/addons/base/i18n/sk.po b/bin/addons/base/i18n/sk.po
index 947f18ea4d3..fec1566e620 100644
--- a/bin/addons/base/i18n/sk.po
+++ b/bin/addons/base/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:55+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:46+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/sl.po b/bin/addons/base/i18n/sl.po
index b90532f954b..5484d1bee7b 100644
--- a/bin/addons/base/i18n/sl.po
+++ b/bin/addons/base/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:55+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:46+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/sq.po b/bin/addons/base/i18n/sq.po
index 5163adbf424..5f8d38faf8a 100644
--- a/bin/addons/base/i18n/sq.po
+++ b/bin/addons/base/i18n/sq.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:49+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:40+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/sr.po b/bin/addons/base/i18n/sr.po
index 892fa6f8f8c..892105cdae7 100644
--- a/bin/addons/base/i18n/sr.po
+++ b/bin/addons/base/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:55+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:46+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/sr@latin.po b/bin/addons/base/i18n/sr@latin.po
index 3b9f7fb9118..0325d6d9824 100644
--- a/bin/addons/base/i18n/sr@latin.po
+++ b/bin/addons/base/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:58+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:49+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/sv.po b/bin/addons/base/i18n/sv.po
index 40170e9079d..0641132311f 100644
--- a/bin/addons/base/i18n/sv.po
+++ b/bin/addons/base/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:56+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:47+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/th.po b/bin/addons/base/i18n/th.po
index 8a477dd3aff..cdbf281c161 100644
--- a/bin/addons/base/i18n/th.po
+++ b/bin/addons/base/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:56+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:47+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/tlh.po b/bin/addons/base/i18n/tlh.po
index 94ce3d0d2a2..903ebe55f41 100644
--- a/bin/addons/base/i18n/tlh.po
+++ b/bin/addons/base/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:56+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:47+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/tr.po b/bin/addons/base/i18n/tr.po
index d2966e4cf56..a60d999da7d 100644
--- a/bin/addons/base/i18n/tr.po
+++ b/bin/addons/base/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:56+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:47+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/uk.po b/bin/addons/base/i18n/uk.po
index 2c8dc3201e2..4e0d168b913 100644
--- a/bin/addons/base/i18n/uk.po
+++ b/bin/addons/base/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:56+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:47+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/ur.po b/bin/addons/base/i18n/ur.po
index 265444a22c9..48476d52953 100644
--- a/bin/addons/base/i18n/ur.po
+++ b/bin/addons/base/i18n/ur.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:56+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:47+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/vi.po b/bin/addons/base/i18n/vi.po
index a1a0f9c96c5..1ae261cb99e 100644
--- a/bin/addons/base/i18n/vi.po
+++ b/bin/addons/base/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:57+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:48+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -109,7 +109,7 @@ msgstr ""
 #. module: base
 #: view:ir.module.module:0
 msgid "Created Views"
-msgstr ""
+msgstr "Tạo khung nhìn"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:485
@@ -150,12 +150,14 @@ msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
 "them through Python code, preferably through a custom addon!"
 msgstr ""
+"các thuộc tính cơ bản không thể thay đổi theo cách này  ! hãy thay đổi chúng "
+"thông qua Python mã, tốt hơn thông qua một addon tùy chỉnh!"
 
 #. module: base
 #: code:addons/osv.py:133
 #, python-format
 msgid "Constraint Error"
-msgstr ""
+msgstr "Lỗi ràng buộc"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_view_custom
@@ -177,7 +179,7 @@ msgstr "đã được tạo."
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_woodsuppliers0
 msgid "Wood Suppliers"
-msgstr ""
+msgstr "người bán gỗ"
 
 #. module: base
 #: code:addons/base/module/module.py:303
@@ -192,13 +194,13 @@ msgstr ""
 #. module: base
 #: field:ir.sequence,number_increment:0
 msgid "Increment Number"
-msgstr ""
+msgstr "số tự tăng"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_company_tree
 #: model:ir.ui.menu,name:base.menu_action_res_company_tree
 msgid "Company's Structure"
-msgstr "Cơ cấu công ty"
+msgstr "cấu trúc của công ty"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -6548,7 +6550,7 @@ msgstr ""
 #: view:base.module.import:0
 #: view:base.module.update:0
 msgid "Open Modules"
-msgstr ""
+msgstr "Mở danh sách Mô-đun"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_res_bank_form
diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po
index e2a22c6c33b..cb281fb3d50 100644
--- a/bin/addons/base/i18n/zh_CN.po
+++ b/bin/addons/base/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:58+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:49+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/bin/addons/base/i18n/zh_TW.po b/bin/addons/base/i18n/zh_TW.po
index c947f2027cb..42f3fc3356a 100644
--- a/bin/addons/base/i18n/zh_TW.po
+++ b/bin/addons/base/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:58+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:49+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/debian/po/bg.po b/debian/po/bg.po
index 4114098bf1f..664882e1034 100644
--- a/debian/po/bg.po
+++ b/debian/po/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: 2011-04-09 04:58+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/ca.po b/debian/po/ca.po
index d6620325be2..7c0cbad994a 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.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: 2011-04-09 04:58+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 828da50ac8c..1e01a82c214 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/de.po b/debian/po/de.po
index 0913e1f9390..5cfe8d9d7fa 100644
--- a/debian/po/de.po
+++ b/debian/po/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: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/el.po b/debian/po/el.po
index cf0a0ce7d49..d117f515aad 100644
--- a/debian/po/el.po
+++ b/debian/po/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/en_GB.po b/debian/po/en_GB.po
index d18900928f6..5092197883c 100644
--- a/debian/po/en_GB.po
+++ b/debian/po/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: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/es.po b/debian/po/es.po
index a2b756e0b56..d9eb83615bc 100644
--- a/debian/po/es.po
+++ b/debian/po/es.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: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/es_CL.po b/debian/po/es_CL.po
index 534d217c24c..2cc55b1c818 100644
--- a/debian/po/es_CL.po
+++ b/debian/po/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: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/es_EC.po b/debian/po/es_EC.po
index 56a5a0679e4..311ccc49a10 100644
--- a/debian/po/es_EC.po
+++ b/debian/po/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: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/fa.po b/debian/po/fa.po
index 71e215d85a1..09ea0d83eda 100644
--- a/debian/po/fa.po
+++ b/debian/po/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: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/fi.po b/debian/po/fi.po
index 0b21344078d..16b500b10d0 100644
--- a/debian/po/fi.po
+++ b/debian/po/fi.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/fr.po b/debian/po/fr.po
index d886baf38c0..f44e0d7e81f 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/gl.po b/debian/po/gl.po
index c77faee2a0d..b8510d961dd 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/he.po b/debian/po/he.po
index 0980a8f64a8..50dd3c2b883 100644
--- a/debian/po/he.po
+++ b/debian/po/he.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/hr.po b/debian/po/hr.po
index 97fccea596f..62c81f52c56 100644
--- a/debian/po/hr.po
+++ b/debian/po/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: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/hu.po b/debian/po/hu.po
index 2749b521ed7..6db4d67bea4 100644
--- a/debian/po/hu.po
+++ b/debian/po/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: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/it.po b/debian/po/it.po
index c8b7cddb483..8e5372bd037 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 4cc67c42c40..bf96d93bcbb 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/ko.po b/debian/po/ko.po
index 99b7c4820a6..f1a07767e55 100644
--- a/debian/po/ko.po
+++ b/debian/po/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: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/lv.po b/debian/po/lv.po
index f3be1623204..852bf1b9928 100644
--- a/debian/po/lv.po
+++ b/debian/po/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: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/mn.po b/debian/po/mn.po
index 15422904083..9d50a9e737b 100644
--- a/debian/po/mn.po
+++ b/debian/po/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: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/nb.po b/debian/po/nb.po
index 2cd4488244c..e6c6aca696f 100644
--- a/debian/po/nb.po
+++ b/debian/po/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: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/nl.po b/debian/po/nl.po
index bdc691b1ecc..1690b5becc8 100644
--- a/debian/po/nl.po
+++ b/debian/po/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: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/pl.po b/debian/po/pl.po
index 5276332e671..8f5233a9ffc 100644
--- a/debian/po/pl.po
+++ b/debian/po/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: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/pt.po b/debian/po/pt.po
index f0753a5dc23..1981a87f8e9 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index b57bfa26a26..9908b9dab06 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/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: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/ro.po b/debian/po/ro.po
index f0b3e852908..cc8e901cd85 100644
--- a/debian/po/ro.po
+++ b/debian/po/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: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 2206e7bcb5b..8dbf7c8f8d0 100644
--- a/debian/po/ru.po
+++ b/debian/po/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: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/sk.po b/debian/po/sk.po
index 6d392a41dc5..ec27b8de8ee 100644
--- a/debian/po/sk.po
+++ b/debian/po/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: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/sq.po b/debian/po/sq.po
index a579e919dcb..604519da129 100644
--- a/debian/po/sq.po
+++ b/debian/po/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: 2011-04-09 04:58+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/sr.po b/debian/po/sr.po
index f8a410e4c8c..1bf6b98d2b1 100644
--- a/debian/po/sr.po
+++ b/debian/po/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 9484bde189a..1abda4c3f78 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 "X-Poedit-Language: Swedish\n"
 
 #. Type: string
diff --git a/debian/po/tr.po b/debian/po/tr.po
index 61c0d2ae9dd..00b127ee2b6 100644
--- a/debian/po/tr.po
+++ b/debian/po/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: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/uk.po b/debian/po/uk.po
index 62c139cdbad..ec02b0ed450 100644
--- a/debian/po/uk.po
+++ b/debian/po/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: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/vi.po b/debian/po/vi.po
index 7b05a26b1c2..2fc62d4664f 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po
index e9facd90e03..54af64bd9f2 100644
--- a/debian/po/zh_CN.po
+++ b/debian/po/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/zh_TW.po b/debian/po/zh_TW.po
index b176cd4c2a7..3d5c7ac0a2c 100644
--- a/debian/po/zh_TW.po
+++ b/debian/po/zh_TW.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-09 04:59+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-19 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 "X-Poedit-Country: TAIWAN\n"
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-SourceCharset: utf-8\n"

From 3e2d5096845b6c3de94be07755ba4dad7fda5c36 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Tue, 19 Apr 2011 11:14:51 +0530
Subject: [PATCH 092/188] [FIX] hr_holidays: Improve _sql_constraint and help

bzr revid: psi@tinyerp.co.in-20110419054451-7ien3mqbaqooozj3
---
 addons/hr_holidays/hr_holidays.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 131d38d7001..84e142d7f12 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -120,9 +120,9 @@ class hr_holidays(osv.osv):
         'date_to': fields.datetime('End Date', readonly=True, states={'draft':[('readonly',False)]}),
         'holiday_status_id': fields.many2one("hr.holidays.status", "Leave Type", required=True,readonly=True, states={'draft':[('readonly',False)]}),
         'employee_id': fields.many2one('hr.employee', "Employee", select=True, invisible=False, readonly=True, states={'draft':[('readonly',False)]}, help='Leave Manager can let this field empty if this leave request/allocation is for every employee'),
-        #'manager_id': fields.many2one('hr.employee', 'Leave Manager', invisible=False, readonly=True, help='This area is automaticly filled by the user who validate the leave'),
+        #'manager_id': fields.many2one('hr.employee', 'Leave Manager', invisible=False, readonly=True, help='This area is automatically filled by the user who validate the leave'),
         #'notes': fields.text('Notes',readonly=True, states={'draft':[('readonly',False)]}),
-        'manager_id': fields.many2one('hr.employee', 'First Approval', invisible=False, readonly=True, help='This area is automaticly filled by the user who validate the leave'),
+        'manager_id': fields.many2one('hr.employee', 'First Approval', invisible=False, readonly=True, help='This area is automatically filled by the user who validate the leave'),
         'notes': fields.text('Reasons',readonly=True, states={'draft':[('readonly',False)]}),
         'number_of_days_temp': fields.float('Number of Days', readonly=True, states={'draft':[('readonly',False)]}),
         'number_of_days': fields.function(_compute_number_of_days, method=True, string='Number of Days', store=True),
@@ -133,7 +133,7 @@ class hr_holidays(osv.osv):
         'department_id':fields.related('employee_id', 'department_id', string='Department', type='many2one', relation='hr.department', readonly=True, store=True),
         'category_id': fields.many2one('hr.employee.category', "Category", help='Category of Employee'),
         'holiday_type': fields.selection([('employee','By Employee'),('category','By Employee Category')], 'Allocation Type', help='By Employee: Allocation/Request for individual Employee, By Employee Category: Allocation/Request for group of employees in category', required=True),
-        'manager_id2': fields.many2one('hr.employee', 'Second Approval', readonly=True, help='This area is automaticly filled by the user who validate the leave with second level (If Leave type need second validation)')
+        'manager_id2': fields.many2one('hr.employee', 'Second Approval', readonly=True, help='This area is automatically filled by the user who validate the leave with second level (If Leave type need second validation)')
     }
     _defaults = {
         'employee_id': _employee_get,
@@ -144,8 +144,8 @@ class hr_holidays(osv.osv):
     }
     _sql_constraints = [
         ('type_value', "CHECK( (holiday_type='employee' AND employee_id IS NOT NULL) or (holiday_type='category' AND category_id IS NOT NULL))", "You have to select an employee or a category"),
-        ('date_check', "CHECK ( number_of_days_temp > 0 )", "The number of days must be greater than 0 !"),
-        ('date_check2', "CHECK ( (type='add') OR (date_from < date_to))", "The start date must be before the end date !")
+        ('date_check2', "CHECK ( (type='add') OR (date_from <= date_to))", "The start date must be before the end date !"),
+        ('date_check', "CHECK ( number_of_days_temp >= 0 )", "The number of days must be greater than 0 !"),
     ]
 
     def _create_resource_leave(self, cr, uid, vals, context=None):

From da64dc059f21cbd1fcf07f11a78df613b8ae2c2d Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Tue, 19 Apr 2011 14:33:43 +0530
Subject: [PATCH 093/188] [FIX] base : Now It's Possible to save languages that
 have code having size>5

bzr revid: ach@tinyerp.com-20110419090343-7h35qwblnfeotsg2
---
 openerp/addons/base/res/partner/partner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/partner/partner.py b/openerp/addons/base/res/partner/partner.py
index a2de7f9d154..f02260a520f 100644
--- a/openerp/addons/base/res/partner/partner.py
+++ b/openerp/addons/base/res/partner/partner.py
@@ -116,7 +116,7 @@ class res_partner(osv.osv):
         'parent_id': fields.many2one('res.partner','Parent Partner'),
         'child_ids': fields.one2many('res.partner', 'parent_id', 'Partner Ref.'),
         'ref': fields.char('Reference', size=64, select=1),
-        'lang': fields.selection(_lang_get, 'Language', size=5, help="If the selected language is loaded in the system, all documents related to this partner will be printed in this language. If not, it will be english."),
+        'lang': fields.selection(_lang_get, 'Language', help="If the selected language is loaded in the system, all documents related to this partner will be printed in this language. If not, it will be english."),
         'user_id': fields.many2one('res.users', 'Salesman', help='The internal user that is in charge of communicating with this partner if any.'),
         'vat': fields.char('VAT',size=32 ,help="Value Added Tax number. Check the box if the partner is subjected to the VAT. Used by the VAT legal statement."),
         'bank_ids': fields.one2many('res.partner.bank', 'partner_id', 'Banks'),

From ab16169e1b02860dd68448d803a308fbf79ab967 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Tue, 19 Apr 2011 14:54:43 +0530
Subject: [PATCH 094/188] [FIX] point_of_sale : pass the partner refernce in
 delivery order

bzr revid: amp@tinyerp.com-20110419092443-hq2fn23jjc9a4h1c
---
 addons/point_of_sale/point_of_sale.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index a2123cb287c..09bb4210561 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -427,11 +427,13 @@ class pos_order(osv.osv):
         pick_name = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.out')
         orders = self.browse(cr, uid, ids, context=context)
         for order in orders:
+            addr = self.pool.get('res.partner').address_get(cr, uid, [order.partner_id.id], ['delivery'])
             if not order.picking_id:
                 new = True
                 picking_id = picking_obj.create(cr, uid, {
                     'name': pick_name,
                     'origin': order.name,
+                    'address_id': addr.get('delivery',False),
                     'type': 'out',
                     'state': 'draft',
                     'move_type': 'direct',

From f376b23ae644d72fdb36194b1ed7e2667f7d9697 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Tue, 19 Apr 2011 15:37:22 +0530
Subject: [PATCH 095/188] [FIX] mail: solved context in schedule_with_attach()

bzr revid: rha@tinyerp.com-20110419100722-cijh152wl0urg75t
---
 addons/mail/email_message.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/mail/email_message.py b/addons/mail/email_message.py
index a32c29ff759..39d5d8f9a8f 100644
--- a/addons/mail/email_message.py
+++ b/addons/mail/email_message.py
@@ -206,6 +206,8 @@ class email_message(osv.osv):
 
     def schedule_with_attach(self, cr, uid, email_from, email_to, subject, body, model=False, email_cc=None, email_bcc=None, reply_to=False, attach=None,
             message_id=False, references=False, openobject_id=False, debug=False, subtype='plain', x_headers={}, priority='3', smtp_server_id=False, context=None, auto_delete=False):
+        if context is None:
+            context = {}
         attachment_obj = self.pool.get('ir.attachment')
         if email_to and type(email_to) != list:
             email_to = [email_to]

From 7b35e1bbf24c3abe9f7f22e0c4831ac48332a10c Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Tue, 19 Apr 2011 15:42:25 +0530
Subject: [PATCH 096/188] [FIX] crm_caldav : Usability Improvement

bzr revid: amp@tinyerp.com-20110419101225-arhrw2yoagsx5nu4
---
 addons/crm_caldav/crm_caldav_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm_caldav/crm_caldav_view.xml b/addons/crm_caldav/crm_caldav_view.xml
index cc1b6d00396..1fc6c341cb5 100644
--- a/addons/crm_caldav/crm_caldav_view.xml
+++ b/addons/crm_caldav/crm_caldav_view.xml
@@ -13,7 +13,7 @@
         </record>
     
         <menuitem
-            name="Synchronyze this calendar"
+            name="Synchronize this Calendar"
             action="action_caldav_browse"
             id="menu_caldav_browse"
             icon="STOCK_EXECUTE"

From 53c757663c75586bb70c1f28e9e7e9cf9f066040 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Tue, 19 Apr 2011 15:46:05 +0530
Subject: [PATCH 097/188] [FIX] crm : Typos fixed in wizards

bzr revid: ach@tinyerp.com-20110419101605-zveh2v8hm3uygdgt
---
 addons/crm/wizard/crm_lead_to_opportunity.py      | 2 +-
 addons/crm/wizard/crm_phonecall_to_opportunity.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 33ec426d7d6..4b6e047f475 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -105,7 +105,7 @@ class crm_lead2opportunity_partner(osv.osv_memory):
 
         for lead in lead_obj.browse(cr, uid, context.get('active_ids', []), context=context):
             if lead.state in ['done', 'cancel']:
-                raise osv.except_osv(_("Warning !"), _("Closed/Cancelled Leads Could not convert into Opportunity"))
+                raise osv.except_osv(_("Warning !"), _("Closed/Cancelled Leads can not be converted into Opportunity"))
         return False
 
     def _convert(self, cr, uid, ids, lead, partner_id, stage_ids, context=None):
diff --git a/addons/crm/wizard/crm_phonecall_to_opportunity.py b/addons/crm/wizard/crm_phonecall_to_opportunity.py
index 98e3c978eb0..32810d2f15e 100644
--- a/addons/crm/wizard/crm_phonecall_to_opportunity.py
+++ b/addons/crm/wizard/crm_phonecall_to_opportunity.py
@@ -55,7 +55,7 @@ class crm_phonecall2opportunity(osv.osv_memory):
         case = phonecall_obj.browse(cr, uid, record_id, context=context)
         if case.state in ['done', 'cancel']:
                 raise osv.except_osv(_("Warning"), _("Closed/Cancelled Phone \
-Call Could not convert into Opportunity"))
+Call can not be converted into Opportunity"))
 
 
     def action_apply(self, cr, uid, ids, context=None):

From 9f84f223db2f0ae30d766f9a2d6165fb2b992df2 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Tue, 19 Apr 2011 15:57:03 +0530
Subject: [PATCH 098/188] [FIX] hr_contract : Notes Separator added which
 describes the use of the ntoes field in the Advantages Section

bzr revid: ach@tinyerp.com-20110419102703-zjsp7i24hbjjwi35
---
 addons/hr_contract/hr_contract_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 67607af8146..524ef5f57f4 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -183,6 +183,7 @@
                         <separator colspan="2" string="Advantages"/>
                         <field name="advantages_net"/>
                         <field name="advantages_gross"/>
+                        <separator colspan="2" string="Advantages Notes"/>
                         <field name="advantages" nolabel="1" colspan="2"/>
                         </group>
                         <separator colspan="4" string="Notes"/>

From 483c4374311f64fea0395221a0b0d0d13ed95351 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Tue, 19 Apr 2011 16:15:57 +0530
Subject: [PATCH 099/188] [FIX] account : Usability Improvement

bzr revid: amp@tinyerp.com-20110419104557-n0g8ojzztcyefn17
---
 addons/account/account.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index c11d7394100..75041705547 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2146,8 +2146,8 @@ class account_model_line(osv.osv):
     _description = "Account Model Entries"
     _columns = {
         'name': fields.char('Name', size=64, required=True),
-        'sequence': fields.integer('Sequence', required=True, help="The sequence field is used to order the resources from lower sequences to higher ones"),
-        'quantity': fields.float('Quantity', digits_compute=dp.get_precision('Account'), help="The optional quantity on entries"),
+        'sequence': fields.integer('Sequence', required=True, help="The sequence field is used to order the resources from lower sequences to higher ones."),
+        'quantity': fields.float('Quantity', digits_compute=dp.get_precision('Account'), help="The optional quantity on entries."),
         'debit': fields.float('Debit', digits_compute=dp.get_precision('Account')),
         'credit': fields.float('Credit', digits_compute=dp.get_precision('Account')),
         'account_id': fields.many2one('account.account', 'Account', required=True, ondelete="cascade"),
@@ -2156,7 +2156,7 @@ class account_model_line(osv.osv):
         'amount_currency': fields.float('Amount Currency', help="The amount expressed in an optional other currency."),
         'currency_id': fields.many2one('res.currency', 'Currency'),
         'partner_id': fields.many2one('res.partner', 'Partner'),
-        'date_maturity': fields.selection([('today','Date of the day'), ('partner','Partner Payment Term')], 'Maturity date', help="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."),
+        'date_maturity': fields.selection([('today','Date of the day'), ('partner','Partner Payment Term')], 'Maturity Date', help="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."),
     }
     _order = 'sequence'
     _sql_constraints = [

From 2704f564dd3e69d9574107a0eaf8ef3a9463a4d3 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Tue, 19 Apr 2011 16:20:57 +0530
Subject: [PATCH 100/188] [FIX] hr_recruitment : Partner should be disabled
 untill the person is Hired

bzr revid: ach@tinyerp.com-20110419105057-tfvbtorx0aqgi6rl
---
 addons/hr_recruitment/hr_recruitment_view.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index ee7c9d6100c..1f2cf865c9a 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -97,15 +97,15 @@
                     <page string="Job Info">
                         <group col="3" colspan="2">
                             <separator colspan="3" string="Contact"/>
-                            <field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" />
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" attrs="{'readonly':[('state','not in','done')]}"/>
                             <button string="Create Partner"
                                     name="%(action_hr_recruitment_partner_create)d"
-                                    icon="gtk-index" type="action" attrs="{'readonly':[('partner_id','!=',False)]}" groups="base.group_partner_manager"/>
+                                    icon="gtk-index" type="action" attrs="{'readonly':['!',('partner_id','!=',False),('state','not in','done')]}" groups="base.group_partner_manager"/>
                             <newline/>
-                            <field name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="3"/>
-                            <field name="email_from" colspan="3"/>
-                            <field name="partner_phone" colspan="3"/>
-                            <field name="partner_mobile" colspan="3"/>
+                            <field name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="3" attrs="{'readonly':[('state','not in','done')]}"/>
+                            <field name="email_from" colspan="3" attrs="{'readonly':[('state','not in','done')]}"/>
+                            <field name="partner_phone" colspan="3" attrs="{'readonly':[('state','not in','done')]}"/>
+                            <field name="partner_mobile" colspan="3" attrs="{'readonly':[('state','not in','done')]}"/>
                         </group>
                         <group col="2" colspan="2">
                             <separator colspan="2" string="Contract Data"/>

From d7b4c39ff813018d86dc2dd04eedc2542ac24aed Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Tue, 19 Apr 2011 16:27:33 +0530
Subject: [PATCH 101/188] [FIX] hr_recruitment : Button names should be refuse
 and hire

bzr revid: ach@tinyerp.com-20110419105733-hz13pahb9ykq4m2d
---
 addons/hr_recruitment/hr_recruitment_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index ee7c9d6100c..d43cd7bf581 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -130,10 +130,10 @@
                         <separator colspan="4" string="Status"/>
                         <group col="8" colspan="4">
                             <field name="state"/>
-                            <button name="case_cancel" string="Refused" states="draft,open,pending" type="object" icon="gtk-cancel"/>
+                            <button name="case_cancel" string="Refuse" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                             <button name="case_open" string="In Progress" states="draft,pending" type="object" icon="gtk-go-forward"/>
                             <button name="case_pending" string="Pending" states="open" type="object" icon="gtk-media-pause"/>
-                            <button name="%(action_hr_recruitment_hired_employee)d" string="Hired" states="open,pending" type="action" icon="terp-partner"/>
+                            <button name="%(action_hr_recruitment_hired_employee)d" string="Hire" states="open,pending" type="action" icon="terp-partner"/>
                             <button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/>
                         </group>
                    </page>

From 47fbcd34a8af1217fe688eb2469f97f93209a729 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Tue, 19 Apr 2011 16:55:23 +0530
Subject: [PATCH 102/188] [FIX] crm : Confusing Typo in Schedule Phone call
 wizard changed.

bzr revid: ach@tinyerp.com-20110419112523-0nvutph0kqqx9fiy
---
 addons/crm/wizard/crm_opportunity_to_phonecall_view.xml | 2 +-
 addons/crm/wizard/crm_phonecall_to_phonecall_view.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
index 23ddaad5bfe..9a623d2eaab 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -16,7 +16,7 @@
                     <newline/>
                     <field name="user_id" />
                     <field name="section_id" widget="selection" />
-                    <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
+                    <field name="categ_id" string="Type" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
                     <separator string="" colspan="4"/>
                     <group colspan="4">
                         <label string ="" colspan="2"/>
diff --git a/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
index 34a0d2c158e..82c3191a17b 100644
--- a/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
@@ -15,7 +15,7 @@
                         <field name="date" string="Planned Date"/>
                         <field name="user_id" />
                         <field name="section_id"/>
-                        <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
+                        <field name="categ_id" string="Type" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
                         <separator string=" " colspan="4"/>
                         <group colspan="4" col="3" >
                             <label string=" " />

From bf48bbbdcf58b5a91b0b1f9d63158c3ceeec68f8 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Tue, 19 Apr 2011 17:09:24 +0530
Subject: [PATCH 103/188] [FIX] crm : Tool Tip on Recurrent Improved in Meeting

bzr revid: ach@tinyerp.com-20110419113924-zq48lf4uin6lbc3v
---
 addons/crm/crm_meeting_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index aba69889f57..ef942426be3 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -44,7 +44,7 @@
                     <field name="alarm_id" string="Reminder"
                         widget="selection" />
                     <group colspan="2" col="4" attrs="{'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">
-                           <field name="recurrency"/>
+                           <field name="recurrency" help="Is Meeting is occurring frequently or repeatedly?"/>
                            <field name="edit_all" attrs="{'invisible':[('recurrency','=', False)]}"
                                 on_change="onchange_edit_all(rrule_type,edit_all)"/>
                     </group>

From 44bcca9f2f68f460438f1210002f52297c2bb001 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Tue, 19 Apr 2011 17:28:50 +0530
Subject: [PATCH 104/188] [IMP] email.compose.message: useability improvements

bzr revid: rha@tinyerp.com-20110419115850-8vsbd9yv3vhedgss
---
 addons/crm/wizard/email_compose_message.py       | 11 +++++++++--
 .../crm_helpdesk/wizard/email_compose_message.py | 11 +++++++++--
 addons/event/wizard/email_compose_message.py     | 11 +++++++++--
 .../wizard/email_compose_message.py              |  8 ++++++++
 .../wizard/email_compose_message.py              | 11 +++++++++--
 addons/mail/wizard/email_compose_message.py      | 16 ++++++++++++++--
 addons/project/wizard/email_compose_message.py   |  7 +++++++
 .../wizard/email_compose_message.py              | 11 +++++++++--
 .../wizard/email_compose_message.py              | 11 +++++++++--
 .../wizard/email_compose_message.py              |  7 +++++++
 10 files changed, 90 insertions(+), 14 deletions(-)

diff --git a/addons/crm/wizard/email_compose_message.py b/addons/crm/wizard/email_compose_message.py
index 576a1181d4e..dacddb45752 100644
--- a/addons/crm/wizard/email_compose_message.py
+++ b/addons/crm/wizard/email_compose_message.py
@@ -31,6 +31,13 @@ class email_compose_message(osv.osv_memory):
     _inherit = 'email.compose.message'
 
     def get_value(self, cr, uid, model, resource_id, context=None):
+        '''
+        To get values of the resource_id for the model
+        @param model: Object
+        @param resource_id: id of a record for which values to be read
+
+        @return: Returns a dictionary
+        '''
         if context is None:
             context = {}
         result = super(email_compose_message, self).get_value(cr, uid,  model, resource_id, context=context)
@@ -43,8 +50,8 @@ class email_compose_message(osv.osv_memory):
                     'email_from' : data.user_id and data.user_id.address_id and data.user_id.address_id.email or tools.config.get('email_from', False),
                     'body' : '\n' + (tools.ustr(data.user_id.signature or '')),
                     'email_cc' : tools.ustr(data.email_cc or ''),
-                    'model': model  or False,
-                    'res_id': resource_id  or False,
+                    'model': model,
+                    'res_id': resource_id,
                 })
             if hasattr(data, 'section_id'):
                 result.update({'reply_to' : data.section_id and data.section_id.reply_to or False})
diff --git a/addons/crm_helpdesk/wizard/email_compose_message.py b/addons/crm_helpdesk/wizard/email_compose_message.py
index 0b04ca0b31c..95961912a6d 100644
--- a/addons/crm_helpdesk/wizard/email_compose_message.py
+++ b/addons/crm_helpdesk/wizard/email_compose_message.py
@@ -27,6 +27,13 @@ class email_compose_message(osv.osv_memory):
     _inherit = 'email.compose.message'
 
     def get_value(self, cr, uid, model, resource_id, context=None):
+        '''
+        To get values of the resource_id for the model
+        @param model: Object
+        @param resource_id: id of a record for which values to be read
+
+        @return: Returns a dictionary
+        '''
         if context is None:
             context = {}
         result = super(email_compose_message, self).get_value(cr, uid,  model, resource_id, context=context)
@@ -39,8 +46,8 @@ class email_compose_message(osv.osv_memory):
                     'email_from' : data.user_id and data.user_id.address_id and data.user_id.address_id.email or False,
                     'body' : '\n' + (tools.ustr(data.user_id.signature or '')),
                     'email_cc' : tools.ustr(data.email_cc or ''),
-                    'model': model  or False,
-                    'res_id': resource_id  or False,
+                    'model': model,
+                    'res_id': resource_id,
                 })
         return result
 
diff --git a/addons/event/wizard/email_compose_message.py b/addons/event/wizard/email_compose_message.py
index 8d949255a3f..94cd650c3f5 100644
--- a/addons/event/wizard/email_compose_message.py
+++ b/addons/event/wizard/email_compose_message.py
@@ -27,6 +27,13 @@ class email_compose_message(osv.osv_memory):
     _inherit = 'email.compose.message'
 
     def get_value(self, cr, uid, model, resource_id, context=None):
+        '''
+        To get values of the resource_id for the model
+        @param model: Object
+        @param resource_id: id of a record for which values to be read
+
+        @return: Returns a dictionary
+        '''
         if context is None:
             context = {}
         result = super(email_compose_message, self).get_value(cr, uid,  model, resource_id, context=context)
@@ -39,8 +46,8 @@ class email_compose_message(osv.osv_memory):
                     'email_from' : data.user_id and data.user_id.address_id and data.user_id.address_id.email or False,
                     'body' : '\n' + (tools.ustr(data.user_id.signature or '')),
                     'email_cc' : tools.ustr(data.email_cc or ''),
-                    'model': model  or False,
-                    'res_id': resource_id  or False,
+                    'model': model,
+                    'res_id': resource_id,
                 })
         return result
 
diff --git a/addons/hr_evaluation/wizard/email_compose_message.py b/addons/hr_evaluation/wizard/email_compose_message.py
index b5c5b9b49dc..c8e055928f6 100644
--- a/addons/hr_evaluation/wizard/email_compose_message.py
+++ b/addons/hr_evaluation/wizard/email_compose_message.py
@@ -28,6 +28,13 @@ class email_compose_message(osv.osv_memory):
     _inherit = 'email.compose.message'
 
     def get_value(self, cr, uid, model, resource_id, context=None):
+        '''
+        To get values of the resource_id for the model
+        @param model: Object
+        @param resource_id: id of a record for which values to be read
+
+        @return: Returns a dictionary
+        '''
         if context is None:
             context = {}
         result = super(email_compose_message, self).get_value(cr, uid,  model, resource_id, context=context)
@@ -42,6 +49,7 @@ class email_compose_message(osv.osv_memory):
                         'subject': _("Reminder to fill up Survey"),
                         'body': msg,
                         'res_id': resource_id,
+                        'model': model,
                         'email_cc': False,
                         'email_bcc': False,
                         'reply_to': False,
diff --git a/addons/hr_recruitment/wizard/email_compose_message.py b/addons/hr_recruitment/wizard/email_compose_message.py
index 9320badb28b..f5cc4883ef3 100644
--- a/addons/hr_recruitment/wizard/email_compose_message.py
+++ b/addons/hr_recruitment/wizard/email_compose_message.py
@@ -28,6 +28,13 @@ class email_compose_message(osv.osv_memory):
     _inherit = 'email.compose.message'
 
     def get_value(self, cr, uid, model, resource_id, context=None):
+        '''
+        To get values of the resource_id for the model
+        @param model: Object
+        @param resource_id: id of a record for which values to be read
+
+        @return: Returns a dictionary
+        '''
         if context is None:
             context = {}
         result = super(email_compose_message, self).get_value(cr, uid,  model, resource_id, context=context)
@@ -40,8 +47,8 @@ class email_compose_message(osv.osv_memory):
                     'email_from' : data.user_id and data.user_id.address_id and data.user_id.address_id.email or False,
                     'body' : '\n' + (tools.ustr(data.user_id.signature or '')),
                     'email_cc' : tools.ustr(data.email_cc or ''),
-                    'model': model  or False,
-                    'res_id': resource_id  or False,
+                    'model': model,
+                    'res_id': resource_id,
                 })
         return result
 
diff --git a/addons/mail/wizard/email_compose_message.py b/addons/mail/wizard/email_compose_message.py
index 3d83848f0ab..a5c77104c37 100644
--- a/addons/mail/wizard/email_compose_message.py
+++ b/addons/mail/wizard/email_compose_message.py
@@ -29,6 +29,13 @@ class email_compose_message(osv.osv_memory):
     _description = 'This is the wizard for Compose E-mail'
 
     def default_get(self, cr, uid, fields, context=None):
+        """
+        Returns default values for fields
+        @param fields: list of fields, for which default values are required to be read
+        @param context: context arguments, like lang, time zone
+
+        @return: Returns a dictionary that contains default values for fields
+        """
         if context is None:
             context = {}
         result = super(email_compose_message, self).default_get(cr, uid, fields, context=context)
@@ -108,6 +115,10 @@ class email_compose_message(osv.osv_memory):
         return {}
 
     def get_message_data(self, cr, uid, message_id, context=None):
+        '''
+        Called by default_get() to get message detail
+        @param message_id: Id of the email message
+        '''
         if context is None:
             context = {}
         result = {}
@@ -116,7 +127,6 @@ class email_compose_message(osv.osv_memory):
             message_data = message_pool.browse(cr, uid, message_id, context)
             subject = tools.ustr(message_data and message_data.subject or '')
             description =  message_data and message_data.body  or ''
-            message_body = False
             if context.get('mail','') == 'reply':
                 header = '-------- Original Message --------'
                 sender = 'From: %s'  % tools.ustr(message_data.email_from or '')
@@ -150,6 +160,9 @@ class email_compose_message(osv.osv_memory):
         return result
 
     def send_mail(self, cr, uid, ids, context=None):
+        '''
+        Sends the email
+        '''
         if context is None:
             context = {}
 
@@ -210,7 +223,6 @@ class email_compose_message(osv.osv_memory):
     def get_template_value(self, cr, uid, message, model, resource_id, context=None):
         return message
 
-
 email_compose_message()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/wizard/email_compose_message.py b/addons/project/wizard/email_compose_message.py
index eb52604749e..921cbf1b081 100644
--- a/addons/project/wizard/email_compose_message.py
+++ b/addons/project/wizard/email_compose_message.py
@@ -27,6 +27,13 @@ class email_compose_message(osv.osv_memory):
     _inherit = 'email.compose.message'
 
     def get_value(self, cr, uid, model, resource_id, context=None):
+        '''
+        To get values of the resource_id for the model
+        @param model: Object
+        @param resource_id: id of a record for which values to be read
+
+        @return: Returns a dictionary
+        '''
         if context is None:
             context = {}
         result = super(email_compose_message, self).get_value(cr, uid,  model, resource_id, context=context)
diff --git a/addons/project_issue/wizard/email_compose_message.py b/addons/project_issue/wizard/email_compose_message.py
index 655f04ad72a..df1133245d2 100644
--- a/addons/project_issue/wizard/email_compose_message.py
+++ b/addons/project_issue/wizard/email_compose_message.py
@@ -27,6 +27,13 @@ class email_compose_message(osv.osv_memory):
     _inherit = 'email.compose.message'
 
     def get_value(self, cr, uid, model, resource_id, context=None):
+        '''
+        To get values of the resource_id for the model
+        @param model: Object
+        @param resource_id: id of a record for which values to be read
+
+        @return: Returns a dictionary
+        '''
         if context is None:
             context = {}
         result = super(email_compose_message, self).get_value(cr, uid,  model, resource_id, context=context)
@@ -39,8 +46,8 @@ class email_compose_message(osv.osv_memory):
                     'email_from' : data.user_id and data.user_id.address_id and data.user_id.address_id.email or False,
                     'body' : '\n' + (tools.ustr(data.user_id.signature or '')),
                     'email_cc' : tools.ustr(data.email_cc or ''),
-                    'model': model  or False,
-                    'res_id': resource_id  or False,
+                    'model': model,
+                    'res_id': resource_id,
                 })
         return result
 
diff --git a/addons/project_planning/wizard/email_compose_message.py b/addons/project_planning/wizard/email_compose_message.py
index ed7ffdd0eb9..6fd89bea634 100644
--- a/addons/project_planning/wizard/email_compose_message.py
+++ b/addons/project_planning/wizard/email_compose_message.py
@@ -27,6 +27,13 @@ class email_compose_message(osv.osv_memory):
     _inherit = 'email.compose.message'
 
     def get_value(self, cr, uid, model, resource_id, context=None):
+        '''
+        To get values of the resource_id for the model
+        @param model: Object
+        @param resource_id: id of a record for which values to be read
+
+        @return: Returns a dictionary
+        '''
         if context is None:
             context = {}
         result = super(email_compose_message, self).get_value(cr, uid,  model, resource_id, context=context)
@@ -38,8 +45,8 @@ class email_compose_message(osv.osv_memory):
                     'email_to' : data.user_id.user_email or False,
                     'email_from' : data.user_id and data.user_id.address_id and data.user_id.address_id.email or False,
                     'body' : '\n' + (tools.ustr(data.user_id.signature or '')),
-                    'model': model  or False,
-                    'res_id': resource_id  or False,
+                    'model': model,
+                    'res_id': resource_id,
                 })
         return result
 
diff --git a/addons/project_scrum/wizard/email_compose_message.py b/addons/project_scrum/wizard/email_compose_message.py
index 12e7edb4e27..0eee41ae894 100644
--- a/addons/project_scrum/wizard/email_compose_message.py
+++ b/addons/project_scrum/wizard/email_compose_message.py
@@ -27,6 +27,13 @@ class email_compose_message(osv.osv_memory):
     _inherit = 'email.compose.message'
 
     def get_value(self, cr, uid, model, resource_id, context=None):
+        '''
+        To get values of the resource_id for the model
+        @param model: Object
+        @param resource_id: id of a record for which values to be read
+
+        @return: Returns a dictionary
+        '''
         if context is None:
             context = {}
         result = super(email_compose_message, self).get_value(cr, uid,  model, resource_id, context=context)

From 1060ac58c368dc3ef3aa8c88b72c79846b45c38e Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Tue, 19 Apr 2011 17:29:36 +0530
Subject: [PATCH 105/188] [FIX] base_calendar : Typo Fixed on notification for
 missing email on invitation wizard

bzr revid: ach@tinyerp.com-20110419115936-2x0o1rrvu9sov1b0
---
 addons/base_calendar/wizard/base_calendar_invite_attendee.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee.py b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
index ea4d5aca85f..59bde615645 100644
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee.py
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
@@ -140,7 +140,7 @@ send an Email to Invited Person')
                 if not mail_to:
                     name =  map(lambda x: x[1], filter(lambda x: type==x[0], \
                                        self._columns['type'].selection))
-                    raise osv.except_osv(_('Error!'), ("%s must have an email  Address to send mail") %(name[0]))
+                    raise osv.except_osv(_('Error!'), ("%s must have an email  address to send mail") %(name[0]))
                 att_obj._send_mail(cr, uid, attendees, mail_to, \
                        email_from = current_user.user_email or tools.config.get('email_from', False))
 

From 0d9276a6c907122129a64d3ee728a6042951e15e Mon Sep 17 00:00:00 2001
From: Jigar Amin <jam@tinyerp.com>
Date: Tue, 19 Apr 2011 17:41:32 +0530
Subject: [PATCH 106/188] [FIX] crm : lp:747776 added condition for the ids

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

bzr revid: jam@tinyerp.com-20110419121132-ttcra01mxigd2tp1
---
 addons/crm/crm.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index f25e4c1a0bf..d7b67879a7a 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -666,7 +666,8 @@ class crm_case_section(osv.osv):
         """
         if context is None:
             context = {}
-
+        if not isinstance(ids, list) : 
+            ids = [ids]
         res = []
         if not ids:
             return res

From 8cd3b960193f5709cbaf73f1575ed7d7bd454f00 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Tue, 19 Apr 2011 18:41:54 +0530
Subject: [PATCH 107/188] [FIX] Usability : Usability Improvement

bzr revid: amp@tinyerp.com-20110419131154-1ucsrn7wtpq83apg
---
 .../base/publisher_warranty/publisher_warranty_view.xml     | 5 +++--
 openerp/addons/base/res/bank_view.xml                       | 2 +-
 openerp/addons/base/res/partner/partner.py                  | 4 ++--
 openerp/addons/base/res/res_currency.py                     | 6 +++---
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml b/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
index 7ee95eecde9..8c40d0a1c6b 100644
--- a/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
+++ b/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
@@ -37,9 +37,10 @@
                             <field name="check_opw"/>
                         </group>
                         <group col="2" colspan="3">
-                            <button name="check_validity" string="Validate" type="object"
+                            <button name="check_validity" icon="camera_test.png
+" string="Validate" type="object"
                             attrs="{'invisible':[('state','in',['valid', 'terminated', 'canceled'])]}"/>
-                            <button name="check_validity" string="Refresh Validation Dates" type="object"
+                            <button name="check_validity" icon="camera_test.png" string="Refresh Validation Dates" type="object"
                             attrs="{'invisible':[('state','in',['unvalidated'])]}"/>
                         </group>
                     </group>
diff --git a/openerp/addons/base/res/bank_view.xml b/openerp/addons/base/res/bank_view.xml
index 2929055b21e..10c78e847a2 100644
--- a/openerp/addons/base/res/bank_view.xml
+++ b/openerp/addons/base/res/bank_view.xml
@@ -25,7 +25,7 @@
                     <group colspan="2" col="2">
                         <field name="phone"/>
                         <field name="fax"/>
-                        <field name="email"/>
+                        <field name="email" widget="email"/>
                     </group>
                 </form>
             </field>
diff --git a/openerp/addons/base/res/partner/partner.py b/openerp/addons/base/res/partner/partner.py
index a2de7f9d154..f773a101827 100644
--- a/openerp/addons/base/res/partner/partner.py
+++ b/openerp/addons/base/res/partner/partner.py
@@ -112,7 +112,7 @@ class res_partner(osv.osv):
     _columns = {
         'name': fields.char('Name', size=128, required=True, select=True),
         'date': fields.date('Date', select=1),
-        'title': fields.many2one('res.partner.title','Partner Form'),
+        'title': fields.many2one('res.partner.title','Partner Firm'),
         'parent_id': fields.many2one('res.partner','Parent Partner'),
         'child_ids': fields.one2many('res.partner', 'parent_id', 'Partner Ref.'),
         'ref': fields.char('Reference', size=64, select=1),
@@ -120,7 +120,7 @@ class res_partner(osv.osv):
         'user_id': fields.many2one('res.users', 'Salesman', help='The internal user that is in charge of communicating with this partner if any.'),
         'vat': fields.char('VAT',size=32 ,help="Value Added Tax number. Check the box if the partner is subjected to the VAT. Used by the VAT legal statement."),
         'bank_ids': fields.one2many('res.partner.bank', 'partner_id', 'Banks'),
-        'website': fields.char('Website',size=64, help="Website of Partner"),
+        'website': fields.char('Website',size=64, help="Website of Partner."),
         'comment': fields.text('Notes'),
         'address': fields.one2many('res.partner.address', 'partner_id', 'Contacts'),
         'category_id': fields.many2many('res.partner.category', 'res_partner_category_rel', 'partner_id', 'category_id', 'Categories'),
diff --git a/openerp/addons/base/res/res_currency.py b/openerp/addons/base/res/res_currency.py
index 2565d471cd3..caa97ec0339 100644
--- a/openerp/addons/base/res/res_currency.py
+++ b/openerp/addons/base/res/res_currency.py
@@ -49,12 +49,12 @@ class res_currency(osv.osv):
     _columns = {
         # Note: 'code' column was removed as of v6.0, the 'name' should now hold the ISO code.
         'name': fields.char('Currency', size=32, required=True, help="Currency Code (ISO 4217)"),
-        'symbol': fields.char('Symbol', size=3, help="Currency sign, to be used when printing amounts"),
+        'symbol': fields.char('Symbol', size=3, help="Currency sign, to be used when printing amounts."),
         'rate': fields.function(_current_rate, method=True, string='Current Rate', digits=(12,6),
-            help='The rate of the currency to the currency of rate 1'),
+            help='The rate of the currency to the currency of rate 1.'),
         'rate_ids': fields.one2many('res.currency.rate', 'currency_id', 'Rates'),
         'accuracy': fields.integer('Computational Accuracy'),
-        'rounding': fields.float('Rounding factor', digits=(12,6)),
+        'rounding': fields.float('Rounding Factor', digits=(12,6)),
         'active': fields.boolean('Active'),
         'company_id':fields.many2one('res.company', 'Company'),
         'date': fields.date('Date'),

From 537acc4dc44947a90a0bda5c3787afe753baf4cd Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 20 Apr 2011 04:36:50 +0000
Subject: [PATCH 108/188] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110420043650-t0kj7brgbg2vz79t
---
 addons/account/i18n/pt_BR.po      |   12 +-
 addons/account_payment/i18n/nb.po |  714 ++++++++++
 addons/marketing/i18n/id.po       |  119 ++
 addons/sale/i18n/gl.po            | 2074 +++++++++++++++++++++++++++++
 4 files changed, 2913 insertions(+), 6 deletions(-)
 create mode 100644 addons/account_payment/i18n/nb.po
 create mode 100644 addons/marketing/i18n/id.po
 create mode 100644 addons/sale/i18n/gl.po

diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po
index dcdb807b7d9..53eccc4f28f 100644
--- a/addons/account/i18n/pt_BR.po
+++ b/addons/account/i18n/pt_BR.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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-03-08 21:39+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2011-04-19 14:37+0000\n"
+"Last-Translator: Nédio Batista Marques <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: 2011-03-18 04:56+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-20 04:36+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -4150,7 +4150,7 @@ msgstr "Extratos Bancários são lançados no sistema."
 #: code:addons/account/wizard/account_reconcile.py:133
 #, python-format
 msgid "Reconcile Writeoff"
-msgstr ""
+msgstr "Reconcílie a amortização"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
@@ -4956,7 +4956,7 @@ msgstr "Permite cancelar lançamentos"
 #. module: account
 #: field:account.tax.code,sign:0
 msgid "Coefficent for parent"
-msgstr ""
+msgstr "Coeficiente para conta principal"
 
 #. module: account
 #: report:account.partner.balance:0
diff --git a/addons/account_payment/i18n/nb.po b/addons/account_payment/i18n/nb.po
new file mode 100644
index 00000000000..2e2e11a56a8
--- /dev/null
+++ b/addons/account_payment/i18n/nb.po
@@ -0,0 +1,714 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-04-19 10:53+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2011-04-20 04:36+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: account_payment
+#: field:payment.order,date_scheduled:0
+msgid "Scheduled date if fixed"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,currency:0
+msgid "Partner Currency"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Set to draft"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.order,mode:0
+msgid "Select the Payment Mode to be applied."
+msgstr ""
+
+#. module: account_payment
+#: view:payment.mode:0
+#: view:payment.order:0
+msgid "Group By..."
+msgstr "Grupper etter..."
+
+#. module: account_payment
+#: model:ir.module.module,description:account_payment.module_meta_information
+msgid ""
+"\n"
+"This module provides :\n"
+"* a more efficient way to manage invoice payment.\n"
+"* a basic mechanism to easily plug various automated payment.\n"
+"    "
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,line_ids:0
+msgid "Payment lines"
+msgstr "Betalingslinjer"
+
+#. module: account_payment
+#: view:payment.line:0
+#: field:payment.line,info_owner:0
+#: view:payment.order:0
+msgid "Owner Account"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.order,state:0
+msgid ""
+"When an order is placed the state is 'Draft'.\n"
+" Once the bank is confirmed the state is set to 'Confirmed'.\n"
+" Then the order is paid the state is 'Done'."
+msgstr ""
+
+#. module: account_payment
+#: help:account.invoice,amount_to_pay:0
+msgid ""
+"The amount which should be paid at the current date\n"
+"minus the amount which is already in payment order"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.mode,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,date_prefered:0
+msgid "Preferred date"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.line,state:0
+msgid "Free"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order.create,entries:0
+msgid "Entries"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Used Account"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,ml_maturity_date:0
+#: field:payment.order.create,duedate:0
+msgid "Due Date"
+msgstr ""
+
+#. module: account_payment
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
+#. module: account_payment
+#: view:account.move.line:0
+msgid "Account Entry Line"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order.create:0
+msgid "_Add to payment order"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_account_payment_populate_statement
+#: model:ir.actions.act_window,name:account_payment.action_account_populate_statement_confirm
+msgid "Payment Populate statement"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+#: view:payment.order:0
+msgid "Amount"
+msgstr "Beløp"
+
+#. module: account_payment
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Total in Company Currency"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.order,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_order_tree_new
+msgid "New Payment Order"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+#: field:payment.order,reference:0
+msgid "Reference"
+msgstr "Referanse"
+
+#. module: account_payment
+#: sql_constraint:payment.line:0
+msgid "The payment line name must be unique!"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_order_tree
+#: model:ir.ui.menu,name:account_payment.menu_action_payment_order_form
+msgid "Payment Orders"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.order,date_prefered:0
+msgid "Directly"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_line_form
+#: model:ir.model,name:account_payment.model_payment_line
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Payment Line"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+msgid "Amount Total"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+#: selection:payment.order,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,ml_date_created:0
+msgid "Invoice Effective Date"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Execution Type"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.line,state:0
+msgid "Structured"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+#: field:payment.order,state:0
+msgid "State"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Transaction Information"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_mode_form
+#: model:ir.model,name:account_payment.model_payment_mode
+#: model:ir.ui.menu,name:account_payment.menu_action_payment_mode_form
+#: view:payment.mode:0
+#: view:payment.order:0
+msgid "Payment Mode"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,ml_date_created:0
+msgid "Effective Date"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,ml_inv_ref:0
+msgid "Invoice Ref."
+msgstr ""
+
+#. module: account_payment
+#: help:payment.order,date_prefered:0
+msgid ""
+"Choose an option for the Payment Order:'Fixed' stands for a date specified "
+"by you.'Directly' stands for the direct execution.'Due date' stands for the "
+"scheduled date of execution."
+msgstr ""
+
+#. module: account_payment
+#: code:addons/account_payment/account_move_line.py:110
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: account_payment
+#: view:account.move.line:0
+msgid "Total debit"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,date_done:0
+msgid "Execution date"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.mode,journal:0
+msgid "Bank or Cash Journal for the Payment Mode"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.order,date_prefered:0
+msgid "Fixed date"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,info_partner:0
+#: view:payment.order:0
+msgid "Destination Account"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+msgid "Desitination Account"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Search Payment Orders"
+msgstr ""
+
+#. module: account_payment
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,create_date:0
+msgid "Created"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Select Invoices to Pay"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+msgid "Currency Amount Total"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Make Payments"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,state:0
+msgid "Communication Type"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.module.module,shortdesc:account_payment.module_meta_information
+msgid "Payment Management"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,bank_statement_line_id:0
+msgid "Bank statement line"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.order,date_prefered:0
+msgid "Due date"
+msgstr ""
+
+#. module: account_payment
+#: field:account.invoice,amount_to_pay:0
+msgid "Amount to be paid"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Currency"
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+msgid "Yes"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,info_owner:0
+msgid "Address of the Main Partner"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,date:0
+msgid ""
+"If no payment date is specified, the bank will treat this payment line "
+"directly"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_payment_populate_statement
+msgid "Account Payment Populate Statement"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.mode,name:0
+msgid "Mode of Payment"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Value Date"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Payment Type"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,amount_currency:0
+msgid "Payment amount in the partner currency"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+#: selection:payment.order,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,communication2:0
+msgid "The successor message of Communication."
+msgstr ""
+
+#. module: account_payment
+#: code:addons/account_payment/account_move_line.py:110
+#, python-format
+msgid "No partner defined on entry line"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,info_partner:0
+msgid "Address of the Ordering Customer."
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.populate.statement:0
+msgid "Populate Statement:"
+msgstr ""
+
+#. module: account_payment
+#: view:account.move.line:0
+msgid "Total credit"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.order,date_scheduled:0
+msgid "Select a date if you have chosen Preferred Date to be fixed."
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account_payment
+#: field:account.payment.populate.statement,lines:0
+#: model:ir.actions.act_window,name:account_payment.act_account_invoice_2_payment_line
+msgid "Payment Lines"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_payment
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,move_line_id:0
+msgid ""
+"This Entry Line will be referred for the information of the ordering "
+"customer."
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order.create:0
+msgid "Search"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.report.xml,name:account_payment.payment_order1
+#: model:ir.model,name:account_payment.model_payment_order
+msgid "Payment Order"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,date:0
+msgid "Payment Date"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Total:"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,date_created:0
+msgid "Creation date"
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.populate.statement:0
+msgid "ADD"
+msgstr ""
+
+#. module: account_payment
+#: view:account.bank.statement:0
+msgid "Import payment lines"
+msgstr ""
+
+#. module: account_payment
+#: field:account.move.line,amount_to_pay:0
+msgid "Amount to pay"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,amount:0
+msgid "Amount in Company Currency"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,partner_id:0
+msgid "The Ordering Customer"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_payment_make_payment
+msgid "Account make payment"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Invoice Ref"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,name:0
+msgid "Your Reference"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,mode:0
+msgid "Payment mode"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Payment order"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "General Information"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+#: selection:payment.order,state:0
+msgid "Done"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,communication:0
+msgid "Communication"
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+#: view:account.payment.populate.statement:0
+#: view:payment.order:0
+#: view:payment.order.create:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Information"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
+msgid ""
+"A payment order is a payment request from your company to pay a supplier "
+"invoice or a customer credit note. Here you can register all payment orders "
+"that should be done, keep track of all payment orders and mention the "
+"invoice reference and the partner the payment should be done for."
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,amount:0
+msgid "Payment amount in the company currency"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order.create:0
+msgid "Search Payment lines"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,amount_currency:0
+msgid "Amount in Partner Currency"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,communication2:0
+msgid "Communication 2"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,bank_id:0
+msgid "Destination Bank account"
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+msgid "Are you sure you want to make payment?"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.mode:0
+#: field:payment.mode,journal:0
+msgid "Journal"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.mode,bank_id:0
+msgid "Bank account"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Confirm Payments"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,company_currency:0
+#: report:payment.order:0
+msgid "Company Currency"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.ui.menu,name:account_payment.menu_main_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Payment"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Payment Order / Payment"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,move_line_id:0
+msgid "Entry line"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,communication:0
+msgid ""
+"Used as the message between ordering customer and current company. Depicts "
+"'What do you want to say to the recipient about this order ?'"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.mode,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Entry Information"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_payment_order_create
+msgid "payment.order.create"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,order_id:0
+msgid "Order"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,total:0
+msgid "Total"
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+#: model:ir.actions.act_window,name:account_payment.action_account_payment_make_payment
+msgid "Make Payment"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,partner_id:0
+#: report:payment.order:0
+msgid "Partner"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_create_payment_order
+msgid "Populate Payment"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.mode,bank_id:0
+msgid "Bank Account for the Payment Mode"
+msgstr ""
+
+#. module: account_payment
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
diff --git a/addons/marketing/i18n/id.po b/addons/marketing/i18n/id.po
new file mode 100644
index 00000000000..c7c8a962b63
--- /dev/null
+++ b/addons/marketing/i18n/id.po
@@ -0,0 +1,119 @@
+# Indonesian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-19 15:57+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian <id@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: 2011-04-20 04:36+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: marketing
+#: model:ir.module.module,description:marketing.module_meta_information
+msgid "Menu for Marketing"
+msgstr "Menu Untuk Marketing"
+
+#. module: marketing
+#: help:marketing.installer,marketing_campaign:0
+msgid ""
+"Helps you to manage marketing campaigns and automate actions and "
+"communication steps."
+msgstr ""
+"Membantu Anda untuk mengelola kampanye pemasaran dan langkah mengotomatisasi "
+"dan langkah komunikasi."
+
+#. module: marketing
+#: field:marketing.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Kemajuan Konfigurasi"
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid "title"
+msgstr "Judul:"
+
+#. module: marketing
+#: field:marketing.installer,email_template:0
+msgid "Automated E-Mails"
+msgstr "Email otomatis"
+
+#. module: marketing
+#: field:marketing.installer,config_logo:0
+msgid "Image"
+msgstr "Gambar"
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid "Configure Your Marketing Application"
+msgstr "Konfigurasikan Aplikasi Pemasaran Anda"
+
+#. module: marketing
+#: help:marketing.installer,email_template:0
+msgid ""
+"Helps you to design templates of emails and integrate them in your different "
+"processes."
+msgstr ""
+"Membantu Anda untuk merancang template email dan mengintegrasikan mereka "
+"dalam proses yang berbeda."
+
+#. module: marketing
+#: model:ir.model,name:marketing.model_marketing_installer
+msgid "marketing.installer"
+msgstr ""
+
+#. module: marketing
+#: model:ir.module.module,shortdesc:marketing.module_meta_information
+msgid "Marketing"
+msgstr "Pemasaran"
+
+#. module: marketing
+#: field:marketing.installer,crm_profiling:0
+msgid "Profiling Tools"
+msgstr ""
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid ""
+"OpenERP provides Addons to better manage your sales and marketing processes. "
+"Select the ones you would be interested in."
+msgstr ""
+"OpenERP menyediakan Addons untuk lebih baik mengelola proses penjualan dan "
+"pemasaran. Pilih salah satu yang menurut anda menarik."
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid "Marketing Application Configuration"
+msgstr "Konfigurasi Aplikasi Pemasaran"
+
+#. module: marketing
+#: model:ir.actions.act_window,name:marketing.action_marketing_installer
+msgid "Marketing Modules Installation"
+msgstr "Instalasi Modul Marketing"
+
+#. module: marketing
+#: model:ir.module.module,shortdesc:marketing.module_meta_information
+msgid "Marketing Campaigns"
+msgstr "Kampanye Pemasaran"
+
+#. module: marketing
+#: help:marketing.installer,crm_profiling:0
+msgid ""
+"Helps you to perform segmentation of partners and design segmentation "
+"questionnaires"
+msgstr ""
+"Membantu Anda untuk melakukan segmentasi mitra dan desain kuesioner "
+"segmentasi"
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid "Configure"
+msgstr "Pengaturan"
diff --git a/addons/sale/i18n/gl.po b/addons/sale/i18n/gl.po
new file mode 100644
index 00000000000..1e2e54272c6
--- /dev/null
+++ b/addons/sale/i18n/gl.po
@@ -0,0 +1,2074 @@
+# Galician translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-04-19 14:52+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician <gl@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: 2011-04-20 04:36+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
+msgid "Sales by Salesman in last 90 days"
+msgstr ""
+
+#. module: sale
+#: help:sale.installer,delivery:0
+msgid "Allows you to compute delivery costs on your quotations."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+msgid "Quantity"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+#: view:sale.order:0
+msgid "Cancel Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid "Configure Sales Order Logistics"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:603
+#, python-format
+msgid "The quotation '%s' has been converted to a sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Payment Before Delivery"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "VAT"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.config.picking_policy,picking_policy:0
+msgid "All at Once"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"Here is a list of each sales order line to be invoiced. You can invoice "
+"sales orders partially, by lines of sales order. You do not need this list "
+"if you invoice from the delivery orders or if you invoice sales totally."
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Line"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"Sales Orders help you manage quotations and orders from your customers. "
+"OpenERP suggests that you start by creating a quotation. Once it is "
+"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+"handle several types of products so that a sales order may trigger tasks, "
+"delivery orders, manufacturing orders, purchases and so on. Based on the "
+"configuration of the sales order, a draft invoice will be generated so that "
+"you just have to confirm it when you want to bill your customer."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you want your invoice based on ordered or shipped quantities. If "
+"the product is a service, shipped quantities means hours spent on the "
+"associated tasks."
+msgstr ""
+"O pedido de venda creará automáticamente a proposta de factura (factura "
+"borrador). As cantidades pedidas e entregadas poden non ser as mesmas. Debe "
+"elixir se desexa que a sua factura se basee nas cantidades pedidas ou "
+"entregadas. Se o producto e un servizo, as cantidades enviadas son as horas "
+"dedicadas as tarefas asociadas."
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+msgid "Configure Picking Policy for Sales Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "State"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Cantidades Pedidas"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Salesman"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Dates"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr ""
+
+#. module: sale
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales_manager
+#: model:ir.ui.menu,name:sale.menu_board_sales_manager
+msgid "Sales Manager Dashboard"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1014
+#, python-format
+msgid "No Customer Defined !"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Conditions"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
+"  - The 'Pay Before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+"  - The 'Shipping & Manual Invoice' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice.\n"
+"  - The 'Invoice On Order After Delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+"  - The 'Invoice From The Picking' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:939
+#, python-format
+msgid ""
+"There is no income category account defined in default Properties for "
+"Product Category or Fiscal Position is not defined !"
+msgstr ""
+
+#. module: sale
+#: view:sale.installer:0
+msgid "Configure"
+msgstr ""
+
+#. module: sale
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:620
+#, python-format
+msgid "invalid mode for test_state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:584
+#, python-format
+msgid "Could not cancel this sales order !"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.config.picking_policy,step:0
+msgid "Delivery Order Only"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "UoM"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:971
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1042
+#, python-format
+msgid "(n/a)"
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'. You may "
+"have to create it and set it as a default value on this field."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                              "
+"that is defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,note:0
+#: view:sale.order.line:0
+#: field:sale.order.line,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.installer:0
+msgid "Enhance your core Sales Application with additional functionalities."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr ""
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_open_invoice
+msgid "Sales Open Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid "Setup your sales workflow and default values."
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Untaxed amount"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity (UoM)"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:290
+#: code:addons/sale/sale.py:966
+#: code:addons/sale/sale.py:1165
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,shipped:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+msgid "All Quotations"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice On Order After Delivery"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,state:0
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s) ?"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales By Month"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:970
+#, python-format
+msgid "Could not cancel sales order line!"
+msgstr ""
+
+#. module: sale
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Create Final Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: sale
+#: model:ir.module.module,description:sale.module_meta_information
+msgid ""
+"\n"
+"    The base module to manage quotations and sales orders.\n"
+"\n"
+"    * Workflow with validation steps:\n"
+"        - Quotation -> Sales order -> Invoice\n"
+"    * Invoicing methods:\n"
+"        - Invoice on order (before or after shipping)\n"
+"        - Invoice on delivery\n"
+"        - Invoice on timesheets\n"
+"        - Advance invoice\n"
+"    * Partners preferences (shipping, invoicing, incoterm, ...)\n"
+"    * Products stocks and prices\n"
+"    * Delivery methods:\n"
+"        - all at once, multi-parcel\n"
+"        - delivery costs\n"
+"    * Dashboard for salesman that includes:\n"
+"    * Your open quotations\n"
+"    * Top 10 sales of the month\n"
+"    * Cases statistics\n"
+"    * Graph of sales by product\n"
+"    * Graph of cases of the month\n"
+"    "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "History"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,picking_policy:0
+msgid "Picking Default Policy"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_order_id:0
+msgid ""
+"The name and address of the contact who requested the order or quotation."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:966
+#, python-format
+msgid "You cannot cancel a sales order line that has already been invoiced !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "References"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: model:process.transition.action,name:sale.process_transition_action_cancel1
+#: model:process.transition.action,name:sale.process_transition_action_cancel2
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr ""
+
+#. module: sale
+#: field:sale.installer,sale_order_dates:0
+msgid "Sales Order Dates"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.installer,sale_margin:0
+msgid "Margins in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Excluded"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Compute"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Partner"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_order_id:0
+msgid "Ordering Contact"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
+#: view:sale.open.invoice:0
+msgid "Open Invoice"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_installer
+#: view:sale.config.picking_policy:0
+#: view:sale.installer:0
+msgid "Sales Application Configuration"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr "Basado en nas cantidades enviadas ou pedidas."
+
+#. module: sale
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,name:0
+msgid "Name"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_partner
+msgid "Sales per Customer in last 90 days"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.installer,delivery:0
+msgid "Delivery Costs"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_packing0
+msgid "Create Pick List"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Partial Delivery"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
+#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
+msgid "Deliveries to Invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+#: view:sale.installer:0
+msgid "title"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_packinglist0
+msgid "Pick List"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order date"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_validate0
+msgid "Validate"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Order"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,order_policy:0
+msgid "Shipping Policy"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr ""
+
+#. module: sale
+#: selection:sale.config.picking_policy,order_policy:0
+msgid "Invoice Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:387
+#: code:addons/sale/sale.py:920
+#: code:addons/sale/sale.py:938
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:570
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Shipping & Manual Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1051
+#, python-format
+msgid "Picking Information !"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Sales Management"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice From The Picking"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,uom_name:0
+msgid "Reference UoM"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.picking_policy,step:0
+msgid ""
+"By default, OpenERP is able to manage complex routing and paths of products "
+"in your warehouse and partner locations. This will configure the most common "
+"and simple methods to deliver products to the customer in one or two "
+"operations by the worker."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.picking_policy,order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_installer
+msgid "sale.installer"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: model:process.node,name:sale.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1014
+#, python-format
+msgid ""
+"You have to select a customer in the sales form !\n"
+"Please set one customer before choosing a product."
+msgstr ""
+
+#. module: sale
+#: selection:sale.config.picking_policy,step:0
+msgid "Picking List & Delivery Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,picking_policy:0
+msgid "Picking Policy"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:571
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.menu_invoiced
+msgid "Invoicing"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_picking_policy
+msgid "sale.config.picking_policy"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the date 'Ordered Date'."
+msgstr ""
+"Indica o estado do presuposto o pedido de venda.\n"
+"O estado de excepción establecese automáticamente cando se produce unha "
+"operación de cancelación na validación da factura (excepción de factura) ou "
+"no procesado do albará (excepción de envío).\n"
+"O estado 'Esperando planificación' establece cando se confirma a factura, "
+"pero está esperando que o planificador a active na data de \"Data pedido\"."
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Data Pedido"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Logistic"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:921
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"En función do control de facturación dos pedidos de venda, a factura pode "
+"estar baseada nas cantidades enviadas ou vendidas. Polo tanto, un pedido de "
+"venda pode xerar unha factura ou un albará tan pronto como sea confirmada "
+"polo comercial."
+
+#. module: sale
+#: code:addons/sale/sale.py:1116
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "States"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid "res_config_contents"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:388
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1165
+#, python-format
+msgid "Cannot delete a sales order line which is %s !"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+#: view:sale.order:0
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of picking that has been generated for this sales order."
+msgstr ""
+
+#. module: sale
+#: help:sale.installer,sale_margin:0
+msgid ""
+"Gives the margin of profitability by calculating the difference between Unit "
+"Price and Cost Price."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: model:ir.ui.menu,name:sale.menu_action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "   Month   "
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
+msgid "Sales by Month"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1045
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr ""
+
+#. module: sale
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
+msgid "Sales by Product's Category in last 90 days"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr ""
+
+#. module: sale
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Complete Delivery"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: sale
+#: help:sale.config.picking_policy,picking_policy:0
+msgid ""
+"The Shipping Policy is used to configure per order if you want to deliver as "
+"soon as possible when one product is available or you wait that all products "
+"are available.."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+#: view:sale.order:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,config_logo:0
+#: field:sale.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesman"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#, python-format
+msgid "Advance Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "The sales order '%s' has been cancelled."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' state is set when the related sales order in draft state.      "
+"               \n"
+"* The 'Confirmed' state is set when the related sales order is confirmed.    "
+"                 \n"
+"* The 'Exception' state is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' state is set when the sales order line has been picked.         "
+"            \n"
+"* The 'Cancelled' state is set when a user cancel the sales order related."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Packings"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,progress:0
+#: field:sale.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+msgid "Product sales"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Ordered Date"
+msgstr "Fecha Pedido"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr ""
+
+#. module: sale
+#: selection:sale.config.picking_policy,picking_policy:0
+msgid "Direct Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.installer,sale_journal:0
+msgid "Invoicing journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped Qty"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:585
+#, python-format
+msgid "You must first cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: sale
+#: view:sale.installer:0
+msgid "Configure Your Sales Management Application"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree4
+msgid "Sales Order in Progress"
+msgstr ""
+
+#. module: sale
+#: field:sale.installer,sale_layout:0
+msgid "Sales Order Layout Improvement"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_assign0
+msgid "Assign"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:290
+#, python-format
+msgid "Cannot delete Sales Order(s) which are already confirmed !"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:316
+#, python-format
+msgid "The sales order '%s' has been set in draft state."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Shipping Default Policy"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "Close"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1115
+#, python-format
+msgid "Not enough stock !"
+msgstr ""
+
+#. module: sale
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Layout Sequence"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"If you have more than one shop reselling your company products, you can "
+"create and manage that from here. Whenever you will record a new quotation "
+"or sales order, it has to be linked to a shop. The shop also defines the "
+"warehouse from which the products will be delivered for each particular "
+"sales."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: sale
+#: help:sale.installer,sale_order_dates:0
+msgid "Adds commitment, requested and effective dates on Sales Orders."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr ""
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: sale
+#: help:sale.installer,sale_journal:0
+msgid ""
+"Allows you to group and invoice your delivery orders according to different "
+"invoicing types: daily, weekly, etc."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: sale
+#: view:sale.shop:0
+msgid "Accounting"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,step:0
+msgid "Steps To Deliver a Sales Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: sale
+#: help:sale.installer,sale_layout:0
+msgid ""
+"Provides some features to improve the layout of the Sales Order reports."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation N°"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,picked_rate:0
+#: view:sale.report:0
+msgid "Picked"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: sale
+#: selection:sale.config.picking_policy,order_policy:0
+msgid "Invoice Based on Deliveries"
+msgstr ""

From 6e516475ee4896a053d3227d93c2603ac23afe08 Mon Sep 17 00:00:00 2001
From: "Naresh (OpenERP)" <nch@tinyerp.com>
Date: Wed, 20 Apr 2011 11:19:47 +0530
Subject: [PATCH 109/188] [FIX]:editing shortcuts from client were not
 dispalying the changes

bzr revid: nch@tinyerp.com-20110420054947-t02qg7sm8g5vzcuf
---
 openerp/addons/base/ir/ir_ui_view.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py
index b342235133e..1600fa62d90 100644
--- a/openerp/addons/base/ir/ir_ui_view.py
+++ b/openerp/addons/base/ir/ir_ui_view.py
@@ -196,13 +196,10 @@ class view_sc(osv.osv):
 
     def get_sc(self, cr, uid, user_id, model='ir.ui.menu', context=None):
         ids = self.search(cr, uid, [('user_id','=',user_id),('resource','=',model)], context=context)
-        results = self.read(cr, uid, ids, ['res_id'], context=context)
-        name_map = dict(self.pool.get(model).name_get(cr, uid, [x['res_id'] for x in results], context=context))
+        results = self.read(cr, uid, ids, ['res_id','name'], context=context)
+        available_menus = self.pool.get(model).search(cr, uid, [], context=context)
         # Make sure to return only shortcuts pointing to exisintg menu items.
-        filtered_results = filter(lambda result: result['res_id'] in name_map, results)
-        for result in filtered_results:
-            result.update(name=name_map[result['res_id']])
-        return filtered_results
+        return filter(lambda result: result['res_id'] in available_menus, results)
 
     _order = 'sequence,name'
     _defaults = {

From 7ed0659f6e25f387f041f4d6f91cfb76459462cf Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Wed, 20 Apr 2011 11:36:05 +0530
Subject: [PATCH 110/188] [IMP] mail: improvement for message_new() and related
 modules

bzr revid: rha@tinyerp.com-20110420060605-7q1z5917g1b7wapw
---
 addons/crm/crm_lead.py                      | 17 +++++++-
 addons/crm_claim/crm_claim.py               | 17 +++++++-
 addons/crm_helpdesk/crm_helpdesk.py         | 17 +++++++-
 addons/hr_recruitment/hr_recruitment.py     | 17 +++++++-
 addons/mail/email_thread.py                 | 43 ++++++++++-----------
 addons/project_issue/project_issue.py       | 20 ++++++++--
 addons/project_mailgate/project_mailgate.py | 17 +++++++-
 7 files changed, 117 insertions(+), 31 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index e796cf7e654..c9104421866 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -348,7 +348,22 @@ class crm_lead(crm_case, osv.osv):
         if res:
             vals.update(res)
 
-        return self.create(cr, uid, vals, context)
+        res_id = self.create(cr, uid, vals, context)
+
+        attachments = msg.get('attachments', [])
+        self.history(cr, uid, [res_id], _('receive'), history=True,
+                            subject = msg.get('subject'),
+                            email = msg.get('to'),
+                            details = msg.get('body'),
+                            email_from = msg.get('from'),
+                            email_cc = msg.get('cc'),
+                            message_id = msg.get('message-id'),
+                            references = msg.get('references', False) or msg.get('in-reply-to', False),
+                            attach = attachments,
+                            email_date = msg.get('date'),
+                            context = context)
+
+        return res_id
 
     def message_update(self, cr, uid, ids, msg, vals={}, default_act='pending', context=None):
         """
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index f5cceb59498..9a2ff90acc0 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -202,7 +202,22 @@ class crm_claim(crm.crm_case, osv.osv):
         if res:
             vals.update(res)
 
-        return self.create(cr, uid, vals, context)
+        res_id = self.create(cr, uid, vals, context)
+
+        attachments = msg.get('attachments', [])
+        self.history(cr, uid, [res_id], _('receive'), history=True,
+                            subject = msg.get('subject'),
+                            email = msg.get('to'),
+                            details = msg.get('body'),
+                            email_from = msg.get('from'),
+                            email_cc = msg.get('cc'),
+                            message_id = msg.get('message-id'),
+                            references = msg.get('references', False) or msg.get('in-reply-to', False),
+                            attach = attachments,
+                            email_date = msg.get('date'),
+                            context = context)
+
+        return res_id
 
     def message_update(self, cr, uid, ids, msg, vals={}, default_act='pending', context=None):
         """
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index ff503a8fb3e..03d16306df7 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -126,7 +126,22 @@ class crm_helpdesk(crm.crm_case, osv.osv):
         if res:
             vals.update(res)
 
-        return self.create(cr, uid, vals, context)
+        res_id = self.create(cr, uid, vals, context)
+
+        attachments = msg.get('attachments', [])
+        self.history(cr, uid, [res_id], _('receive'), history=True,
+                            subject = msg.get('subject'),
+                            email = msg.get('to'),
+                            details = msg.get('body'),
+                            email_from = msg.get('from'),
+                            email_cc = msg.get('cc'),
+                            message_id = msg.get('message-id'),
+                            references = msg.get('references', False) or msg.get('in-reply-to', False),
+                            attach = attachments,
+                            email_date = msg.get('date'),
+                            context = context)
+
+        return res_id
 
     def message_update(self, cr, uid, ids, msg, vals={}, default_act='pending', context=None):
         """
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 24b226f922e..f129934e8c0 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -327,7 +327,22 @@ class hr_applicant(crm.crm_case, osv.osv):
         res = thread_pool.get_partner(cr, uid, msg.get('from'))
         if res:
             vals.update(res)
-        return self.create(cr, uid, vals, context=context)
+        res_id = self.create(cr, uid, vals, context)
+
+        attachments = msg.get('attachments', [])
+        self.history(cr, uid, [res_id], _('receive'), history=True,
+                            subject = msg.get('subject'),
+                            email = msg.get('to'),
+                            details = msg.get('body'),
+                            email_from = msg.get('from'),
+                            email_cc = msg.get('cc'),
+                            message_id = msg.get('message-id'),
+                            references = msg.get('references', False) or msg.get('in-reply-to', False),
+                            attach = attachments,
+                            email_date = msg.get('date'),
+                            context = context)
+
+        return res_id
 
     def message_update(self, cr, uid, ids, msg, vals={}, default_act='pending', context=None):
         """
diff --git a/addons/mail/email_thread.py b/addons/mail/email_thread.py
index 78d5b18886f..f1ef3858fed 100644
--- a/addons/mail/email_thread.py
+++ b/addons/mail/email_thread.py
@@ -75,14 +75,11 @@ class email_thread(osv.osv):
         if not model:
             model = self._name
         model_pool = self.pool.get(model)
-        if hasattr(model_pool, 'message_new'):
-            res_id = model_pool.message_new(cr, uid, msg, context)
-        else:
-            fields = model_pool.fields_get(cr, uid, context=context)
-            data = model_pool.default_get(cr, uid, fields, context=context)
-            if 'name' in fields and not data.get('name',False):
-                data['name'] = msg.get('from','')
-            res_id = model_pool.create(cr, uid, data, context=context)
+        fields = model_pool.fields_get(cr, uid, context=context)
+        data = model_pool.default_get(cr, uid, fields, context=context)
+        if 'name' in fields and not data.get('name',False):
+            data['name'] = msg.get('from','')
+        res_id = model_pool.create(cr, uid, data, context=context)
 
         attachments = msg.get('attachments', {})
         self.history(cr, uid, [res_id], _('receive'), history=True,
@@ -109,8 +106,6 @@ class email_thread(osv.osv):
         if not model:
             model = self._name
         model_pool = self.pool.get(model)
-        if hasattr(model_pool, 'message_update'):
-            model_pool.message_update(cr, uid, ids, msg, vals=vals, default_act=default_act, context=context)
         attachments = msg.get('attachments', {})
         self.history(cr, uid, ids, _('receive'), history=True,
                             subject = msg.get('subject'),
@@ -183,16 +178,17 @@ class email_thread(osv.osv):
 
         for thread in threads:
             attachments = []
-            for attachment in attach:
-                data_attach = {
-                    'name': attachment[0],
-                    'datas': binascii.b2a_base64(str(attachment[1])),
-                    'datas_fname': attachment[0],
-                    'description': _('Mail attachment'),
-                    'res_model': thread._name,
-                    'res_id': thread.id,
-                }
-                attachments.append(att_obj.create(cr, uid, data_attach))
+            if attach:
+                for fname, fcontent in attach.items():
+                    data_attach = {
+                        'name': fname,
+                        'datas': binascii.b2a_base64(str(fcontent)),
+                        'datas_fname': fname,
+                        'description': _('Mail attachment'),
+                        'res_model': thread._name,
+                        'res_id': thread.id,
+                    }
+                    attachments.append(att_obj.create(cr, uid, data_attach))
 
             partner_id = hasattr(thread, 'partner_id') and (thread.partner_id and thread.partner_id.id or False) or False
             if not partner_id and thread._name == 'res.partner':
@@ -305,7 +301,6 @@ class email_thread(osv.osv):
         email_message_pool = self.pool.get('email.message')
         res_id = False
 
-
         # Parse Message
         # Warning: message_from_string doesn't always work correctly on unicode,
         # we must use utf-8 strings here :-(
@@ -316,7 +311,8 @@ class email_thread(osv.osv):
 
         # Create New Record into particular model
         def create_record(msg):
-            new_res_id = self.message_new(cr, uid, msg, context=context)
+            if hasattr(model_pool, 'message_new'):
+                new_res_id = model_pool.message_new(cr, uid, msg, context=context)
             if custom_values:
                 model_pool.write(cr, uid, [res_id], custom_values, context=context)
             return new_res_id
@@ -340,7 +336,8 @@ class email_thread(osv.osv):
                 if res_id:
                     res_id = int(res_id)
                     if model_pool.exists(cr, uid, res_id):
-                        self.message_update(cr, uid, [res_id], msg, {}, context=context)
+                        if hasattr(model_pool, 'message_new'):
+                            model_pool.message_update(cr, uid, [res_id], msg, {}, context=context)
 
         if not res_id:
             res_id = create_record(msg)
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 11e76f142a1..7d58bd77d36 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -395,9 +395,23 @@ class project_issue(crm.crm_case, osv.osv):
         if res:
             vals.update(res)
         context.update({'state_to' : 'draft'})
-        res = self.create(cr, uid, vals, context=context)
-        self.convert_to_bug(cr, uid, [res], context=context)
-        return res
+
+        res_id = self.create(cr, uid, vals, context)
+
+        attachments = msg.get('attachments', [])
+        self.history(cr, uid, [res_id], _('receive'), history=True,
+                            subject = msg.get('subject'),
+                            email = msg.get('to'),
+                            details = msg.get('body'),
+                            email_from = msg.get('from'),
+                            email_cc = msg.get('cc'),
+                            message_id = msg.get('message-id'),
+                            references = msg.get('references', False) or msg.get('in-reply-to', False),
+                            attach = attachments,
+                            email_date = msg.get('date'),
+                            context = context)
+        self.convert_to_bug(cr, uid, [res_id], context=context)
+        return res_id
 
     def message_update(self, cr, uid, ids, msg, vals=None, default_act='pending', context=None):
         """
diff --git a/addons/project_mailgate/project_mailgate.py b/addons/project_mailgate/project_mailgate.py
index 29c813b5d8a..212fe161094 100644
--- a/addons/project_mailgate/project_mailgate.py
+++ b/addons/project_mailgate/project_mailgate.py
@@ -52,7 +52,22 @@ class project_tasks(osv.osv):
         res = thread_obj.get_partner(cr, uid, msg_from)
         if res:
             data.update(res)
-        return self.create(cr, uid, data)
+        res_id = self.create(cr, uid, vals, context)
+
+        attachments = msg.get('attachments', [])
+        self.history(cr, uid, [res_id], _('receive'), history=True,
+                            subject = msg.get('subject'),
+                            email = msg.get('to'),
+                            details = msg.get('body'),
+                            email_from = msg.get('from'),
+                            email_cc = msg.get('cc'),
+                            message_id = msg.get('message-id'),
+                            references = msg.get('references', False) or msg.get('in-reply-to', False),
+                            attach = attachments,
+                            email_date = msg.get('date'),
+                            context = context)
+
+        return res_id
 
     def message_update(self, cr, uid, id, msg, data={}, default_act='pending'):
         thread_obj = self.pool.get('email.thread')

From c71cc3e686e8549899ce7079ff55ff0f7f8f1bc4 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Wed, 20 Apr 2011 11:37:17 +0530
Subject: [PATCH 111/188] [FIX] account_voucher: correct red fields..error when
 default account not set on journal

bzr revid: ara@tinyerp.com-20110420060717-2wm93bmrbm35333i
---
 addons/account_voucher/account_voucher.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 9bfee8b8d49..b4422cd8051 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -379,6 +379,8 @@ class account_voucher(osv.osv):
             account_id = partner.property_account_payable.id
             tr_type = 'purchase'
         else:
+            if not journal.default_credit_account_id or not journal.default_debit_account_id:
+                raise osv.except_osv(_('Error !'), _('Please define default credit/debit account on the %s !') % (journal.name))
             account_id = journal.default_credit_account_id.id or journal.default_debit_account_id.id
             tr_type = 'receipt'
 

From 71049f8bb6043bd7d9db40af76f87c690cd73404 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 20 Apr 2011 11:43:48 +0530
Subject: [PATCH 112/188] [IMP]: procurement: Improved tooltip for min-max qty
 of minimun stock rule

bzr revid: rpa@tinyerp.com-20110420061348-uy8xmycbeehfa7l3
---
 addons/procurement/procurement.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index fccc6445d3d..1f808f2bef6 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -512,11 +512,11 @@ class stock_warehouse_orderpoint(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', required=True, ondelete='cascade', domain=[('type','=','product')]),
         'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
         'product_min_qty': fields.float('Min Quantity', required=True,
-            help="When the virtual stock goes below the Min Quantity, OpenERP generates "\
+            help="When the virtual stock goes below the Min Quantity specified for this field, OpenERP generates "\
             "a procurement to bring the virtual stock to the Max Quantity."),
         'product_max_qty': fields.float('Max Quantity', required=True,
-            help="When the virtual stock goes below the Max Quantity, OpenERP generates "\
-            "a procurement to bring the virtual stock to the Max Quantity."),
+            help="When the virtual stock goes below the Min Quantity, OpenERP generates "\
+            "a procurement to bring the virtual stock to the Quantity specified as Max Quantity."),
         'qty_multiple': fields.integer('Qty Multiple', required=True,
             help="The procurement quantity will be rounded up to this multiple."),
         'procurement_id': fields.many2one('procurement.order', 'Latest procurement', ondelete="set null"),

From 280e446ceffeae725249a2687db203e9f97d8abe Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Wed, 20 Apr 2011 11:56:46 +0530
Subject: [PATCH 113/188] [FIX]: attachment type as dictionary

bzr revid: rha@tinyerp.com-20110420062646-ngijwvt2395cihuw
---
 addons/crm/crm_lead.py                      |  2 +-
 addons/crm_claim/crm_claim.py               |  2 +-
 addons/crm_helpdesk/crm_helpdesk.py         |  2 +-
 addons/hr_recruitment/hr_recruitment.py     |  2 +-
 addons/mail/email_thread.py                 | 27 ++++++++++-----------
 addons/project_issue/project_issue.py       |  2 +-
 addons/project_mailgate/project_mailgate.py |  2 +-
 7 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index c9104421866..86930613212 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -350,7 +350,7 @@ class crm_lead(crm_case, osv.osv):
 
         res_id = self.create(cr, uid, vals, context)
 
-        attachments = msg.get('attachments', [])
+        attachments = msg.get('attachments', {})
         self.history(cr, uid, [res_id], _('receive'), history=True,
                             subject = msg.get('subject'),
                             email = msg.get('to'),
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index 9a2ff90acc0..5ad78c53465 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -204,7 +204,7 @@ class crm_claim(crm.crm_case, osv.osv):
 
         res_id = self.create(cr, uid, vals, context)
 
-        attachments = msg.get('attachments', [])
+        attachments = msg.get('attachments', {})
         self.history(cr, uid, [res_id], _('receive'), history=True,
                             subject = msg.get('subject'),
                             email = msg.get('to'),
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index 03d16306df7..c983acf78b3 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -128,7 +128,7 @@ class crm_helpdesk(crm.crm_case, osv.osv):
 
         res_id = self.create(cr, uid, vals, context)
 
-        attachments = msg.get('attachments', [])
+        attachments = msg.get('attachments', {})
         self.history(cr, uid, [res_id], _('receive'), history=True,
                             subject = msg.get('subject'),
                             email = msg.get('to'),
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index f129934e8c0..3931d053666 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -329,7 +329,7 @@ class hr_applicant(crm.crm_case, osv.osv):
             vals.update(res)
         res_id = self.create(cr, uid, vals, context)
 
-        attachments = msg.get('attachments', [])
+        attachments = msg.get('attachments', {})
         self.history(cr, uid, [res_id], _('receive'), history=True,
                             subject = msg.get('subject'),
                             email = msg.get('to'),
diff --git a/addons/mail/email_thread.py b/addons/mail/email_thread.py
index f1ef3858fed..87cd459608b 100644
--- a/addons/mail/email_thread.py
+++ b/addons/mail/email_thread.py
@@ -156,7 +156,7 @@ class email_thread(osv.osv):
         if context is None:
             context = {}
         if attach is None:
-            attach = []
+            attach = {}
 
         model = context.get('thread_model', False)
         if not model:
@@ -178,17 +178,16 @@ class email_thread(osv.osv):
 
         for thread in threads:
             attachments = []
-            if attach:
-                for fname, fcontent in attach.items():
-                    data_attach = {
-                        'name': fname,
-                        'datas': binascii.b2a_base64(str(fcontent)),
-                        'datas_fname': fname,
-                        'description': _('Mail attachment'),
-                        'res_model': thread._name,
-                        'res_id': thread.id,
-                    }
-                    attachments.append(att_obj.create(cr, uid, data_attach))
+            for fname, fcontent in attach.items():
+                data_attach = {
+                    'name': fname,
+                    'datas': binascii.b2a_base64(str(fcontent)),
+                    'datas_fname': fname,
+                    'description': _('Mail attachment'),
+                    'res_model': thread._name,
+                    'res_id': thread.id,
+                }
+                attachments.append(att_obj.create(cr, uid, data_attach))
 
             partner_id = hasattr(thread, 'partner_id') and (thread.partner_id and thread.partner_id.id or False) or False
             if not partner_id and thread._name == 'res.partner':
@@ -313,8 +312,8 @@ class email_thread(osv.osv):
         def create_record(msg):
             if hasattr(model_pool, 'message_new'):
                 new_res_id = model_pool.message_new(cr, uid, msg, context=context)
-            if custom_values:
-                model_pool.write(cr, uid, [res_id], custom_values, context=context)
+                if custom_values:
+                    model_pool.write(cr, uid, [new_res_id], custom_values, context=context)
             return new_res_id
 
         res_id = False
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 7d58bd77d36..c8b55067fc5 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -398,7 +398,7 @@ class project_issue(crm.crm_case, osv.osv):
 
         res_id = self.create(cr, uid, vals, context)
 
-        attachments = msg.get('attachments', [])
+        attachments = msg.get('attachments', {})
         self.history(cr, uid, [res_id], _('receive'), history=True,
                             subject = msg.get('subject'),
                             email = msg.get('to'),
diff --git a/addons/project_mailgate/project_mailgate.py b/addons/project_mailgate/project_mailgate.py
index 212fe161094..7610f35d648 100644
--- a/addons/project_mailgate/project_mailgate.py
+++ b/addons/project_mailgate/project_mailgate.py
@@ -54,7 +54,7 @@ class project_tasks(osv.osv):
             data.update(res)
         res_id = self.create(cr, uid, vals, context)
 
-        attachments = msg.get('attachments', [])
+        attachments = msg.get('attachments', {})
         self.history(cr, uid, [res_id], _('receive'), history=True,
                             subject = msg.get('subject'),
                             email = msg.get('to'),

From 6730b692db58eebe78dead6cb847582d674d04bb Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Wed, 20 Apr 2011 12:21:19 +0530
Subject: [PATCH 114/188] [FIX] Usability : Usability Improvement

bzr revid: amp@tinyerp.com-20110420065119-qoeakgace48dnugv
---
 addons/crm_caldav/crm_caldav_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm_caldav/crm_caldav_view.xml b/addons/crm_caldav/crm_caldav_view.xml
index 1fc6c341cb5..b8b0ffdea03 100644
--- a/addons/crm_caldav/crm_caldav_view.xml
+++ b/addons/crm_caldav/crm_caldav_view.xml
@@ -13,7 +13,7 @@
         </record>
     
         <menuitem
-            name="Synchronize this Calendar"
+            name="Synchronize This Calendar"
             action="action_caldav_browse"
             id="menu_caldav_browse"
             icon="STOCK_EXECUTE"

From 190148f759d9134a2ecae103342cdba19cec5dec Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Wed, 20 Apr 2011 13:41:41 +0530
Subject: [PATCH 115/188] [FIX]: changes in message_update()

bzr revid: rha@tinyerp.com-20110420081141-4w1wi70e290m2a69
---
 addons/crm/crm_lead.py                      | 13 +++++++++++++
 addons/crm_claim/crm_claim.py               | 13 +++++++++++++
 addons/crm_helpdesk/crm_helpdesk.py         | 13 +++++++++++++
 addons/hr_recruitment/hr_recruitment.py     | 13 +++++++++++++
 addons/mail/email_thread.py                 |  4 ++--
 addons/project_issue/project_issue.py       | 13 +++++++++++++
 addons/project_mailgate/project_mailgate.py | 19 ++++++++++++++++---
 7 files changed, 83 insertions(+), 5 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 86930613212..ea59a66238b 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -400,6 +400,19 @@ class crm_lead(crm_case, osv.osv):
             if case.state in CRM_LEAD_PENDING_STATES:
                 values.update(state=crm.AVAILABLE_STATES[1][0]) #re-open
             res = self.write(cr, uid, [case.id], values, context=context)
+
+        attachments = msg.get('attachments', {})
+        self.history(cr, uid, ids, _('receive'), history=True,
+                            subject = msg.get('subject'),
+                            email = msg.get('to'),
+                            details = msg.get('body'),
+                            email_from = msg.get('from'),
+                            email_cc = msg.get('cc'),
+                            message_id = msg.get('message-id'),
+                            references = msg.get('references', False) or msg.get('in-reply-to', False),
+                            attach = attachments,
+                            email_date = msg.get('date'),
+                            context = context)
         return res
 
     def on_change_optin(self, cr, uid, ids, optin):
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index 5ad78c53465..04836a2ed79 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -254,6 +254,19 @@ class crm_claim(crm.crm_case, osv.osv):
             if case.state in CRM_CLAIM_PENDING_STATES:
                 values.update(state=crm.AVAILABLE_STATES[1][0]) #re-open
             res = self.write(cr, uid, [case.id], values, context=context)
+
+        attachments = msg.get('attachments', {})
+        self.history(cr, uid, ids, _('receive'), history=True,
+                            subject = msg.get('subject'),
+                            email = msg.get('to'),
+                            details = msg.get('body'),
+                            email_from = msg.get('from'),
+                            email_cc = msg.get('cc'),
+                            message_id = msg.get('message-id'),
+                            references = msg.get('references', False) or msg.get('in-reply-to', False),
+                            attach = attachments,
+                            email_date = msg.get('date'),
+                            context = context)
         return res
 
 crm_claim()
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index c983acf78b3..9bfde3f189c 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -178,6 +178,19 @@ class crm_helpdesk(crm.crm_case, osv.osv):
             if case.state in CRM_HELPDESK_STATES:
                 values.update(state=crm.AVAILABLE_STATES[1][0]) #re-open
             res = self.write(cr, uid, [case.id], values, context=context)
+
+        attachments = msg.get('attachments', {})
+        self.history(cr, uid, ids, _('receive'), history=True,
+                            subject = msg.get('subject'),
+                            email = msg.get('to'),
+                            details = msg.get('body'),
+                            email_from = msg.get('from'),
+                            email_cc = msg.get('cc'),
+                            message_id = msg.get('message-id'),
+                            references = msg.get('references', False) or msg.get('in-reply-to', False),
+                            attach = attachments,
+                            email_date = msg.get('date'),
+                            context = context)
         return res
 
 crm_helpdesk()
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 3931d053666..4951b7e21fa 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -377,6 +377,19 @@ class hr_applicant(crm.crm_case, osv.osv):
 
         vals.update(vls)
         res = self.write(cr, uid, ids, vals, context=context)
+
+        attachments = msg.get('attachments', {})
+        self.history(cr, uid, ids, _('receive'), history=True,
+                            subject = msg.get('subject'),
+                            email = msg.get('to'),
+                            details = msg.get('body'),
+                            email_from = msg.get('from'),
+                            email_cc = msg.get('cc'),
+                            message_id = msg.get('message-id'),
+                            references = msg.get('references', False) or msg.get('in-reply-to', False),
+                            attach = attachments,
+                            email_date = msg.get('date'),
+                            context = context)
         return res
 
     def case_open(self, cr, uid, ids, *args):
diff --git a/addons/mail/email_thread.py b/addons/mail/email_thread.py
index 87cd459608b..796fc35bb92 100644
--- a/addons/mail/email_thread.py
+++ b/addons/mail/email_thread.py
@@ -90,7 +90,7 @@ class email_thread(osv.osv):
                             email_cc = msg.get('cc'),
                             message_id = msg.get('message-id'),
                             references = msg.get('references', False) or msg.get('in-reply-to', False),
-                            attach = attachments.items(),
+                            attach = attachments,
                             email_date = msg.get('date'),
                             context = context)
         return res_id
@@ -115,7 +115,7 @@ class email_thread(osv.osv):
                             email_cc = msg.get('cc'),
                             message_id = msg.get('message-id'),
                             references = msg.get('references', False) or msg.get('in-reply-to', False),
-                            attach = attachments.items(),
+                            attach = attachments,
                             email_date = msg.get('date'),
                             context = context)
         return True
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index c8b55067fc5..e9e5521d94b 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -454,6 +454,19 @@ class project_issue(crm.crm_case, osv.osv):
 
         vals.update(vls)
         res = self.write(cr, uid, ids, vals)
+
+        attachments = msg.get('attachments', {})
+        self.history(cr, uid, ids, _('receive'), history=True,
+                            subject = msg.get('subject'),
+                            email = msg.get('to'),
+                            details = msg.get('body'),
+                            email_from = msg.get('from'),
+                            email_cc = msg.get('cc'),
+                            message_id = msg.get('message-id'),
+                            references = msg.get('references', False) or msg.get('in-reply-to', False),
+                            attach = attachments,
+                            email_date = msg.get('date'),
+                            context = context)
         return res
 
     def copy(self, cr, uid, id, default=None, context=None):
diff --git a/addons/project_mailgate/project_mailgate.py b/addons/project_mailgate/project_mailgate.py
index 7610f35d648..dc0f04aeddf 100644
--- a/addons/project_mailgate/project_mailgate.py
+++ b/addons/project_mailgate/project_mailgate.py
@@ -69,7 +69,7 @@ class project_tasks(osv.osv):
 
         return res_id
 
-    def message_update(self, cr, uid, id, msg, data={}, default_act='pending'):
+    def message_update(self, cr, uid, ids, msg, data={}, default_act='pending'):
         thread_obj = self.pool.get('email.thread')
         msg_actions, body_data = thread_obj.msg_act_get(msg)
         data.update({
@@ -90,8 +90,21 @@ class project_tasks(osv.osv):
             if msg_actions['priority'] in ('1','2','3','4','5'):
                 data['priority'] = msg_actions['priority']
 
-        self.write(cr, uid, [id], data)
-        getattr(self,act)(cr, uid, [id])
+        self.write(cr, uid, ids, data)
+        getattr(self,act)(cr, uid, ids)
+
+        attachments = msg.get('attachments', {})
+        self.history(cr, uid, ids, _('receive'), history=True,
+                            subject = msg.get('subject'),
+                            email = msg.get('to'),
+                            details = msg.get('body'),
+                            email_from = msg.get('from'),
+                            email_cc = msg.get('cc'),
+                            message_id = msg.get('message-id'),
+                            references = msg.get('references', False) or msg.get('in-reply-to', False),
+                            attach = attachments,
+                            email_date = msg.get('date'),
+                            context = context)
         return True
 
     def thread_followers(self, cr, uid, ids, context=None):

From 96c65e3dbe2d99a5f715800ee306a684d942e75e Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Wed, 20 Apr 2011 15:24:58 +0530
Subject: [PATCH 116/188] [FIX]: improvements for attachment as dictionary

bzr revid: rha@tinyerp.com-20110420095458-0w53lpa10sv7wnep
---
 addons/base_calendar/base_calendar.py          | 2 +-
 addons/crm/crm.py                              | 4 ++--
 addons/event/event.py                          | 4 ----
 addons/mail/email_message.py                   | 4 ++--
 addons/mail/wizard/email_compose_message.py    | 4 ++--
 addons/survey/wizard/survey_answer.py          | 4 ++--
 addons/survey/wizard/survey_send_invitation.py | 4 ++--
 7 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index d49594f4a60..3e3e7e14b3d 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -513,7 +513,7 @@ property or property parameter."),
                         sub,
                         body,
                         model='calendar.attendee',
-                        attach=attach and [('invitation.ics', attach)] or None,
+                        attach=attach and {'invitation.ics': attach} or None,
                         subtype='html',
                         reply_to=email_from
                     )
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index f6b3a20c138..0c84820b5fa 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -479,12 +479,12 @@ class crm_case(object):
 
             body = self.format_body(body)
 
-            attach_to_send = None
+            attach_to_send = {}
 
             if attach:
                 attach_ids = self.pool.get('ir.attachment').search(cr, uid, [('res_model', '=', self._name), ('res_id', '=', case.id)])
                 attach_to_send = self.pool.get('ir.attachment').read(cr, uid, attach_ids, ['datas_fname', 'datas'])
-                attach_to_send = map(lambda x: (x['datas_fname'], base64.decodestring(x['datas'])), attach_to_send)
+                attach_to_send = dict(map(lambda x: (x['datas_fname'], base64.decodestring(x['datas'])), attach_to_send))
 
             # Send an email
             subject = "Reminder: [%s] %s" % (str(case.id), case.name, )
diff --git a/addons/event/event.py b/addons/event/event.py
index 5e757d02903..b019645381e 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -548,10 +548,6 @@ class event_registration(osv.osv):
                     body = regestration.event_id.mail_confirm
             if subject or body:
                 email_message_obj.schedule_with_attach(cr, uid, src, email_to, subject, body, model='event.registration', email_cc=email_cc, openobject_id=regestration.id)
-                self.history(cr, uid, [regestration], subject, history = True, \
-                        email=email_to, details=body, \
-                        subject=subject, email_from=src, \
-                        email_cc=', '.join(email_cc))
 
         return True
 
diff --git a/addons/mail/email_message.py b/addons/mail/email_message.py
index 39d5d8f9a8f..137cddcd8a9 100644
--- a/addons/mail/email_message.py
+++ b/addons/mail/email_message.py
@@ -313,7 +313,7 @@ class email_message(osv.osv):
             msg_txt['message-id'] = message_id
             _logger.info('Parsing Message without message-id, generating a random one: %s', message_id)
 
-       
+
         fields = msg_txt.keys()
         msg['id'] = message_id
         msg['message-id'] = message_id
@@ -424,7 +424,7 @@ class email_message(osv.osv):
                         subtype=message.sub_type,
                         x_headers=message.headers and eval(message.headers) or {},
                         priority=message.priority)
-                    res = smtp_server_obj.send_email(cr, uid, 
+                    res = smtp_server_obj.send_email(cr, uid,
                         msg,
                         mail_server_id = message.smtp_server_id.id or None,
                         smtp_server=smtp_server and smtp_server.smtp_host or None,
diff --git a/addons/mail/wizard/email_compose_message.py b/addons/mail/wizard/email_compose_message.py
index b9e11160510..b85614b6256 100644
--- a/addons/mail/wizard/email_compose_message.py
+++ b/addons/mail/wizard/email_compose_message.py
@@ -208,10 +208,10 @@ class email_compose_message(osv.osv_memory):
     def save_to_mailbox(self, cr, uid, ids, context=None):
         email_ids = []
         email_message_pool = self.pool.get('email.message')
-        attachment = []
+        attachment = {}
         for mail in self.browse(cr, uid, ids, context=context):
             for attach in mail.attachment_ids:
-                attachment.append((attach.datas_fname, attach.datas))
+                attachment[attach.datas_fname] = attach.datas
             references = False
             message_id = False
             if context.get('mail',False) == 'reply' and  mail.message_id:
diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index b10368d191f..c42ddde157c 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -402,7 +402,7 @@ class survey_question_wiz(osv.osv_memory):
                         response_id = surv_name_wiz.read(cr, uid, context.get('sur_name_id',False))['response']
                         context.update({'response_id':response_id})
                         report = self.create_report(cr, uid, [int(survey_id)], 'report.survey.browse.response', survey_data.title,context)
-                        attachments = []
+                        attachments = {}
                         file = open(addons.get_module_resource('survey', 'report') + survey_data.title + ".pdf")
                         file_data = ""
                         while 1:
@@ -411,7 +411,7 @@ class survey_question_wiz(osv.osv_memory):
                             if not line:
                                 break
 
-                        attachments.append((survey_data.title + ".pdf",file_data))
+                        attachments[survey_data.title + ".pdf"] = file_data
                         file.close()
                         os.remove(addons.get_module_resource('survey', 'report') + survey_data.title + ".pdf")
                         user_email = False
diff --git a/addons/survey/wizard/survey_send_invitation.py b/addons/survey/wizard/survey_send_invitation.py
index a4638e3dd04..e86f1970b45 100644
--- a/addons/survey/wizard/survey_send_invitation.py
+++ b/addons/survey/wizard/survey_send_invitation.py
@@ -119,7 +119,7 @@ class survey_send_invitation(osv.osv_memory):
         res_user = ""
         user_exists = False
         new_user = []
-        attachments = []
+        attachments = {}
         current_sur = survey_ref.browse(cr, uid, context.get('active_id'), context=context)
         exist_user = current_sur.invited_user_ids
         if exist_user:
@@ -134,8 +134,8 @@ class survey_send_invitation(osv.osv_memory):
                 file_data += line
                 if not line:
                     break
-            attachments.append((id.title +".pdf",file_data))
             file.close()
+            attachments[id.title +".pdf"] = file_data
             os.remove(addons.get_module_resource('survey', 'report') + id.title +".pdf")
 
         for partner in self.pool.get('res.partner').browse(cr, uid, partner_ids):

From 144c3a902ed598770b42f5085e9a1536c40a02e2 Mon Sep 17 00:00:00 2001
From: rch-openerp <rch@tinyerp.com>
Date: Wed, 20 Apr 2011 16:17:14 +0530
Subject: [PATCH 117/188] [IMP]: Usability improvement in Timebox form of
 project_gtd module.

bzr revid: rch@tinyerp.com-20110420104714-7fsvb5wal7o90aqh
---
 addons/project_gtd/wizard/project_gtd_empty_view.xml | 5 +++--
 addons/project_gtd/wizard/project_gtd_fill_view.xml  | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/project_gtd/wizard/project_gtd_empty_view.xml b/addons/project_gtd/wizard/project_gtd_empty_view.xml
index b39391728a4..b7ebeb1bd00 100644
--- a/addons/project_gtd/wizard/project_gtd_empty_view.xml
+++ b/addons/project_gtd/wizard/project_gtd_empty_view.xml
@@ -10,9 +10,10 @@
               	<form string="Empty Timebox">
               		<group width="345" height="70">
               			<label string="Timebox Empty Process Completed Successfully." />
-							<newline/>
+              			    <newline/>
+              			    <separator colspan="4"/>
 		            		<button icon="gtk-ok" special="cancel" string="_Ok" colspan="1"/><label colspan="1"/>
-		          	</group>		   
+		          	</group>
 			  	</form>
             </field>
 		</record>
diff --git a/addons/project_gtd/wizard/project_gtd_fill_view.xml b/addons/project_gtd/wizard/project_gtd_fill_view.xml
index 6206a0a5d89..41b99eb1b1e 100644
--- a/addons/project_gtd/wizard/project_gtd_fill_view.xml
+++ b/addons/project_gtd/wizard/project_gtd_fill_view.xml
@@ -11,6 +11,7 @@
               		  <field name="timebox_id" widget="selection"/>
               		  <field name="timebox_to_id" widget="selection"/>
               		  <field colspan="4" name="task_ids" nolabel="1" domain="[('timebox_id','=',timebox_id),('state','=','open')]" />
+              		  <separator colspan="4"/>
 		              <group colspan="4" col="6">
 				            <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
 		              		<button name="process" icon="gtk-ok" string="Add to Timebox" type="object" />

From 71794fb91a6d79716024a7eea81b9b132385ca5f Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Wed, 20 Apr 2011 17:24:30 +0530
Subject: [PATCH 118/188] [IMP] email_template: changes in on_change_template
 where called generate_email() of template and clean the code

bzr revid: rha@tinyerp.com-20110420115430-wdghz5qd6nzw8pnf
---
 addons/email_template/email_template.py       | 117 ++++++++----------
 .../wizard/email_compose_message.py           |  57 +++------
 addons/mail/wizard/email_compose_message.py   |   1 -
 3 files changed, 70 insertions(+), 105 deletions(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 524dce47518..d8bc8711c79 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -84,14 +84,6 @@ class email_template(osv.osv):
                   help="The subject of email."
                   " Placeholders can be used here.",
                   translate=True),
-#        'description':fields.text(
-#                    'Standard Body (Text)',
-#                    help="The text version of the mail",
-#                    translate=True),
-#        'body_html':fields.text(
-#                    'Body (Text-Web Client Only)',
-#                    help="The text version of the mail",
-#                    translate=True),
         'user_signature':fields.boolean(
                   'Signature',
                   help="the signature from the User details"
@@ -352,49 +344,50 @@ class email_template(osv.osv):
         """
         if context is None:
             context = {}
-        smtp_pool = self.pool.get('ir.mail_server')
-        email_message_pool = self.pool.get('email.message')
+        values = {
+                  'subject': False,
+                  'body': False,
+                  'email_to': False,
+                  'email_cc': False,
+                  'email_bcc': False,
+                  'reply_to': False,
+                  'auto_delete': False,
+                  'model': False,
+                  'res_id': False,
+                  'smtp_server_id': False,
+                  'attachment': False,
+                  'attachment_ids': False,
+        }
+        if not template_id:
+            return values
         report_xml_pool = self.pool.get('ir.actions.report.xml')
         template = self.get_email_template(cr, uid, template_id, record_id, context)
-        smtp_server_id = context.get('smtp_server_id', False)
-        if not smtp_server_id and template.smtp_server_id:
-            smtp_server_id = template.smtp_server_id.id
-        else:
-            smtp_ids = smtp_pool.search(cr, uid, [])
-            smtp_server_id = smtp_ids and smtp_ids[0]
-        smtp_server = smtp_pool.browse(cr, uid, smtp_server_id, context=context)
-        # determine name of sender, either it is specified in email_id
+        def _get_template_value(field):
+            if context.get('mass_mail',False): # Mass Mail: Gets original template values for multiple email change
+                return getattr(template, field)
+            else:
+                return self.get_template_value(cr, uid, getattr(template, field), template.model, record_id, context=context)
 
-        email_id = smtp_server.email_id.strip()
-        email_from = re.findall(r'([^ ,<@]+@[^> ,]+)', email_id)[0]
-        if email_from != email_id:
-            email_from = smtp_server.email_id
-        else:
-            email_from = tools.ustr(smtp_server.name) + "<" + tools.ustr(email_id) + ">"
-
-        model = template.model_id.model
+        #Use signatures if allowed
+        body = _get_template_value('body')
+        if template.user_signature:
+            signature = self.pool.get('res.users').browse(cr, uid, uid, context).signature
+            body += '\n' + signature
         values = {
-            'email_from': email_from,
-            'email_to': self.get_template_value(cr, uid, template.email_to, model, record_id, context),
-            'email_cc': self.get_template_value(cr, uid, template.email_cc, model, record_id, context),
-            'email_bcc': self.get_template_value(cr, uid, template.email_bcc, model, record_id, context),
-            'reply_to': self.get_template_value(cr, uid, template.reply_to, model, record_id, context),
-            'subject': self.get_template_value(cr, uid, template.subject, model, record_id, context),
-            'body': self.get_template_value(cr, uid, template.description, model, record_id, context),
-            'auto_delete': self.get_template_value(cr, uid, template.auto_delete, model, record_id, context),
+            'smtp_server_id' : template.smtp_server_id.id,
+            'body' : body,
+            'email_to' : _get_template_value('email_to') or False,
+            'email_cc' : _get_template_value('email_cc') or False,
+            'email_bcc' : _get_template_value('email_bcc') or False,
+            'reply_to' : _get_template_value('reply_to') or False,
+            'subject' : _get_template_value('subject') or False,
+            'auto_delete': template.auto_delete,
+            'model' : template.model or False,
+            'res_id' : record_id or False,
             #'body_html': self.get_template_value(cr, uid, template.body_html, model, record_id, context),
         }
 
-        #Use signatures if allowed
-        if template.user_signature:
-            sign = self.pool.get('res.users').read(cr, uid, uid, ['signature'], context)['signature']
-            if values['description']:
-                values['description'] += '\n\n' + sign
-            #if values['body_html']:
-            #    values['body_html'] += sign
-
-        attachment = []
-
+        attachment = {}
         # Add report as a Document
         if template.report_template:
             report_name = template.report_name
@@ -402,32 +395,24 @@ class email_template(osv.osv):
             data = {}
             data['model'] = template.model
 
-            # Ensure report is rendered using template's language
-            ctx = context.copy()
-            if template.lang:
-                ctx['lang'] = self.get_template_value(cr, uid, template.lang, template.model, record_id, context)
-            service = netsvc.LocalService(reportname)
-            (result, format) = service.create(cr, uid, [record_id], data, ctx)
-            result = base64.b64encode(result)
-            if not report_name:
-                report_name = reportname
-            report_name = report_name + "." + format
-            attachment.append((report_name, result))
-
+        # Ensure report is rendered using template's language
+        ctx = context.copy()
+        if template.lang:
+            ctx['lang'] = self.get_template_value(cr, uid, template.lang, template.model, record_id, context)
+        service = netsvc.LocalService(reportname)
+        (result, format) = service.create(cr, uid, [record_id], data, ctx)
+        result = base64.b64encode(result)
+        if not report_name:
+            report_name = reportname
+        report_name = report_name + "." + format
+        attachment[report_name] = result
 
         # Add document attachments
         for attach in template.attachment_ids:
             #attach = attahcment_obj.browse(cr, uid, attachment_id, context)
-            attachment.append((attach.datas_fname, attach.datas))
-
-        #Send emails
-        context.update({'notemplate':True})
-        email_id = email_message_pool.schedule_with_attach(cr, uid, values.get('email_from'), values.get('email_to'), values.get('name'),
-                    values.get('description'), model=model, email_cc=values.get('email_cc'), email_bcc=values.get('email_bcc'),
-                    reply_to=values.get('reply_to'), attach=attachment, message_id=values.get('message_id'), openobject_id=record_id,
-                    debug=True, subtype='plain', x_headers={}, priority='3', smtp_server_id=smtp_server.id, auto_delete=values.get('auto_delete'), context=context)
-        email_message_pool.write(cr, uid, email_id, {'template_id': context.get('template_id',template.id)})
-        return email_id
+            attachment[attach.datas_fname] = attach.datas
+        values['attachment'] = attachment
+        return values
 
 email_template()
 
diff --git a/addons/email_template/wizard/email_compose_message.py b/addons/email_template/wizard/email_compose_message.py
index 82381c838e3..41cbd9fa146 100644
--- a/addons/email_template/wizard/email_compose_message.py
+++ b/addons/email_template/wizard/email_compose_message.py
@@ -23,48 +23,12 @@ from osv import osv
 from osv import fields
 import tools
 from tools.translate import _
+import binascii
 
 class email_compose_message(osv.osv_memory):
     _name = 'email.compose.message'
     _inherit = 'email.compose.message'
 
-    def get_template_data(self, cr, uid, template_id, context=None):
-        result = {}
-        if not template_id:
-            return result
-        if context is None:
-            context = {}
-        template_pool = self.pool.get('email.template')
-        resource_id = context.get('active_id')
-        template = template_pool.get_email_template(cr, uid, template_id=template_id, context=context)
-
-        def _get_template_value(field):
-            if context.get('mass_mail',False): # Mass Mail: Gets original template values for multiple email change
-                return getattr(template, field)
-            else:
-                return self.get_template_value(cr, uid, getattr(template, field), template.model, resource_id, context=context)
-
-        body = _get_template_value('body')
-        if template.user_signature:
-            signature = self.pool.get('res.users').browse(cr, uid, uid, context).signature
-            body += '\n' + signature
-
-        result.update({
-                'template_id' : template.id,
-                'smtp_server_id' : template.smtp_server_id.id,
-                'body' : body,
-                'subject' : _get_template_value('subject') or False,
-                'attachment_ids' : template_pool.read(cr, uid, template.id, ['attachment_ids'])['attachment_ids'] or [],
-                'res_id' : resource_id or False,
-                'email_to' : _get_template_value('email_to') or False,
-                'email_cc' : _get_template_value('email_cc') or False,
-                'email_bcc' : _get_template_value('email_bcc') or False,
-                'reply_to' : _get_template_value('reply_to') or False,
-                'model' : template.model or False,
-                'auto_delete': template.auto_delete
-            })
-        return result
-
     def _get_templates(self, cr, uid, context=None):
         """
         Return Email Template of particular  Model.
@@ -96,7 +60,24 @@ class email_compose_message(osv.osv_memory):
     def on_change_template(self, cr, uid, ids, template_id, context=None):
         if context is None:
             context = {}
-        return {'value': self.get_template_data(cr, uid, template_id, context=context)}
+        att_ids = []
+        res_id = context.get('active_id', False)
+        values = self.pool.get('email.template').generate_email(cr, uid, template_id, res_id, context=context)
+        if values['attachment']:
+            attachment = values['attachment']
+            attachment_obj = self.pool.get('ir.attachment')
+            for fname, fcontent in attachment.items():
+                data_attach = {
+                    'name': fname,
+                    'datas': binascii.b2a_base64(str(fcontent)),
+                    'datas_fname': fname,
+                    'description': _('Mail attachment'),
+                    'res_model' : self._name,
+                    'res_id' : ids and ids[0] or False
+                }
+                att_ids.append(attachment_obj.create(cr, uid, data_attach))
+            values['attachment_ids'] = att_ids
+        return {'value': values}
 
 email_compose_message()
 
diff --git a/addons/mail/wizard/email_compose_message.py b/addons/mail/wizard/email_compose_message.py
index a5c77104c37..f69fd2af7e6 100644
--- a/addons/mail/wizard/email_compose_message.py
+++ b/addons/mail/wizard/email_compose_message.py
@@ -208,7 +208,6 @@ class email_compose_message(osv.osv_memory):
                         subtype=mail.sub_type, x_headers=mail.headers, priority=mail.priority, smtp_server_id=mail.smtp_server_id and mail.smtp_server_id.id,
                         auto_delete=mail.auto_delete or False, context=context)
                     email_ids.append(email_id)
-                return {'type': 'ir.actions.act_window_close'}
 
             else:
                 email_id = email_message_pool.schedule_with_attach(cr, uid, mail.email_from, mail.email_to, mail.subject, mail.body,

From e217bb0e3964131d942e9748926f30a73ffe32e3 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Wed, 20 Apr 2011 17:34:59 +0530
Subject: [PATCH 119/188] [REM] crm: removed crm_send_email.py as it is unused

bzr revid: rha@tinyerp.com-20110420120459-f2ek7ifx0x0lgzhe
---
 addons/crm/__openerp__.py                 |   1 -
 addons/crm/wizard/crm_send_email.py       | 262 ----------------------
 addons/crm/wizard/crm_send_email_view.xml | 104 ---------
 3 files changed, 367 deletions(-)
 delete mode 100644 addons/crm/wizard/crm_send_email.py
 delete mode 100644 addons/crm/wizard/crm_send_email_view.xml

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index caf040b31c5..384ef3c1306 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -84,7 +84,6 @@ Creates a dashboard for CRM that includes:
         'wizard/crm_opportunity_to_phonecall_view.xml',
         'wizard/crm_partner_to_opportunity_view.xml',
 
-#        'wizard/crm_send_email_view.xml',
         'wizard/crm_add_note_view.xml',
         'wizard/crm_merge_opportunities_view.xml',
 
diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
deleted file mode 100644
index 71c83b20c33..00000000000
--- a/addons/crm/wizard/crm_send_email.py
+++ /dev/null
@@ -1,262 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 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 crm import crm
-from osv import osv, fields
-from tools.translate import _
-import base64
-import itertools
-import tools
-import re
-
-
-AVAILABLE_STATES = crm.AVAILABLE_STATES + [('unchanged', 'Unchanged')]
-
-class crm_send_new_email(osv.osv_memory):
-    """ Sends new email for the case"""
-    _name = "crm.send.mail"
-    _description = "Send new email"
-
-    _columns = {
-        'email_to' : fields.char('To', size=512, required=True),
-        'email_from' : fields.char('From', size=128, required=True),
-        'reply_to' : fields.char('Reply To', size=128, required=True, help="Reply-to of the Sales team defined on this case"),
-        'email_cc' : fields.char('CC', size=512, help="These addresses will receive a copy of this email. To modify the permanent CC list, edit the global CC field of this case"),
-        'subject': fields.char('Subject', size=512, required=True),
-        'body': fields.text('Message Body', required=True),
-        'state': fields.selection(AVAILABLE_STATES, string='Set New State To', required=True),
-        'attachment_ids' : fields.one2many('crm.send.mail.attachment', 'wizard_id', 'Attachment'),
-        'html': fields.boolean('HTML formatting?', help="Select this if you want to send email with HTML formatting."),
-    }
-
-    def action_send(self, cr, uid, ids, context=None):
-        """ This sends an email to ALL the addresses of the selected partners.
-        """
-        email_message_obj = self.pool.get('email.message')
-        if context is None:
-            context = {}
-
-        if not context.get('active_model'):
-            raise osv.except_osv(_('Error'), _('Can not send mail!'))
-
-        model = context.get('active_model')
-        case_pool = self.pool.get(model)
-        res_id = context and context.get('active_id', False) or False
-
-        for obj in self.browse(cr, uid, ids, context=context):
-            attach = [
-                (x.name, base64.decodestring(x.binary)) for x in obj.attachment_ids
-            ]
-
-            subtype = 'plain'
-            message_id = None
-            ref_id = None
-
-            case = case_pool.browse(cr, uid, res_id, context=context)
-            if context.get('mail', 'new') == 'new':
-                if case.message_ids:
-                    message_id = case.message_ids[0].message_id
-            elif context.get('mail') == 'forward':
-                # extract attachements from case and emails according to mode
-                attachments = []
-                attach_pool = self.pool.get('ir.attachment')
-                direct_attachments = attach_pool.search(cr, uid, [('res_model', '=', 'crm.lead'), ('res_id', '=', res_id)], context=context)
-                attachments += attach_pool.browse(cr, uid, direct_attachments, context=context)
-                if obj.history in ['latest', 'whole'] and case.message_ids:
-                    msgs = case.message_ids
-                    if obj.history == 'latest':
-                        msgs = msgs[:1]
-                    attachments.extend(itertools.chain(*[m.attachment_ids for m in msgs]))
-                attach_all = [(a.datas_fname or a.name, base64.decodestring(a.datas)) for a in attachments if a.datas]
-                attach += attach_all
-
-            else:
-                hist = email_message_obj.browse(cr, uid, res_id, context=context)
-                message_id = hist.message_id
-                model = hist.model
-                case_pool = self.pool.get(model)
-                res_id = hist.res_id
-                ref_id = hist.ref_id
-                case = case_pool.browse(cr, uid, res_id, context=context)
-            emails = re.findall(r'([^ ,<@]+@[^> ,]+)', obj.email_to or '')
-            email_cc = re.findall(r'([^ ,<@]+@[^> ,]+)', obj.email_cc or '')
-            emails = filter(None, emails)
-            body = obj.body
-
-            body = body and tools.ustr(body) or ''
-            email_from = getattr(obj, 'email_from', False)
-            x_headers = {}
-            if message_id:
-                x_headers['References'] = "%s" % (message_id)
-
-            if obj.html:
-                subtype = 'html'
-
-            flag = email_message_obj.schedule_with_attach(cr, uid,
-                email_from,
-                emails,
-                obj.subject,
-                body,
-                model='crm.send.mail',
-                email_cc=email_cc,
-                attach=attach,
-                subtype=subtype,
-                reply_to=obj.reply_to,
-                openobject_id=str(case.id),
-                x_headers=x_headers
-            )
-
-            if not flag:
-                raise osv.except_osv(_('Error!'), _('Unable to send mail. Please check SMTP is configured properly.'))
-
-            msg_dict = {'new': 'Send', 'reply': 'Reply', 'forward': 'Forward'}
-            case_pool.history(cr, uid, [case], _(msg_dict[context.get('mail', 'new')]), history=True, \
-                            email=obj.email_to, details=body, \
-                            subject=obj.subject, email_from=email_from, \
-                            email_cc=', '.join(email_cc), message_id=message_id, \
-                            references=ref_id or message_id, attach=attach)
-            if obj.state == 'unchanged':
-                pass
-            elif obj.state == 'done':
-                case_pool.case_close(cr, uid, [case.id])
-            elif obj.state == 'draft':
-                case_pool.case_reset(cr, uid, [case.id])
-            elif obj.state in ['cancel', 'open', 'pending']:
-                act = 'case_' + obj.state
-                getattr(case_pool, act)(cr, uid, [case.id])
-
-        return {'type': 'ir.actions.act_window_close'}
-
-    def default_get(self, cr, uid, fields, context=None):
-        """
-        This function gets default values
-        """
-        if context is None:
-            context = {}
-
-        if not context.get('active_model'):
-            raise osv.except_osv(_('Error'), _('Can not send mail!'))
-
-        res = super(crm_send_new_email, self).default_get(cr, uid, fields, context=context)
-
-        if context.get('mail') == 'reply':
-            res.update(self.get_reply_defaults(cr, uid, fields, context=context))
-            return res
-
-        model = context.get('active_model')
-        mod_obj = self.pool.get(model)
-        res_id = context and context.get('active_ids', []) or []
-
-        user_obj = self.pool.get('res.users')
-        user_mail_from = user_obj._get_email_from(cr, uid, [uid], context=context)[uid]
-
-        for case in mod_obj.browse(cr, uid, res_id, context=context):
-            if 'email_to' in fields:
-                res.update({'email_to': case.email_from and tools.ustr(case.email_from) or ''})
-            if 'email_from' in fields:
-                res.update({'email_from': user_mail_from and tools.ustr(user_mail_from) or ''})
-            if 'reply_to' in fields:
-                if hasattr(case, 'section_id'):
-                    res.update({'reply_to': case.section_id and case.section_id.reply_to or False})
-            if 'subject' in fields:
-                res.update({'subject': tools.ustr(context.get('subject', case.name) or '')})
-            if 'email_cc' in fields:
-                res.update({'email_cc': tools.ustr(case.email_cc or '')})
-            if 'body' in fields:
-                res.update({'body': u'\n'+(tools.ustr(case.user_id.signature or ''))})
-            if 'state' in fields:
-                res.update({'state': u'pending'})
-
-        return res
-
-    def get_reply_defaults(self, cr, uid, fields, context=None):
-        """
-        This function gets default values for reply mail
-        """
-        hist_obj = self.pool.get('email.message')
-        res_ids = context and context.get('active_ids', []) or []
-
-        user_obj = self.pool.get('res.users')
-        user_mail_from = user_obj._get_email_from(cr, uid, [uid], context=context)[uid]
-
-        include_original = context and context.get('include_original', False) or False
-        res = {}
-        for hist in hist_obj.browse(cr, uid, res_ids, context=context):
-            model = hist.model
-
-            # In the case where the crm.case does not exist in the database
-            if not model:
-                return {'type': 'ir.actions.act_window_close'}
-
-            model_pool = self.pool.get(model)
-            res_id = hist.res_id
-            case = model_pool.browse(cr, uid, res_id)
-            if 'email_to' in fields:
-                res.update({'email_to': case.email_from and tools.ustr(case.email_from) or False})
-            if 'email_from' in fields:
-                res.update({'email_from': user_mail_from and tools.ustr(user_mail_from) or False})
-
-            signature = u'\n' + (tools.ustr(case.user_id.signature or '')) + u'\n'
-            original = [signature]
-
-            if include_original == True and 'body' in fields:
-                header = u'-------- Original Message --------'
-                sender = u'From: %s' %(tools.ustr(hist.email_from or ''))
-                to = u'To: %s' % (tools.ustr(hist.email_to or ''))
-                sentdate = u'Date: %s' % (tools.ustr(hist.date))
-                desc = u'\n%s'%(tools.ustr(hist.description))
-
-                original = [signature, header, sender, to, sentdate, desc]
-
-            res['body']= u'\n' + u'\n'.join(original)
-
-            if 'subject' in fields:
-                res.update({u'subject': u'Re: %s' %(tools.ustr(hist.name or ''))})
-            if 'email_cc' in fields:
-                 email_cc = (case.email_cc and tools.ustr(case.email_cc) + ', ' or '') + (hist.email_cc or '')
-                 res.update({'email_cc': email_cc})
-            if 'reply_to' in fields:
-                if hasattr(case, 'section_id'):
-                    res.update({'reply_to': case.section_id.reply_to or ''})
-            if 'state' in fields:
-                res['state'] = u'pending'
-        return res
-
-    def view_init(self, cr, uid, fields_list, context=None):
-        """
-        This function checks for precondition before wizard executes
-        @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 fields: List of fields for default value
-        @param context: A standard dictionary for contextual values
-
-        """
-        if context is None:
-            context = {}
-
-        if not context.get('active_model'):
-            raise osv.except_osv(_('Error'), _('Can not send mail!'))
-        return True
-
-crm_send_new_email()
-
diff --git a/addons/crm/wizard/crm_send_email_view.xml b/addons/crm/wizard/crm_send_email_view.xml
deleted file mode 100644
index e973eb477c9..00000000000
--- a/addons/crm/wizard/crm_send_email_view.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-
-<!-- Send New Mail view -->
-
-        <record model="ir.ui.view" id="crm_send_new_mail_view">
-            <field name="name">crm.new.send.mail.form</field>
-            <field name="model">crm.send.mail</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Send Mail" col="4">
-                    <group colspan="4" col="2">
-                    <field name="email_from"/>
-                    <field name="reply_to"/>
-                    <field name="email_to" />
-                    <field name="email_cc"/>
-                    <field name="subject"/>
-                    <field name="html"/>
-                    </group>
-                    <notebook colspan="6">
-                        <page string="Message">
-                            <field name="body" nolabel="1" colspan="4" default_focus="1"/>
-                        </page>
-                        <page string="Attachments">
-                            <field name="attachment_ids" colspan="4" nolabel="1">
-                                <form string="Attachment">
-                                    <field name="binary" filename="name" />
-                                    <field name="name" />
-                                </form>
-                                <tree string="Attachments">
-                                    <field name="name" />
-                                </tree>
-                            </field>
-                        </page>
-                    </notebook>
-                    <separator string="" colspan="6"/>
-                    <group colspan="6" col="4" >
-                        <field name="state" />
-                        <button string="_Cancel" icon="gtk-close" special="cancel" />
-                        <button name="action_send" type="object" string="_Send" icon="gtk-go-forward" />
-                    </group>
-                </form>
-            </field>
-        </record>
-
-<!-- Send New Mail action -->
-
-        <record model="ir.actions.act_window" id="action_crm_send_mail">
-            <field name="name">Send Mail</field>
-            <field name="res_model">crm.send.mail</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="crm_send_new_mail_view"/>
-            <field name="target">new</field>
-        </record>
-
-
-    <!-- Reply to Mail view -->
-
-        <record model="ir.ui.view" id="crm_reply_mail_view">
-            <field name="name">crm.mail.reply.form</field>
-            <field name="model">crm.send.mail</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Reply to last Mail" col="2">
-                    <field name="email_from" />
-                    <field name="email_to" />
-                    <field name="email_cc" />
-                    <field name="subject" />
-                    <field name="attachment_ids" colspan="4" nolabel="1">
-                        <form string="Attachment">
-                            <field name="binary" filename="name" />
-                            <field name="name" />
-                        </form>
-                        <tree string="Attachments">
-                            <field name="name" />
-                        </tree>
-                    </field>
-                    <separator string="" colspan="4"/>
-                    <field name="body" nolabel="1" colspan="4"/>
-                    <separator string=" " colspan="4"/>
-                    <group colspan="4" col="3" >
-                        <label string=" " />
-                        <button string="_Cancel" icon="gtk-close" special="cancel" />
-                        <button name="action_send" type="object" string="_Send Reply" icon="gtk-go-forward" />
-                    </group>
-                </form>
-            </field>
-        </record>
-
-<!-- Reply to Mail action -->
-
-        <record model="ir.actions.act_window" id="action_crm_reply_mail">
-            <field name="name">Reply to last Mail</field>
-            <field name="res_model">crm.send.mail</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="crm_reply_mail_view"/>
-            <field name="target">new</field>
-        </record>
-
-    </data>
-</openerp>

From 0ce94ac23aa8db449ca1726f94a1cdf8042a4035 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Wed, 20 Apr 2011 18:16:10 +0530
Subject: [PATCH 120/188] [FIX]: email_template: indentation

bzr revid: rha@tinyerp.com-20110420124610-jpp6yc4b6qoxu8tf
---
 addons/email_template/email_template.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index d8bc8711c79..192a42314a8 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -395,17 +395,17 @@ class email_template(osv.osv):
             data = {}
             data['model'] = template.model
 
-        # Ensure report is rendered using template's language
-        ctx = context.copy()
-        if template.lang:
-            ctx['lang'] = self.get_template_value(cr, uid, template.lang, template.model, record_id, context)
-        service = netsvc.LocalService(reportname)
-        (result, format) = service.create(cr, uid, [record_id], data, ctx)
-        result = base64.b64encode(result)
-        if not report_name:
-            report_name = reportname
-        report_name = report_name + "." + format
-        attachment[report_name] = result
+            # Ensure report is rendered using template's language
+            ctx = context.copy()
+            if template.lang:
+                ctx['lang'] = self.get_template_value(cr, uid, template.lang, template.model, record_id, context)
+            service = netsvc.LocalService(reportname)
+            (result, format) = service.create(cr, uid, [record_id], data, ctx)
+            result = base64.b64encode(result)
+            if not report_name:
+                report_name = reportname
+            report_name = report_name + "." + format
+            attachment[report_name] = result
 
         # Add document attachments
         for attach in template.attachment_ids:

From 6a4cd58195e79460a68b7c17e84b2e8b9f8527a3 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Wed, 20 Apr 2011 18:23:14 +0530
Subject: [PATCH 121/188] [FIX] mail: fix attachment in schedule_with_attach()
 in email_message.py

bzr revid: rha@tinyerp.com-20110420125314-2og80ixd0uwsy8qy
---
 addons/mail/email_message.py | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/addons/mail/email_message.py b/addons/mail/email_message.py
index 137cddcd8a9..b9e1a7a368e 100644
--- a/addons/mail/email_message.py
+++ b/addons/mail/email_message.py
@@ -208,6 +208,8 @@ class email_message(osv.osv):
             message_id=False, references=False, openobject_id=False, debug=False, subtype='plain', x_headers={}, priority='3', smtp_server_id=False, context=None, auto_delete=False):
         if context is None:
             context = {}
+        if attach is None:
+            attach = {}
         attachment_obj = self.pool.get('ir.attachment')
         if email_to and type(email_to) != list:
             email_to = [email_to]
@@ -240,21 +242,20 @@ class email_message(osv.osv):
                 'auto_delete': auto_delete
             }
         email_msg_id = self.create(cr, uid, msg_vals, context)
-        if attach:
-            attachment_ids = []
-            for attachment in attach:
-                attachment_data = {
-                        'name': attachment[0],
-                        'subject':  (subject or '') + _(' (Email Attachment)'),
-                        'datas': attachment[1],
-                        'datas_fname': attachment[0],
-                        'body': subject or _('No Description'),
-                        'res_model':'email.message',
-                        'res_id': email_msg_id,
-                    }
-                if context.has_key('default_type'):
-                    del context['default_type']
-                attachment_ids.append(attachment_obj.create(cr, uid, attachment_data, context))
+        attachment_ids = []
+        for fname, fcontent in attach.items():
+            attachment_data = {
+                    'name': fname,
+                    'subject':  (subject or '') + _(' (Email Attachment)'),
+                    'datas': fcontent,
+                    'datas_fname': fname,
+                    'body': subject or _('No Description'),
+                    'res_model':'email.message',
+                    'res_id': email_msg_id,
+                }
+            if context.has_key('default_type'):
+                del context['default_type']
+            attachment_ids.append(attachment_obj.create(cr, uid, attachment_data, context))
             self.write(cr, uid, email_msg_id,
                               { 'attachment_ids': [[6, 0, attachment_ids]] }, context)
         return email_msg_id

From 290ef7ed6c8f1c030aaceb4338652fa60e6b0695 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 20 Apr 2011 14:55:21 +0200
Subject: [PATCH 122/188] [FIX] hr_timesheet_sheet: Improved Exception coming
 on Sign In and Sign Out buttons

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

bzr revid: qdp-launchpad@openerp.com-20110420125521-p2js2tk3z7q5lw5t
---
 addons/hr_timesheet_sheet/hr_timesheet_sheet.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 23ab63247e5..5a899555e5d 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -251,7 +251,7 @@ class hr_timesheet_sheet(osv.osv):
         if context is None:
             context = {}
         if not sheet.date_current == time.strftime('%Y-%m-%d'):
-            raise osv.except_osv(_('Error !'), _('You can not sign in from an other date than today'))
+            raise osv.except_osv(_('Error !'), _('You cannot sign in/sign out from an other date than today'))
         emp_id = sheet.employee_id.id
         context['sheet_id']=ids[0]
         emp_obj.attendance_action_change(cr, uid, [emp_id], type=typ, context=context,)

From dc6973b41ed1267291f65571f721080e6bb38b5c Mon Sep 17 00:00:00 2001
From: "Naresh (OpenERP)" <nch@tinyerp.com>
Date: Wed, 20 Apr 2011 18:43:46 +0530
Subject: [PATCH 123/188] [FIX]:help defined in xml view was not considered for
 translation eg:on button

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

bzr revid: nch@tinyerp.com-20110420131346-n5jfy76efdgnztqr
---
 openerp/osv/orm.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index c0b2e65c678..26f011cd252 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -1277,6 +1277,10 @@ class orm_template(object):
                 trans = self.pool.get('ir.translation')._get_source(cr, user, self._name, 'view', context['lang'], node.get('sum'))
                 if trans:
                     node.set('sum', trans)
+            if node.get('help'):
+                trans = self.pool.get('ir.translation')._get_source(cr, user, self._name, 'view', context['lang'], node.get('help'))
+                if trans:
+                    node.set('help', trans)
 
         for f in node:
             if children or (node.tag == 'field' and f.tag in ('filter','separator')):

From da7aad526dbde83ab591cd95ceefc3ca6ea352d4 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Wed, 20 Apr 2011 19:10:33 +0530
Subject: [PATCH 124/188] [REVIEW+FIX]

bzr revid: hmo@tinyerp.com-20110420134033-m1euj9hws0i6v0tx
---
 addons/crm/crm.py                              |  2 +-
 addons/email_template/email_template.py        | 18 ++++++++----------
 .../wizard/email_template_preview.py           |  4 ++--
 addons/project_mailgate/project_mailgate.py    |  2 +-
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 0c84820b5fa..2d9a739af70 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -307,7 +307,7 @@ class crm_case(object):
         else:
             return {'value': {'phone': address.phone}}
 
-    def _history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, email_from=False, message_id=False, attach=[], context=None):
+    def _history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, email_from=False, message_id=False, attach=None, context=None):
         thread_pool = self.pool.get('email.thread')
         return thread_pool.history(cr, uid, cases, keyword, history=history,\
                                        subject=subject, email=email, \
diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 192a42314a8..5ae9833acab 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -45,8 +45,7 @@ class email_template(osv.osv):
         "Return Template Object"
         if context is None:
             context = {}
-        if not template_id:
-            template_id = context.get('template_id', False)
+        
         if not template_id:
             return False
 
@@ -172,7 +171,7 @@ class email_template(osv.osv):
                  'res_model': 'email.compose.message',
                  'src_model': src_obj,
                  'view_type': 'form',
-                 'context': "{'template_id':'%d','src_rec_id':active_id,'src_rec_ids':active_ids}" % (template.id),
+                 'context': "{'mass_mail':True}",
                  'view_mode':'form,tree',
                  'view_id': res_id,
                  'target': 'new',
@@ -206,15 +205,11 @@ class email_template(osv.osv):
         return super(email_template, self).unlink(cr, uid, ids, context=context)
 
     def copy(self, cr, uid, id, default=None, context=None):
+        template = self.browse(cr, uid, id, context=context)
         if default is None:
             default = {}
         default = default.copy()
-        old = self.read(cr, uid, id, ['name'], context=context)
-        new_name = _("Copy of template %s") % old.get('name', 'No Name')
-        check = self.search(cr, uid, [('name', '=', new_name)], context=context)
-        if check:
-            new_name = new_name + '_' + random.choice('abcdefghij') + random.choice('lmnopqrs') + random.choice('tuvwzyz')
-        default.update({'name':new_name})
+        default['name'] = template.name or '' + '(copy)'
         return super(email_template, self).copy(cr, uid, id, default, context)
 
     def build_expression(self, field_name, sub_field_name, null_value):
@@ -360,6 +355,7 @@ class email_template(osv.osv):
         }
         if not template_id:
             return values
+
         report_xml_pool = self.pool.get('ir.actions.report.xml')
         template = self.get_email_template(cr, uid, template_id, record_id, context)
         def _get_template_value(field):
@@ -368,11 +364,13 @@ class email_template(osv.osv):
             else:
                 return self.get_template_value(cr, uid, getattr(template, field), template.model, record_id, context=context)
 
-        #Use signatures if allowed
         body = _get_template_value('body')
+
+        #Use signatures if allowed
         if template.user_signature:
             signature = self.pool.get('res.users').browse(cr, uid, uid, context).signature
             body += '\n' + signature
+
         values = {
             'smtp_server_id' : template.smtp_server_id.id,
             'body' : body,
diff --git a/addons/email_template/wizard/email_template_preview.py b/addons/email_template/wizard/email_template_preview.py
index 2538244ebea..94b86deec8b 100644
--- a/addons/email_template/wizard/email_template_preview.py
+++ b/addons/email_template/wizard/email_template_preview.py
@@ -38,7 +38,7 @@ class email_template_preview(osv.osv_memory):
         if context is None:
             context = {}
 
-        template_id = context.get('template_id', False)
+        template_id = context.get('active_id', False)
         if not template_id:
             return []
         template_pool = self.pool.get('email.template')
@@ -61,7 +61,7 @@ class email_template_preview(osv.osv_memory):
         result = super(email_template_preview, self).default_get(cr, uid, fields, context=context)
 
         template_pool = self.pool.get('email.template')
-        template_id = context.get('template_id',False)
+        template_id = context.get('active_id',False)
         if 'res_id' in fields:
             records = self._get_records(cr, uid, context=context)
             result['res_id'] = records and records[0][0] or False # select first record as a Default
diff --git a/addons/project_mailgate/project_mailgate.py b/addons/project_mailgate/project_mailgate.py
index dc0f04aeddf..f6712e84021 100644
--- a/addons/project_mailgate/project_mailgate.py
+++ b/addons/project_mailgate/project_mailgate.py
@@ -120,7 +120,7 @@ class project_tasks(osv.osv):
             return len(res) and res[0] or False
         return res
 
-    def _history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, email_from=False, message_id=False, attach=[], context=None):
+    def _history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, email_from=False, message_id=False, attach=None, context=None):
         thread_pool = self.pool.get('email.thread')
         return thread_pool.history(cr, uid, cases, keyword, history=history,\
                                        subject=subject, email=email, \

From 7549fe14d7a8cb45e59c1ec33970aedd6a3673ee Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 21 Apr 2011 04:38:54 +0000
Subject: [PATCH 125/188] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110421043854-dslduy3emr1ypjgy
---
 addons/l10n_br/i18n/tr.po | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 addons/l10n_br/i18n/tr.po

diff --git a/addons/l10n_br/i18n/tr.po b/addons/l10n_br/i18n/tr.po
new file mode 100644
index 00000000000..bd89cac59da
--- /dev/null
+++ b/addons/l10n_br/i18n/tr.po
@@ -0,0 +1,36 @@
+# Turkish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-07 06:40+0000\n"
+"PO-Revision-Date: 2011-04-20 20:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish <tr@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: 2011-04-21 04:38+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: l10n_br
+#: model:ir.actions.todo,note:l10n_br.config_call_account_template_brazilian_localization
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"    This is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+
+#. module: l10n_br
+#: model:ir.module.module,description:l10n_br.module_meta_information
+#: model:ir.module.module,shortdesc:l10n_br.module_meta_information
+msgid "Brazilian Localization"
+msgstr ""

From b511ca0034c5de98e7ffb6959ab9abdf0b3c80da Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Thu, 21 Apr 2011 11:04:50 +0530
Subject: [PATCH 126/188] [FIX] crm: fixed attachment problem as list

bzr revid: rha@tinyerp.com-20110421053450-2pj6x32de396uqoh
---
 addons/crm/wizard/crm_add_note.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/wizard/crm_add_note.py b/addons/crm/wizard/crm_add_note.py
index 84c4744b525..442ca2cc1d7 100644
--- a/addons/crm/wizard/crm_add_note.py
+++ b/addons/crm/wizard/crm_add_note.py
@@ -44,9 +44,9 @@ class crm_add_note(osv.osv_memory):
             case = case_list[0]
             user_obj = self.pool.get('res.users')
             user_name = user_obj.browse(cr, uid, [uid], context=context)[0].name
-            attach = [
+            attach = dict(
                 (x.name, base64.decodestring(x.binary)) for x in obj.attachment_ids
-            ]
+            )
             case_pool.history(cr, uid, [case], self.pool.get('email.message').truncate_data(cr, uid, obj.body, context=context), history=False,
                               details=obj.body, email_from=user_name, attach=attach)
 

From 4c65b5fbcc430dda6e246415e4629f0c5cfa4039 Mon Sep 17 00:00:00 2001
From: "Naresh (OpenERP)" <nch@tinyerp.com>
Date: Thu, 21 Apr 2011 12:06:28 +0530
Subject: [PATCH 127/188] [FIX]:printscreen report Title not getting translated
 value

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

bzr revid: nch@tinyerp.com-20110421063628-1hy46os11im1qh0i
---
 openerp/report/printscreen/ps_list.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/openerp/report/printscreen/ps_list.py b/openerp/report/printscreen/ps_list.py
index 851945922ab..8b0ece6eaa0 100644
--- a/openerp/report/printscreen/ps_list.py
+++ b/openerp/report/printscreen/ps_list.py
@@ -67,11 +67,12 @@ class report_printscreen_list(report_int):
         self.groupby_no_leaf = context.get('group_by_no_leaf',False)
         pool = pooler.get_pool(cr.dbname)
         model = pool.get(datas['model'])
-        # Title come from description of model which are specified in py file.
+        model_id = pool.get('ir.model').search(cr, uid, [('model','=',model._name)])
         model_desc = model._description
+        if model_id:
+            model_desc = pool.get('ir.model').browse(cr, uid, model_id[0], context).name
         self.title = model_desc
         datas['ids'] = ids
-        model = pooler.get_pool(cr.dbname).get(datas['model'])
         result = model.fields_view_get(cr, uid, view_type='tree', context=context)
         fields_order =  self.groupby + self._parse_string(result['arch'])
         if self.groupby:

From 1a404f0c968bc0d972d4ef2591ed750582627504 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 21 Apr 2011 13:39:08 +0530
Subject: [PATCH 128/188] [IMP] crm: send_mail_to_salesman method , call
 schedule_with_attach instead of direct send email

bzr revid: hmo@tinyerp.com-20110421080908-c3oc32kkwdygb2e4
---
 addons/crm/wizard/crm_lead_to_opportunity.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index c3367db5096..422efc97973 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -143,15 +143,13 @@ class crm_lead2opportunity_partner(osv.osv_memory):
     def send_mail_to_salesman(self, lead):
         email_to = lead.user_id and lead.user_id.user_email
         if not email_to:
-            return
+            return False
+        message_pool = self.pool.get('email.message')
         email_from = lead.section_id and lead.section_id.user_id and lead.section_id.user_id.user_email or email_to
         partner = lead.partner_id and lead.partner_id.name or lead.partner_name 
         subject = "lead %s converted into opportunity" % lead.name
-        body = "Info \n Id : %s \n Subject: %s \n Partner: %s \n Description : %s " % (lead.id, lead.name, lead.partner_id.name, lead.description)  
-        try :
-            tools.email_send(email_from, [email_to], subject, body)
-        except:
-            pass
+        body = "Info \n Id : %s \n Subject: %s \n Partner: %s \n Description : %s " % (lead.id, lead.name, lead.partner_id.name, lead.description)
+        return message_pool.schedule_with_attach(cr, uid, email_from, [email_to], subject, body)
 
     def action_apply(self, cr, uid, ids, context=None):
         """

From c59d9b69a29a29e0a17a9ff63ca066c2f794d805 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 21 Apr 2011 10:52:28 +0200
Subject: [PATCH 129/188] [REM] extraneous g tacked at the end of 'directive'

bzr revid: xmo@openerp.com-20110421085228-ydy0pc7p594xuj50
---
 doc/source/project.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/source/project.rst b/doc/source/project.rst
index d435a731d40..faa15da2163 100644
--- a/doc/source/project.rst
+++ b/doc/source/project.rst
@@ -65,7 +65,7 @@ RST, using Sphinx's `Python domain`_ [#]_:
   and ``__new__``), using the `info fields`_  as well.
 
 * Attributes (class and instance) should be documented in their
-  class's docstring via the ``.. attribute::`` directiveg, following
+  class's docstring via the ``.. attribute::`` directive, following
   the class's own documentation.
 
 * The relation between modules and module-level attributes is similar:

From 9de7a041ae0f372a24e0860c411ed98575235bd3 Mon Sep 17 00:00:00 2001
From: "Naresh (OpenERP)" <nch@tinyerp.com>
Date: Thu, 21 Apr 2011 14:22:57 +0530
Subject: [PATCH 130/188] [IMP]:added model name in the list view for
 ir.actions.report.xml

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

bzr revid: nch@tinyerp.com-20110421085257-e0aitgy4vuz2m0so
---
 openerp/addons/base/ir/ir.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index 8867dcd2351..6ce6d8c3285 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -474,6 +474,7 @@
                 <tree string="Report xml">
                     <field name="name"/>
                     <field name="type"/>
+                    <field name="model"/>
                     <field name="report_name"/>
                     <field name="report_type"/>
                     <field name="attachment"/>

From 95a248e3751e1eec54fc3e8f7ba4883a62ec7a51 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 21 Apr 2011 10:53:18 +0200
Subject: [PATCH 131/188] [FIX] Fixed bug reported by Daniel Watkins. Invisible
 fields are not added in DOM.

bzr revid: fme@openerp.com-20110421085318-yoeb7pmll4ee0xh0
---
 addons/base/static/src/js/form.js | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 85cdb9b8368..30fcca5d149 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -457,16 +457,14 @@ openerp.base.form.WidgetFrame = openerp.base.form.Widget.extend({
         }
         this.add_widget(widget);
     },
-    add_widget: function(w) {
-        if (!w.invisible) {
-            var current_row = this.table[this.table.length - 1];
-            if (current_row.length && (this.x + w.colspan) > this.columns) {
-                current_row = this.add_row();
-            }
-            current_row.push(w);
-            this.x += w.colspan;
+    add_widget: function(widget) {
+        var current_row = this.table[this.table.length - 1];
+        if (current_row.length && (this.x + widget.colspan) > this.columns) {
+            current_row = this.add_row();
         }
-        return w;
+        current_row.push(widget);
+        this.x += widget.colspan;
+        return widget;
     }
 });
 

From c1d452a0a3f61429b1ec28c5c95e0de9486b675b Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 21 Apr 2011 14:36:51 +0530
Subject: [PATCH 132/188] [IMP] code clean

bzr revid: hmo@tinyerp.com-20110421090651-xaryz386zd7pph5s
---
 addons/mail/wizard/email_compose_message.py | 55 ++-------------------
 1 file changed, 3 insertions(+), 52 deletions(-)

diff --git a/addons/mail/wizard/email_compose_message.py b/addons/mail/wizard/email_compose_message.py
index 5eb12ab65e5..41e25d2cf3b 100644
--- a/addons/mail/wizard/email_compose_message.py
+++ b/addons/mail/wizard/email_compose_message.py
@@ -22,6 +22,7 @@
 from osv import osv
 from osv import fields
 import tools
+from tools.safe_eval import safe_eval as eval
 
 class email_compose_message(osv.osv_memory):
     _name = 'email.compose.message'
@@ -52,57 +53,8 @@ class email_compose_message(osv.osv_memory):
         if not vals:
             return result
 
-        if 'subject' in fields:
-            result.update({'subject' : vals.get('subject','')})
-
-        if 'email_to' in fields:
-            result.update({'email_to' : vals.get('email_to','')})
-
-        if 'email_from' in fields:
-            result.update({'email_from' : vals.get('email_from','')})
-
-        if 'body' in fields:
-            result.update({'body' : vals.get('body','')})
-
-        if 'model' in fields:
-            result.update({'model' : vals.get('model','')})
-
-        if 'email_cc' in fields:
-            result.update({'email_cc' : vals.get('email_cc','')})
-
-        if 'email_bcc' in fields:
-            result.update({'email_bcc' : vals.get('email_bcc','')})
-
-        if 'res_id' in fields:
-            result.update({'res_id' : vals.get('res_id',0)})
-
-        if 'reply_to' in fields:
-            result['reply_to'] = vals.get('reply_to','')
-
-        if 'message_id' in fields:
-            result['message_id'] =  vals.get('message_id','')
-
-        if 'attachment_ids' in fields:
-            result['attachment_ids'] = vals.get('attachment_ids',[])
-
-        if 'user_id' in fields:
-            result['user_id'] = vals.get('user_id',False)
-
-        if 'references' in fields:
-            result['references'] = vals.get('references',False)
-
-        if 'sub_type' in fields:
-            result['sub_type'] = vals.get('sub_type',False)
-
-        if 'headers' in fields:
-            result['headers'] = vals.get('headers',False)
-
-        if 'priority' in fields:
-            result['priority'] = vals.get('priority',False)
-
-        if 'debug' in fields:
-            result['debug'] = vals.get('debug',False)
-
+        for field in fields:
+            result.update({field : vals.get(field, False)})
         return result
 
     _columns = {
@@ -170,7 +122,6 @@ class email_compose_message(osv.osv_memory):
         attachment = {}
         email_ids = []
         for mail in self.browse(cr, uid, ids, context=context):
-
             for attach in mail.attachment_ids:
                 attachment[attach.datas_fname] = attach.datas
             references = False

From b794d93e2a42eac8f3466c290b5ce7bdfc8a8547 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Thu, 21 Apr 2011 14:41:25 +0530
Subject: [PATCH 133/188] [FIX] thunderbird: changes in partner.py for
 history()

bzr revid: rha@tinyerp.com-20110421091125-nevt80ac5y1vn5jy
---
 addons/mail/email_message.py          |  2 +-
 addons/mail/email_thread.py           |  9 ++++----
 addons/thunderbird/partner/partner.py | 33 ++++++++-------------------
 3 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/addons/mail/email_message.py b/addons/mail/email_message.py
index b9e1a7a368e..6fb1bc87035 100644
--- a/addons/mail/email_message.py
+++ b/addons/mail/email_message.py
@@ -295,6 +295,7 @@ class email_message(osv.osv):
         """Return Dictionary Object after parse EML Message String
         @param message: email.message.Message object or string or unicode object
         """
+        msg_txt = message
         if isinstance(message, str):
             msg_txt = email.message_from_string(message)
 
@@ -304,7 +305,6 @@ class email_message(osv.osv):
             message = message.encode('utf-8')
             msg_txt = email.message_from_string(message)
 
-        msg_txt = message
         message_id = msg_txt.get('message-id', False)
         msg = {}
 
diff --git a/addons/mail/email_thread.py b/addons/mail/email_thread.py
index 796fc35bb92..df26adab354 100644
--- a/addons/mail/email_thread.py
+++ b/addons/mail/email_thread.py
@@ -158,10 +158,7 @@ class email_thread(osv.osv):
         if attach is None:
             attach = {}
 
-        model = context.get('thread_model', False)
-        if not model:
-            model = self._name
-        model_pool = self.pool.get(model)
+
 
         if email_date:
             edate = parsedate(email_date)
@@ -171,6 +168,10 @@ class email_thread(osv.osv):
         # The script sends the ids of the threads and not the object list
 
         if all(isinstance(thread_id, (int, long)) for thread_id in threads):
+            model = context.get('thread_model', False)
+            if not model:
+                model = self._name
+            model_pool = self.pool.get(model)
             threads = model_pool.browse(cr, uid, threads, context=context)
 
         att_obj = self.pool.get('ir.attachment')
diff --git a/addons/thunderbird/partner/partner.py b/addons/thunderbird/partner/partner.py
index 3d0f2937a1f..747625532b2 100644
--- a/addons/thunderbird/partner/partner.py
+++ b/addons/thunderbird/partner/partner.py
@@ -23,28 +23,6 @@ from osv import osv
 import base64
 import email
 import tools
-import binascii
-class email_thread(osv.osv):
-    _inherit = "email.thread"
-    def history_message(self, cr, uid, model, res_id, message, context=None):
-        #@param message: string of mail which is read from EML File
-        attachment_pool = self.pool.get('ir.attachment')
-        email_message_pool = self.pool.get('email.message')
-        msg = email_message_pool.parse_message(message)
-        attachments = msg.get('attachments', [])
-        att_ids = []
-        for attachment in attachments:
-            data_attach = {
-                'name': attachment,
-                'datas': binascii.b2a_base64(str(attachments.get(attachment))),
-                'datas_fname': attachment,
-                'description': 'Mail attachment From Thunderbird msg_id: %s' %(msg.get('message_id', '')),
-                'res_model': model,
-                'res_id': res_id,
-            }
-            att_ids.append(attachment_pool.create(cr, uid, data_attach))
-        return self.history(cr, uid, model, res_id, msg, att_ids)
-email_thread()
 
 class thunderbird_partner(osv.osv_memory):
     _name = "thunderbird.partner"
@@ -67,6 +45,7 @@ class thunderbird_partner(osv.osv_memory):
         msg = dictcreate.get('message')
         mail = msg
         msg = self.pool.get('email.message').parse_message(msg)
+        subject = msg.get('Subject', False)
         thread_pool = self.pool.get('email.thread')
         message_id = msg.get('message-id', False)
         msg_pool = self.pool.get('email.message')
@@ -75,7 +54,6 @@ class thunderbird_partner(osv.osv_memory):
         res_ids = []
         obj_list= ['crm.lead','project.issue','hr.applicant','res.partner']
         for ref_id in ref_ids:
-            msg_new = dictcreate.get('message')
             ref = ref_id.split(',')
             model = ref[0]
             res_id = int(ref[1])
@@ -108,7 +86,14 @@ class thunderbird_partner(osv.osv_memory):
                 res['datas'] = base64.b64encode(mail)
                 res['res_id'] = res_id
                 obj_attch.create(cr, uid, res)
-            thread_pool.history_message(cr, uid, model, res_id, msg_new)
+            threads = self.pool.get(model).browse(cr, uid, res_id)
+            thread_pool.history(cr, uid, [threads], subject,
+                            email=msg.get('to', False),
+                            details=msg.get('body', False),
+                            email_from=msg.get('from', False),
+                            message_id= msg.get('message-id', False),
+                            attach= msg.get('attachments', {}),
+                            email_date= msg.get('date', False))
             res_ids.append(res_id)
         return len(res_ids)
 

From 4b2f93cb343874fb828a62694a09a858f7cc45c0 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Thu, 21 Apr 2011 14:49:15 +0530
Subject: [PATCH 134/188] [FIX]: removed method _history() and called history()
 instead

bzr revid: rha@tinyerp.com-20110421091915-fw1sr549av69mm4b
---
 addons/crm/crm.py                            | 21 ++++++--------------
 addons/crm/crm_action_rule.py                |  2 +-
 addons/crm/wizard/crm_merge_opportunities.py |  2 +-
 addons/project_issue/project_issue.py        |  2 +-
 addons/project_mailgate/project_mailgate.py  | 18 +++++------------
 addons/sale_crm/wizard/crm_make_sale.py      |  2 +-
 6 files changed, 15 insertions(+), 32 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 0c84820b5fa..4459f7ca217 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -307,14 +307,6 @@ class crm_case(object):
         else:
             return {'value': {'phone': address.phone}}
 
-    def _history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, email_from=False, message_id=False, attach=[], context=None):
-        thread_pool = self.pool.get('email.thread')
-        return thread_pool.history(cr, uid, cases, keyword, history=history,\
-                                       subject=subject, email=email, \
-                                       details=details, email_from=email_from,\
-                                       message_id=message_id, attach=attach, \
-                                       context=context)
-
     def case_open(self, cr, uid, ids, *args):
         """Opens Case
         @param self: The object pointer
@@ -325,7 +317,7 @@ class crm_case(object):
         """
 
         cases = self.browse(cr, uid, ids)
-        self._history(cr, uid, cases, _('Open'))
+        self.history(cr, uid, cases, _('Open'))
         for case in cases:
             data = {'state': 'open', 'active': True}
             if not case.user_id:
@@ -346,7 +338,7 @@ class crm_case(object):
         """
         cases = self.browse(cr, uid, ids)
         cases[0].state # to fill the browse record cache
-        self._history(cr, uid, cases, _('Close'))
+        self.history(cr, uid, cases, _('Close'))
         self.write(cr, uid, ids, {'state': 'done',
                                   'date_closed': time.strftime('%Y-%m-%d %H:%M:%S'),
                                   })
@@ -377,7 +369,7 @@ class crm_case(object):
                 raise osv.except_osv(_('Error !'), _('You can not escalate, You are already at the top level regarding your sales-team category.'))
             self.write(cr, uid, [case.id], data)
         cases = self.browse(cr, uid, ids)
-        self._history(cr, uid, cases, _('Escalate'))
+        self.history(cr, uid, cases, _('Escalate'))
         self._action(cr, uid, cases, 'escalate')
         return True
 
@@ -391,7 +383,7 @@ class crm_case(object):
         """
         cases = self.browse(cr, uid, ids)
         cases[0].state # to fill the browse record cache
-        self._history(cr, uid, cases, _('Cancel'))
+        self.history(cr, uid, cases, _('Cancel'))
         self.write(cr, uid, ids, {'state': 'cancel',
                                   'active': True})
         self._action(cr, uid, cases, 'cancel')
@@ -410,7 +402,7 @@ class crm_case(object):
         """
         cases = self.browse(cr, uid, ids)
         cases[0].state # to fill the browse record cache
-        self._history(cr, uid, cases, _('Pending'))
+        self.history(cr, uid, cases, _('Pending'))
         self.write(cr, uid, ids, {'state': 'pending', 'active': True})
         self._action(cr, uid, cases, 'pending')
         return True
@@ -425,7 +417,7 @@ class crm_case(object):
         """
         cases = self.browse(cr, uid, ids)
         cases[0].state # to fill the browse record cache
-        self._history(cr, uid, cases, _('Draft'))
+        self.history(cr, uid, cases, _('Draft'))
         self.write(cr, uid, ids, {'state': 'draft', 'active': True})
         self._action(cr, uid, cases, 'draft')
         return True
@@ -498,7 +490,6 @@ class crm_case(object):
                 openobject_id=str(case.id),
                 attach=attach_to_send
             )
-            self._history(cr, uid, [case], _('Send'), history=True, subject=subject, email=dest, details=body, email_from=src)
         return True
 
     def _check(self, cr, uid, ids=False, context=None):
diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py
index acb7801c7c9..f510ac73c4b 100644
--- a/addons/crm/crm_action_rule.py
+++ b/addons/crm/crm_action_rule.py
@@ -125,7 +125,7 @@ this if you want the rule to send an email to the partner."),
 
         # Put state change by rule in communication history
         if hasattr(obj, 'state') and action.act_state:
-            model_obj._history(cr, uid, [obj], _(action.act_state))
+            model_obj.history(cr, uid, [obj], _(action.act_state))
 
         model_obj.write(cr, uid, [obj.id], write, context)
         emails = []
diff --git a/addons/crm/wizard/crm_merge_opportunities.py b/addons/crm/wizard/crm_merge_opportunities.py
index 82e3f6402fc..bdf179a48aa 100644
--- a/addons/crm/wizard/crm_merge_opportunities.py
+++ b/addons/crm/wizard/crm_merge_opportunities.py
@@ -148,7 +148,7 @@ class crm_merge_opportunity(osv.osv_memory):
         subject = subject[0] + ", ".join(subject[1:])
         details = "\n\n".join(details)
 
-        opp_obj._history(cr, uid, [first_opportunity], subject, details=details)
+        opp_obj.history(cr, uid, [first_opportunity], subject, details=details)
         #data.update({'message_ids' : [(6, 0 ,self._concat_o2m('message_ids', op_ids))]})
         opp_obj.write(cr, uid, [first_opportunity.id], data)
         unlink_ids = map(lambda x: x.id, tail_opportunities)
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index e9e5521d94b..a88ee17496e 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -361,7 +361,7 @@ class project_issue(crm.crm_case, osv.osv):
             else:
                 raise osv.except_osv(_('Warning !'), _('You cannot escalate this issue.\nThe relevant Project has not configured the Escalation Project!'))
             self.write(cr, uid, [case.id], data)
-        self._history(cr, uid, cases, _('Escalate'))
+        self.history(cr, uid, cases, _('Escalate'))
         return True
 
     def message_new(self, cr, uid, msg, context=None):
diff --git a/addons/project_mailgate/project_mailgate.py b/addons/project_mailgate/project_mailgate.py
index dc0f04aeddf..cea05b3fa44 100644
--- a/addons/project_mailgate/project_mailgate.py
+++ b/addons/project_mailgate/project_mailgate.py
@@ -120,30 +120,22 @@ class project_tasks(osv.osv):
             return len(res) and res[0] or False
         return res
 
-    def _history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, email_from=False, message_id=False, attach=[], context=None):
-        thread_pool = self.pool.get('email.thread')
-        return thread_pool.history(cr, uid, cases, keyword, history=history,\
-                                       subject=subject, email=email, \
-                                       details=details, email_from=email_from,\
-                                       message_id=message_id, attach=attach, \
-                                       context=context)
-
     def do_draft(self, cr, uid, ids, *args, **kwargs):
         res = super(project_tasks, self).do_draft(cr, uid, ids, *args, **kwargs)
         tasks = self.browse(cr, uid, ids)
-        self._history(cr, uid, tasks, _('Draft'))
+        self.history(cr, uid, tasks, _('Draft'))
         return res
 
     def do_open(self, cr, uid, ids, *args, **kwargs):
         res = super(project_tasks, self).do_open(cr, uid, ids, *args, **kwargs)
         tasks = self.browse(cr, uid, ids)
-        self._history(cr, uid, tasks, _('Open'))
+        self.history(cr, uid, tasks, _('Open'))
         return res
 
     def do_pending(self, cr, uid, ids, *args, **kwargs):
         res = super(project_tasks, self).do_pending(cr, uid, ids, *args, **kwargs)
         tasks = self.browse(cr, uid, ids)
-        self._history(cr, uid, tasks, _('Pending'))
+        self.history(cr, uid, tasks, _('Pending'))
         return res
 
     def do_close(self, cr, uid, ids, *args, **kwargs):
@@ -151,13 +143,13 @@ class project_tasks(osv.osv):
         tasks = self.browse(cr, uid, ids)
         for task in tasks:
             if task.state == 'done':
-                self._history(cr, uid, tasks, _('Done'))
+                self.history(cr, uid, tasks, _('Done'))
         return res
 
     def do_cancel(self, cr, uid, ids, *args, **kwargs):
         res = super(project_tasks, self).do_cancel(cr, uid, ids, *args, **kwargs)
         tasks = self.browse(cr, uid, ids)
-        self._history(cr, uid, tasks, _('Cancel'))
+        self.history(cr, uid, tasks, _('Cancel'))
         return res
 
 project_tasks()
diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index f48df128e31..2c7f6cb0d69 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -107,7 +107,7 @@ class crm_make_sale(osv.osv_memory):
                 new_ids.append(new_id)
                 message = _("Opportunity  '%s' is converted to Quotation.") % (case.name)
                 self.log(cr, uid, case.id, message)
-                case_obj._history(cr, uid, [case], _("Converted to Sales Quotation(id: %s).") % (new_id))
+                case_obj.history(cr, uid, [case], _("Converted to Sales Quotation(id: %s).") % (new_id))
 
             if make.close:
                 case_obj.case_close(cr, uid, data)

From cb7df3bc534f04f28d02b17a3b27438e2c65b811 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 21 Apr 2011 11:23:22 +0200
Subject: [PATCH 135/188] [IMP] Added pointer-cursor for list's fields cells

bzr revid: fme@openerp.com-20110421092322-9p2gf2hylynbox7b
---
 addons/base/static/src/css/base.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index cf6d0beabd4..2ed2b27ba28 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -486,6 +486,9 @@ body.openerp {
     vertical-align: middle;
 }
 
+.openerp .oe-listview .oe-field-cell {
+    cursor: pointer;
+}
 .openerp .oe-listview .oe-field-cell button {
     padding: 0;
     border: none;

From dce1a9ab59f11e75fad0d1ba92c60024614e31e7 Mon Sep 17 00:00:00 2001
From: "Naresh (OpenERP)" <nch@tinyerp.com>
Date: Thu, 21 Apr 2011 15:04:00 +0530
Subject: [PATCH 136/188] [FIX]:added missing of parsing of 'help' attribute
 while synchronizing translations

bzr revid: nch@tinyerp.com-20110421093400-aigxqul71iw2avph
---
 openerp/tools/translate.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/openerp/tools/translate.py b/openerp/tools/translate.py
index 6b23ddd25a8..9723135ff49 100644
--- a/openerp/tools/translate.py
+++ b/openerp/tools/translate.py
@@ -503,6 +503,8 @@ def trans_parse_view(de):
             res.append(de.text.encode("utf8"))
     if de.get("string"):
         res.append(de.get('string').encode("utf8"))
+    if de.get("help"):
+        res.append(de.get('help').encode("utf8"))
     if de.get("sum"):
         res.append(de.get('sum').encode("utf8"))
     if de.get("confirm"):
@@ -993,7 +995,7 @@ def resetlocale():
 def load_language(cr, lang):
     """Loads a translation terms for a language.
     Used mainly to automate language loading at db initialization.
-    
+
     :param lang: language ISO code with optional _underscore_ and l10n flavor (ex: 'fr', 'fr_BE', but not 'fr-BE')
     :type lang: str
     """

From 2c9825a07be5c6c76f488c82bda23f31c0b1d2fc Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Thu, 21 Apr 2011 15:23:16 +0530
Subject: [PATCH 137/188] [FIX] thunderbird: changes in history() of partner.py

bzr revid: rha@tinyerp.com-20110421095316-zccag93g4spnzeja
---
 addons/thunderbird/partner/partner.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/addons/thunderbird/partner/partner.py b/addons/thunderbird/partner/partner.py
index 747625532b2..d67238db5fc 100644
--- a/addons/thunderbird/partner/partner.py
+++ b/addons/thunderbird/partner/partner.py
@@ -87,13 +87,16 @@ class thunderbird_partner(osv.osv_memory):
                 res['res_id'] = res_id
                 obj_attch.create(cr, uid, res)
             threads = self.pool.get(model).browse(cr, uid, res_id)
-            thread_pool.history(cr, uid, [threads], subject,
-                            email=msg.get('to', False),
-                            details=msg.get('body', False),
-                            email_from=msg.get('from', False),
-                            message_id= msg.get('message-id', False),
-                            attach= msg.get('attachments', {}),
-                            email_date= msg.get('date', False))
+            thread_pool.history(cr, uid, [threads], _('receive'), history=True,
+                            subject = msg.get('subject'),
+                            email = msg.get('to'),
+                            details = msg.get('body'),
+                            email_from = msg.get('from'),
+                            email_cc = msg.get('cc'),
+                            message_id = msg.get('message-id'),
+                            references = msg.get('references', False) or msg.get('in-reply-to', False),
+                            attach = msg.get('attachments', {}),
+                            email_date = msg.get('date'))
             res_ids.append(res_id)
         return len(res_ids)
 

From 101084dfa07e18341724bd2fe55c3cd627839bc8 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 21 Apr 2011 12:12:12 +0200
Subject: [PATCH 138/188] [IMP] Improved sidebar styling

bzr revid: fme@openerp.com-20110421101212-bomgipspn3tlwahu
---
 addons/base/static/src/css/base.css | 11 +++++---
 addons/base/static/src/xml/base.xml | 39 +++++++++++++----------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index 2ed2b27ba28..cd39b2ad147 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -336,8 +336,9 @@ body.openerp {
 }
 
 /* Main Application */
-.openerp .application {
+.openerp .oe-application {
     padding: 0px;
+    height: 100%;
 }
 
 .openerp h2.oe_view_title {
@@ -676,13 +677,14 @@ body.openerp {
 }
 
 .openerp .view-manager-main-content {
+    width: 100%;
     padding: 6px;
 }
 
 .openerp .view-manager-main-sidebar {
-    width:0;
-    padding:0;
-    margin:0;
+    width: 180px;
+    padding: 0;
+    margin: 0;
 }
 
 .openerp .sidebar-main-div {
@@ -749,6 +751,7 @@ body.openerp {
 }
 
 .openerp .toggle-sidebar {
+    cursor: pointer;
     border-color: #D2CFCF;
     border-style: solid;
     border-width: 1px;
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index cbb90ca9e2e..163ae8d335c 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -33,10 +33,7 @@
         <td valign="top" id="oe_secondary_menu" class="secondary_menu">
         </td>
         <td valign="top" width="100%" height="100%">
-            <div id="oe_main" class="main">
-                <div id="oe_app" class="application"></div>
-                <div id="oe_sidebar"></div>
-            </div>
+            <div id="oe_app" class="oe-application"></div>
         </td>
     </tr>
     <tr>
@@ -135,23 +132,23 @@
 <t t-name="ViewManager">
     <table class="view-manager-main-table">
     <tr>
-    <td class="view-manager-main-content">
-    <!-- TODO prefix id with the element_id of the controller t-attf-id="#{prefix}_localid" -->
-    <div class="oe_vm_switch">
-        <t t-foreach="views" t-as="view">
-            <button type="button" t-att-data-view-type="view[1]">
-                <t t-esc="view[1]"/>
-            </button>
-        </t>
-    </div>
-    <div t-attf-id="#{prefix}_search"/>
-    <t t-foreach="views" t-as="view">
-        <div t-attf-id="#{prefix}_view_#{view[1]}"/>
-    </t>
-	</td>
-	<td class="view-manager-main-sidebar">
-	</td>
-	</tr>
+        <td class="view-manager-main-content">
+            <!-- TODO prefix id with the element_id of the controller t-attf-id="#{prefix}_localid" -->
+            <div class="oe_vm_switch">
+                <t t-foreach="views" t-as="view">
+                    <button type="button" t-att-data-view-type="view[1]">
+                        <t t-esc="view[1]"/>
+                    </button>
+                </t>
+            </div>
+            <div t-attf-id="#{prefix}_search" t-opentag="true"/>
+            <t t-foreach="views" t-as="view">
+                <div t-attf-id="#{prefix}_view_#{view[1]}"/>
+            </t>
+        </td>
+        <td class="view-manager-main-sidebar">
+        </td>
+    </tr>
     </table>
 </t>
 <table t-name="ListView">

From d087f5f37abb4d2548bec1301eb17948c2b3a34e Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 21 Apr 2011 12:24:54 +0200
Subject: [PATCH 139/188] [IMP] Quick & dirty support for non-scalar fields
 values in listviews

bzr revid: fme@openerp.com-20110421102454-cumtcqzyo0smgybo
---
 addons/base/static/src/xml/base.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 163ae8d335c..1221c811039 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -214,7 +214,8 @@
                 <t t-set="is_button" t-value="column.tag === 'button'"/>
                 <!-- TODO: get correct widget from form -->
                 <t t-if="!is_button and row['data'][column.id].value">
-                    <t t-esc="row['data'][column.id].value"/>
+                    <t t-set="value" t-value="row['data'][column.id].value"/>
+                    <t t-esc="value instanceof Array ? value[1] : value"/>
                 </t>
                 <button type="button" t-att-title="column.help"
                         t-if="is_button">

From bf476cddf628473ff96ad7b35090d32ab9fde3dc Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 21 Apr 2011 13:59:16 +0200
Subject: [PATCH 140/188] [IMP] form: no colon for tag label. Removed "Reload
 OpenERP" button

bzr revid: fme@openerp.com-20110421115916-4bdhufvcq85dhujb
---
 addons/base/static/src/xml/base.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 1221c811039..b49ef2c7d6a 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -18,9 +18,6 @@
         </div>
     </div>
     <div id="oe_login" class="login"></div>
-    <div style="position: absolute; right: 2px; top: 38px;">
-        <button onclick="QWeb.add_template('base.xml'); $('body').css('background-color', '#FFFF9C'); setTimeout(function() { $('body').css('background-color', '#FFF'); }, 500);">Reload QWEB</button>
-    </div>
     <table border="0" cellpadding="0" cellspacing="0" width="100%" height="100%"
         t-att-class="'main_table' + (typeof kitten == 'undefined' ? '' : ' kitten-mode-activated')">
     <tr>
@@ -297,7 +294,7 @@
            t-att-ondblclick="'console.log(\'' + widget.element_id + '\', openerp.screen.' + widget.element_id + ')'">
         <t t-esc="widget.string"/>
         <span t-if="widget.help">?</span>
-        <t t-if="widget.string">:</t>
+        <t t-if="widget.string and widget.node.tag != 'label'">:</t>
     </label>
 </t>
 <t t-name="FieldChar">

From 96386dbdd90a9ec9074796fb4e5691dd1b930300 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 21 Apr 2011 12:48:43 +0200
Subject: [PATCH 141/188] [REM] disable dummy actions implementation in lists,
 so nobody is confused as to their status

bzr revid: xmo@openerp.com-20110421104843-5sof6p8uuhq7gsap
---
 addons/base/static/src/js/list.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 5a08b96ac14..c3b5075126c 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -108,8 +108,9 @@ openerp.base.ListView = openerp.base.Controller.extend(
 
                 var context = _.extend(
                         {}, self.dataset.context, field.context || {});
-                self.dataset.call(action, [row.data.id.value], [context],
-                                  self.do_reload);
+                self.notification.notify(
+                    '[Dummy] Execute action', self.dataset.model + '#' + action + "([" + row.data.id.value + '])');
+                // TODO: implement actions correctly once the corresponding manager has been extracted (and filled)
                 e.stopImmediatePropagation();
             });
         $table.delegate(

From 3d6a623b1acc142e10073bade3ca85cfa0bd116c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 21 Apr 2011 13:59:24 +0200
Subject: [PATCH 142/188] [IMP] documentation for list view as it will be
 needed for some new widgets

bzr revid: xmo@openerp.com-20110421115924-7gj2tyrzm789bkom
---
 addons/base/static/src/js/list.js | 84 +++++++++++++++++++++++++++----
 1 file changed, 75 insertions(+), 9 deletions(-)

diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index c3b5075126c..c60828732e8 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -13,6 +13,15 @@ openerp.base.ListView = openerp.base.Controller.extend(
         'addable': "New"
     },
     /**
+     * Core class for list-type displays.
+     *
+     * As a view, needs a number of view-related parameters to be correctly
+     * instantiated, provides options and overridable methods for behavioral
+     * customization.
+     *
+     * See constructor parameters and method documentations for information on
+     * the default behaviors and possible options for the list view.
+     *
      * @constructs
      * @param view_manager
      * @param session An OpenERP session object
@@ -37,11 +46,42 @@ openerp.base.ListView = openerp.base.Controller.extend(
 
         this.options = _.extend({}, this.defaults, options || {});
     },
+    /**
+     * View startup method, the default behavior is to set the ``oe-listview``
+     * class on its root element and to perform an RPC load call.
+     *
+     * @returns {$.Deferred} loading promise
+     */
     start: function() {
         this.$element.addClass('oe-listview');
-        return this.rpc("/base/listview/load", {"model": this.model, "view_id":this.view_id,
-            toolbar:!!this.view_manager.sidebar}, this.on_loaded);
+        return this.rpc("/base/listview/load", {
+            model: this.model,
+            view_id: this.view_id,
+            toolbar: !!this.view_manager.sidebar
+        }, this.on_loaded);
     },
+    /**
+     * Called after loading the list view's description, sets up such things
+     * as the view table's columns, renders the table itself and hooks up the
+     * various table-level and row-level DOM events (action buttons, deletion
+     * buttons, selection of records, [New] button, selection of a given
+     * record, ...)
+     *
+     * Sets up the following:
+     *
+     * * Processes arch and fields to generate a complete field descriptor for each field
+     * * Create the table itself and allocate visible columns
+     * * Hook in the top-level (header) [New|Add] and [Delete] button
+     * * Sets up showing/hiding the top-level [Delete] button based on records being selected or not
+     * * Sets up event handlers for action buttons and per-row deletion button
+     * * Hooks global callback for clicking on a row
+     * * Sets up its sidebar, if any
+     *
+     * @param {Object} data wrapped fields_view_get result
+     * @param {Object} data.fields_view fields_view_get result (processed)
+     * @param {Object} data.fields_view.fields mapping of fields for the current model
+     * @param {Object} data.fields_view.arch current list view descriptor
+     */
     on_loaded: function(data) {
         var self = this;
         this.fields_view = data.fields_view;
@@ -128,6 +168,8 @@ openerp.base.ListView = openerp.base.Controller.extend(
     /**
      * Fills the table with the provided records after emptying it
      *
+     * TODO: should also re-load the table itself, as e.g. columns may have changed
+     *
      * @param {Array} records the records to fill the list view with
      * @returns {Promise} promise to the end of view rendering (list views are asynchronously filled for improved responsiveness)
      */
@@ -189,14 +231,19 @@ openerp.base.ListView = openerp.base.Controller.extend(
         });
     },
     /**
-     * Asks the view manager to switch to a different view, using the provided
-     * record index (within the current dataset).
+     * Used to handle a click on a table row, if no other handler caught the
+     * event.
+     *
+     * The default implementation asks the list view's view manager to switch
+     * to a different view (by calling
+     * :js:func:`~openerp.base.ViewManager.on_mode_switch`), using the
+     * provided record index (within the current list view's dataset).
      *
      * If the index is null, ``switch_to_record`` asks for the creation of a
      * new record.
      *
      * @param {Number|null} index the record index (in the current dataset) to switch to
-     * @param {String} [view="form"] the view to switch to
+     * @param {String} [view="form"] the view type to switch to
      */
     switch_to_record:function (index, view) {
         view = view || 'form';
@@ -205,6 +252,16 @@ openerp.base.ListView = openerp.base.Controller.extend(
             this.view_manager.on_mode_switch(view);
         }, this));
     },
+    /**
+     * Base handler for clicking on a row, discovers the index of the record
+     * corresponding to the clicked row in the list view's dataset.
+     *
+     * Should not be overridden, use
+     * :js:func:`~openerp.base.ListView.switch_to_record` to customize the
+     * behavior of the list view when clicking on a row instead.
+     *
+     * @param {Object} event jQuery DOM event object
+     */
     on_select_row: function (event) {
         var $target = $(event.currentTarget);
         if (!$target.parent().is('tbody')) {
@@ -217,8 +274,8 @@ openerp.base.ListView = openerp.base.Controller.extend(
         if (index == undefined || index === -1) {
             return;
         }
-            this.switch_to_record(index);
-        },
+        this.switch_to_record(index);
+    },
     do_show: function () {
         this.$element.show();
         if (this.hidden) {
@@ -247,6 +304,15 @@ openerp.base.ListView = openerp.base.Controller.extend(
             'domain': this.dataset.domain
         }, this.do_fill_table);
     },
+    /**
+     * Event handler for a search, asks for the computation/folding of domains
+     * and contexts (and group-by), then reloads the view's content.
+     *
+     * @param {Array} domains a sequence of literal and non-literal domains
+     * @param {Array} contexts a sequence of literal and non-literal contexts
+     * @param {Array} groupbys a sequence of literal and non-literal group-by contexts
+     * @returns {$.Deferred} fold request evaluation promise
+     */
     do_search: function (domains, contexts, groupbys) {
         var self = this;
         return this.rpc('/base/session/eval_domain_and_context', {
@@ -267,7 +333,7 @@ openerp.base.ListView = openerp.base.Controller.extend(
     /**
      * Handles the signal to delete a line from the DOM
      *
-     * @param e
+     * @param e jQuery event object
      */
     do_delete: function (e) {
         // don't link to forms
@@ -296,7 +362,7 @@ openerp.base.ListView = openerp.base.Controller.extend(
     },
     /**
      * Gets the ids of all currently selected records, if any
-     * @returns a list of ids, empty if no record is selected (or the list view is not selectable
+     * @returns {Array} empty if no record is selected (or the list view is not selectable)
      */
     get_selection: function () {
         if (!this.options.selectable) {

From ddfac1ecf7c63ce041ae636294a9697dbdff019b Mon Sep 17 00:00:00 2001
From: "Naresh (OpenERP)" <nch@tinyerp.com>
Date: Thu, 21 Apr 2011 17:34:43 +0530
Subject: [PATCH 143/188] [IMP]:optimization

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

bzr revid: nch@tinyerp.com-20110421120443-d30x5z0u1wciut42
---
 openerp/osv/orm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index c0b2e65c678..70d22ed1dc4 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -1616,7 +1616,7 @@ class orm_template(object):
                     _rec_name = self._columns.keys()[0]
                 xml = '<?xml version="1.0" encoding="utf-8"?>' \
                        '<tree string="%s"><field name="%s"/></tree>' \
-                       % (self._description, self._rec_name)
+                       % (self._description, _rec_name)
 
             elif view_type == 'calendar':
                 xml = self.__get_default_calendar_view()

From 17be3b65996923644b6553dd88b5408894314e9d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 21 Apr 2011 14:06:08 +0200
Subject: [PATCH 144/188] [ADD] options for sortable and reorderable list
 views, so the API is pretty much complete

bzr revid: xmo@openerp.com-20110421120608-vefcelpe5fxsz1op
---
 addons/base/static/src/js/list.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index c60828732e8..04a97d902cf 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -10,7 +10,12 @@ openerp.base.ListView = openerp.base.Controller.extend(
         // whether the column headers should be displayed
         'header': true,
         // display addition button, with that label
-        'addable': "New"
+        'addable': "New",
+        // whether the list view can be sorted, note that once a view has been
+        // sorted it can not be reordered anymore
+        'sortable': true,
+        // whether the view rows can be reordered (via vertical drag & drop)
+        'reorderable': true
     },
     /**
      * Core class for list-type displays.
@@ -33,6 +38,8 @@ openerp.base.ListView = openerp.base.Controller.extend(
      * @param {Boolean} [options.header=true] should the list's header be displayed
      * @param {Boolean} [options.deletable=true] are the list rows deletable
      * @param {null|String} [options.addable="New"] should the new-record button be displayed, and what should its label be. Use ``null`` to hide the button.
+     * @param {Boolean} [options.sortable=true] is it possible to sort the table by clicking on column headers
+     * @param {Boolean} [options.reorderable=true] is it possible to reorder list rows
      */
     init: function(view_manager, session, element_id, dataset, view_id, options) {
         this._super(session, element_id);
@@ -374,6 +381,8 @@ openerp.base.ListView = openerp.base.Controller.extend(
             return rows[$(this).prevAll().length].data.id.value;
         }).get();
     }
+    // TODO: implement sort (click on column headers), if sorted, the list can not be reordered anymore
+    // TODO: implement reorder (drag and drop rows)
 });
 
 openerp.base.TreeView = openerp.base.Controller.extend({

From a383be5549df8b8b3393c446c86759983297ec94 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 21 Apr 2011 15:12:39 +0200
Subject: [PATCH 145/188] [IMP] add a level of nesting to do_fill result so
 do_fill_table can get the view data, also fix failing tests involving
 do_fill_table

bzr revid: xmo@openerp.com-20110421131239-dbr5cg27qntj0nuu
---
 addons/base/controllers/main.py   | 17 +++++++++------
 addons/base/static/src/js/list.js |  7 ++++--
 addons/base/static/test/list.js   | 36 +++++++++++++++----------------
 3 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index bdedb85e63d..f51b42fe4a6 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -573,19 +573,22 @@ class ListView(View):
         :param int limit: search limit, for pagination
         :returns: hell if I have any idea yet
         """
-        view = self.fields_view_get(request, model, id)
+        view = self.fields_view_get(request, model, id, toolbar=True)
 
         rows = DataSet().do_search_read(request, model,
                                         offset=offset, limit=limit,
                                         domain=domain)
         eval_context = request.session.evaluation_context(
             request.context)
-        return [
-            {'data': dict((key, {'value': value})
-                          for key, value in row.iteritems()),
-             'color': self.process_colors(view, row, eval_context)}
-            for row in rows
-        ]
+        return {
+            'view': view,
+            'records': [
+                {'data': dict((key, {'value': value})
+                              for key, value in row.iteritems()),
+                 'color': self.process_colors(view, row, eval_context)}
+                for row in rows
+            ]
+        }
 
     def process_colors(self, view, row, context):
         colors = view['arch']['attrs'].get('colors')
diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 04a97d902cf..862c9df3868 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -177,10 +177,13 @@ openerp.base.ListView = openerp.base.Controller.extend(
      *
      * TODO: should also re-load the table itself, as e.g. columns may have changed
      *
-     * @param {Array} records the records to fill the list view with
+     * @param {Object} result filling result
+     * @param {Array} [result.view] the new view (wrapped fields_view_get result)
+     * @param {Array} result.records records the records to fill the list view with
      * @returns {Promise} promise to the end of view rendering (list views are asynchronously filled for improved responsiveness)
      */
-    do_fill_table: function(records) {
+    do_fill_table: function(result) {
+        var records = result.records;
         var $table = this.$element.find('table');
         this.rows = records;
 
diff --git a/addons/base/static/test/list.js b/addons/base/static/test/list.js
index c0a34aa71be..92d0bdd5fd5 100644
--- a/addons/base/static/test/list.js
+++ b/addons/base/static/test/list.js
@@ -34,15 +34,15 @@ $(document).ready(function () {
     asyncTest('render selection checkboxes', 2, function () {
         var listview = new openerp.base.ListView(
                 {}, null,
-                'qunit-fixture', {model: null});
+                'qunit-fixture', {model: null, ids: [null, null, null], index: 0});
 
         listview.on_loaded(fvg);
 
-        listview.do_fill_table([
+        listview.do_fill_table({records: [
                 {data: {id: {value: null}}},
                 {data: {id: {value: null}}},
                 {data: {id: {value: null}}}
-        ]).then(function () {
+        ]}).then(function () {
             ok(are(listview.$element.find('tbody th'),
                    '.oe-record-selector'));
             ok(are(listview.$element.find('tbody th input'),
@@ -53,30 +53,30 @@ $(document).ready(function () {
     asyncTest('render no checkbox if selectable=false', 1, function () {
         var listview = new openerp.base.ListView(
                 {}, null,
-                'qunit-fixture', {model: null}, false,
+                'qunit-fixture', {model: null, ids: [null, null, null], index: 0}, false,
                 {selectable: false});
 
         listview.on_loaded(fvg);
 
-        listview.do_fill_table([
+        listview.do_fill_table({records: [
                 {data: {id: {value: null}}},
                 {data: {id: {value: null}}},
                 {data: {id: {value: null}}}
-        ]).then(function () {
+        ]}).then(function () {
             equal(listview.$element.find('tbody th').length, 0);
             start();
         });
     });
     asyncTest('select a bunch of records', 2, function () {
         var listview = new openerp.base.ListView(
-                {}, null, 'qunit-fixture', {model: null});
+                {}, null, 'qunit-fixture', {model: null, ids: [1, 2, 3], index: 0});
         listview.on_loaded(fvg);
 
-        listview.do_fill_table([
+        listview.do_fill_table({records: [
                 {data: {id: {value: 1}}},
                 {data: {id: {value: 2}}},
                 {data: {id: {value: 3}}}
-        ]).then(function () {
+        ]}).then(function () {
             listview.$element.find('tbody th input:eq(2)')
                              .attr('checked', true);
             deepEqual(listview.get_selection(), [3]);
@@ -88,15 +88,15 @@ $(document).ready(function () {
     });
     asyncTest('render deletion button if list is deletable', 1, function () {
         var listview = new openerp.base.ListView(
-                {}, null, 'qunit-fixture', {model: null});
+                {}, null, 'qunit-fixture', {model: null, ids: [null, null, null], index: 0});
 
         listview.on_loaded(fvg);
 
-        listview.do_fill_table([
+        listview.do_fill_table({records: [
                 {data: {id: {value: null}}},
                 {data: {id: {value: null}}},
                 {data: {id: {value: null}}}
-        ]).then(function () {
+        ]}).then(function () {
             equal(
                 listview.$element.find('tbody tr td.oe-record-delete button').length,
                 3);
@@ -109,15 +109,15 @@ $(document).ready(function () {
         var listview = new openerp.base.ListView(
                 {}, null, 'qunit-fixture', {model: null, unlink: function (ids) {
             deleted = ids;
-        }});
+        }, ids: [1, 2, 3], index: 0});
 
         listview.on_loaded(fvg);
 
-        listview.do_fill_table([
+        listview.do_fill_table({records: [
                 {data: {id: {value: 1}}},
                 {data: {id: {value: 2}}},
                 {data: {id: {value: 3}}}
-        ]).then(function () {
+        ]}).then(function () {
             listview.$element.find('tbody td.oe-record-delete:eq(2) button').click();
             deepEqual(deleted, [3]);
             listview.$element.find('tbody td.oe-record-delete:eq(0) button').click();
@@ -130,15 +130,15 @@ $(document).ready(function () {
         var listview = new openerp.base.ListView(
                 {}, null, 'qunit-fixture', {model: null, unlink: function (ids) {
             deleted = ids;
-        }});
+        }, ids: [1, 2, 3], index: 0});
 
         listview.on_loaded(fvg);
 
-        listview.do_fill_table([
+        listview.do_fill_table({records: [
                 {data: {id: {value: 1}}},
                 {data: {id: {value: 2}}},
                 {data: {id: {value: 3}}}
-        ]).then(function () {
+        ]}).then(function () {
             listview.$element.find('tbody th input:eq(2)')
                              .attr('checked', true);
             listview.$element.find('tbody th input:eq(1)')

From 912738c712df98710b9044f9c07db1b59895328d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 21 Apr 2011 15:13:28 +0200
Subject: [PATCH 146/188] [IMP] regenerate table on load in case of columns
 changes

bzr revid: xmo@openerp.com-20110421131328-7ydomgj1w1fxl3kp
---
 addons/base/static/src/js/list.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 862c9df3868..8035616e59a 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -183,6 +183,9 @@ openerp.base.ListView = openerp.base.Controller.extend(
      * @returns {Promise} promise to the end of view rendering (list views are asynchronously filled for improved responsiveness)
      */
     do_fill_table: function(result) {
+        if (result.view) {
+            this.on_loaded({fields_view: result.view});
+        }
         var records = result.records;
         var $table = this.$element.find('table');
         this.rows = records;

From 85c28f6d2332ac529e3d17f7c2efe20089a0fd57 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 21 Apr 2011 15:23:54 +0200
Subject: [PATCH 147/188] [ADD] Added /base/action/load controller

bzr revid: fme@openerp.com-20110421132354-ubji3zz8k181qlxu
---
 addons/base/controllers/main.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index f51b42fe4a6..554b04099ed 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -621,5 +621,12 @@ class Action(openerpweb.Controller):
     _cp_path = "/base/action"
 
     @openerpweb.jsonrequest
-    def load(self, req, action_id):
-        return {}
+    def load(self, req, action_id, context={}):
+        Actions = req.session.model('ir.actions.actions')
+        value = False
+        action_type = Actions.read([action_id], ['type'], context)
+        if action_type:
+            action = req.session.model(action_type[0]['type']).read([action_id], False, context)
+            if action:
+                value = action[0]
+        return {'value': value}

From 190d61fbb920b1dabfb723c787d22eee4efbf8a1 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 21 Apr 2011 15:28:45 +0200
Subject: [PATCH 148/188] [ADD] Added support for buttons@type=action

bzr revid: fme@openerp.com-20110421132845-n2r6fa05q0qhvxjp
---
 addons/base/static/src/js/form.js  |  5 +++--
 addons/base/static/src/js/views.js | 17 +++++++++++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 30fcca5d149..2cb185b42ec 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -541,9 +541,10 @@ openerp.base.form.WidgetButton = openerp.base.form.Widget.extend({
             switch(type) {
                 case 'object':
                     return this.view.dataset.call(attrs.name, [this.view.datarecord.id], [context], this.on_button_object);
-                    break;
+                case 'action':
+                    return this.session.action_manager.do_action_id(parseInt(this.node.attrs.name));
                 default:
-                    this.log(_.sprintf("Unsupported button type : %s", type));
+                    this.log(_.sprintf("Unsupported button type : %s", type), this.node);
             }
         }
     },
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index f79d0e611eb..f5824b8a889 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -18,8 +18,17 @@ openerp.base.ActionManager = openerp.base.Controller.extend({
      * Process an action
      * Supported actions: act_window
      */
+    do_action_id: function(action_id) {
+        var self = this;
+        this.rpc('/base/action/load', { action_id: action_id }, function(result) {
+            if (result instanceof Object) {
+                self.do_action(result.value);
+            } else {
+                this.log("Could not load action with id ", action_id);
+            }
+        });
+    },
     do_action: function(action) {
-        this.log(action);
         var self = this;
         // instantiate the right controllers by understanding the action
         switch (action.type) {
@@ -36,14 +45,14 @@ openerp.base.ActionManager = openerp.base.Controller.extend({
                         // When dialog is closed with ESC key or close manually, branch to act_window_close logic
                         self.do_action({ type: 'ir.actions.act_window_close' });
                     });
-                    var viewmanager = new openerp.base.ViewManagerAction(this.session ,element_id, action, false);
+                    var viewmanager = new openerp.base.ViewManagerAction(this.session, element_id, action, false);
                     viewmanager.start();
                     this.dialog_stack.push(viewmanager);
-                } else if (action.target == "current") {
+                } else {
                     if (this.viewmanager) {
                         this.viewmanager.stop();
                     }
-                    this.viewmanager = new openerp.base.ViewManagerAction(this.session,this.element_id, action, true);
+                    this.viewmanager = new openerp.base.ViewManagerAction(this.session, this.element_id, action, true);
                     this.viewmanager.start();
                 }
                 break;

From 27c778c514072d8413c17ceb62ea9f7be2a6bfe5 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 21 Apr 2011 15:51:50 +0200
Subject: [PATCH 149/188] [FIX] ViewManagerAction: do not initialize search
 view when no search view id given

bzr revid: fme@openerp.com-20110421135150-5c2csi4uiug3mylt
---
 addons/base/static/src/js/views.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index f5824b8a889..1cbb2185e7b 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -193,6 +193,7 @@ openerp.base.ViewManager =  openerp.base.Controller.extend({
 
 openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({
     init: function(session, element_id, action, sidebar) {
+        console.log("init view manager action", action)
         var dataset = new openerp.base.DataSetSearch(session, action.res_model);
         this._super(session, element_id, dataset, action.views);
         this.action = action;
@@ -220,14 +221,17 @@ openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({
         // init search view
         var searchview_id = this.action.search_view_id && this.action.search_view_id[0];
 
-        var searchview_loaded = this.setup_search_view(
-                searchview_id || false, search_defaults);
+        if (searchview_id) {
+            var searchview_loaded = this.setup_search_view(
+                    searchview_id, search_defaults);
 
-        // schedule auto_search
-        if (searchview_loaded != null && this.action['auto_search']) {
-            $.when(searchview_loaded, inital_view_loaded)
-                .then(this.searchview.do_search);
+            // schedule auto_search
+            if (this.action['auto_search']) {
+                $.when(searchview_loaded, inital_view_loaded)
+                    .then(this.searchview.do_search);
+            }
         }
+
     },
     stop: function() {
         // should be replaced by automatic destruction implemented in BaseWidget

From 3e4c62c53671563b81d8b608b296c1f839826827 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 21 Apr 2011 17:56:05 +0200
Subject: [PATCH 150/188] [ADD] Added exec_workflow controllers

bzr revid: fme@openerp.com-20110421155605-ek8effxz9xln26s4
---
 addons/base/controllers/main.py   | 5 +++++
 addons/base/static/src/js/data.js | 7 +++++++
 openerpweb/openerpweb.py          | 6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 554b04099ed..844198a203e 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -409,6 +409,11 @@ class DataSet(openerpweb.Controller):
         r = getattr(m, method)(ids, *args)
         return {'result': r}
 
+    @openerpweb.jsonrequest
+    def exec_workflow(self, req, model, id, signal):
+        r = req.session.exec_workflow(model, id, signal)
+        return {'result': r}
+
     @openerpweb.jsonrequest
     def default_get(self, req, model, fields, context={}):
         m = req.session.model(model)
diff --git a/addons/base/static/src/js/data.js b/addons/base/static/src/js/data.js
index 5ed21be533c..a29f320b79c 100644
--- a/addons/base/static/src/js/data.js
+++ b/addons/base/static/src/js/data.js
@@ -118,6 +118,13 @@ openerp.base.DataSet =  openerp.base.Controller.extend( /** @lends openerp.base.
             ids: ids,
             args: args
         }, callback);
+    },
+    exec_workflow: function (id, signal, callback) {
+        return this.rpc('/base/dataset/exec_workflow', {
+            model: this.model,
+            id: id,
+            signal: signal
+        }, callback);
     }
 });
 
diff --git a/openerpweb/openerpweb.py b/openerpweb/openerpweb.py
index d569a9d5f20..d96a9c5ffec 100644
--- a/openerpweb/openerpweb.py
+++ b/openerpweb/openerpweb.py
@@ -116,6 +116,12 @@ class OpenERPSession(object):
         r = self.proxy('object').execute(self._db, self._uid, self._password, model, func, *l, **d)
         return r
 
+    def exec_workflow(self, model, id, signal):
+        if not (self._db and self._uid and self._password):
+            raise OpenERPUnboundException()
+        r = self.proxy('object').exec_workflow(self._db, self._uid, self._password, model, signal, id)
+        return r
+
     def model(self, model):
         """ Get an RPC proxy for the object ``model``, bound to this session.
 

From 14270adaaf4479589669291987b5aa0af9a3b202 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 21 Apr 2011 18:13:43 +0200
Subject: [PATCH 151/188] [ADD] Added support for buttons of type 'workflow'

bzr revid: fme@openerp.com-20110421161343-k0jejshvx12nf9ex
---
 addons/base/controllers/main.py    |  2 +-
 addons/base/static/src/js/form.js  | 16 ++++++++--------
 addons/base/static/src/js/views.js | 11 -----------
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 844198a203e..8faca685300 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -634,4 +634,4 @@ class Action(openerpweb.Controller):
             action = req.session.model(action_type[0]['type']).read([action_id], False, context)
             if action:
                 value = action[0]
-        return {'value': value}
+        return {'result': value}
diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 2cb185b42ec..84d7fe0babd 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -532,7 +532,7 @@ openerp.base.form.WidgetButton = openerp.base.form.Widget.extend({
     on_confirmed: function() {
         var attrs = this.node.attrs;
         if (attrs.special) {
-            this.on_button_object({
+            this.on_button_action({
                 result : { type: 'ir.actions.act_window_close' }
             });
         } else {
@@ -540,20 +540,20 @@ openerp.base.form.WidgetButton = openerp.base.form.Widget.extend({
             var context = _.extend({}, this.view.dataset.context, attrs.context || {});
             switch(type) {
                 case 'object':
-                    return this.view.dataset.call(attrs.name, [this.view.datarecord.id], [context], this.on_button_object);
+                    return this.view.dataset.call(attrs.name, [this.view.datarecord.id], [context], this.on_button_action);
                 case 'action':
-                    return this.session.action_manager.do_action_id(parseInt(this.node.attrs.name));
+                    return this.rpc('/base/action/load', { action_id: parseInt(attrs.name) }, this.on_button_action);
                 default:
-                    this.log(_.sprintf("Unsupported button type : %s", type), this.node);
+                    return this.view.dataset.exec_workflow(this.view.datarecord.id, attrs.name, this.on_button_action);
             }
         }
     },
-    on_button_object: function(r) {
-        if (r.result === false) {
-            this.log("Button object returns false");
-        } else if (r.result.constructor == Object) {
+    on_button_action: function(r) {
+        console.log("Got reesonse button", r)
+        if (r.result && r.result.constructor == Object) {
             this.session.action_manager.do_action(r.result);
         } else {
+            this.log("Button returned", r.result);
             this.view.reload();
         }
     }
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 1cbb2185e7b..8ef14a3edbf 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -18,16 +18,6 @@ openerp.base.ActionManager = openerp.base.Controller.extend({
      * Process an action
      * Supported actions: act_window
      */
-    do_action_id: function(action_id) {
-        var self = this;
-        this.rpc('/base/action/load', { action_id: action_id }, function(result) {
-            if (result instanceof Object) {
-                self.do_action(result.value);
-            } else {
-                this.log("Could not load action with id ", action_id);
-            }
-        });
-    },
     do_action: function(action) {
         var self = this;
         // instantiate the right controllers by understanding the action
@@ -193,7 +183,6 @@ openerp.base.ViewManager =  openerp.base.Controller.extend({
 
 openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({
     init: function(session, element_id, action, sidebar) {
-        console.log("init view manager action", action)
         var dataset = new openerp.base.DataSetSearch(session, action.res_model);
         this._super(session, element_id, dataset, action.views);
         this.action = action;

From ceb524e3376d92dde25e68dd7d74b6de0a5c8a6d Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 21 Apr 2011 18:55:01 +0200
Subject: [PATCH 152/188] [IMP] Added textarea invalid field styling

bzr revid: fme@openerp.com-20110421165501-6q072nbuhq38359i
---
 addons/base/static/src/css/base.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index cd39b2ad147..1bd004b53f6 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -640,7 +640,7 @@ body.openerp {
 .openerp td.required input, .openerp td.required select {
     background-color: #D2D2FF;
 }
-.openerp td.invalid input, .openerp td.invalid select {
+.openerp td.invalid input, .openerp td.invalid select, .openerp td.invalid textarea {
     background-color: #F66;
     border: 1px solid #D00;
 }

From 47387d5d29481e6df5ba772d34fb5544b073a203 Mon Sep 17 00:00:00 2001
From: Jacques-Etienne Baudoux <jba@openerp.com>
Date: Fri, 22 Apr 2011 16:21:42 +0200
Subject: [PATCH 153/188] [IMP] Add index on the code to improve name_search
 performance [FIX] Use operator argument of name_search [FIX] Allow searching
 account without specific domain and return children of that account with
 specific domain (args) [IMP] Support '/' in the name to search in the tree
 (complete name).

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

bzr revid: jba@openerp.com-20110422142142-mo13kww6qa1xiz3s
---
 addons/analytic/analytic.py | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 39ffeb70eed..6dfaac21e70 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -150,7 +150,7 @@ class account_analytic_account(osv.osv):
     _columns = {
         'name': fields.char('Account Name', size=128, required=True),
         'complete_name': fields.function(_complete_name_calc, method=True, type='char', string='Full Account Name'),
-        'code': fields.char('Account Code', size=24),
+        'code': fields.char('Account Code', size=24, select=True),
         'type': fields.selection([('view','View'), ('normal','Normal')], 'Account Type', help='If you select the View Type, it means you won\'t allow to create journal entries using that account.'),
         'description': fields.text('Description'),
         'parent_id': fields.many2one('account.analytic.account', 'Parent Analytic Account', select=2),
@@ -245,13 +245,23 @@ class account_analytic_account(osv.osv):
             cr.execute("select analytic_account_id from project_project")
             project_ids = [x[0] for x in cr.fetchall()]
             return self.name_get(cr, uid, project_ids, context=context)
-        account = self.search(cr, uid, [('code', '=', name)] + args, limit=limit, context=context)
-        if not account:
-            account = self.search(cr, uid, [('name', 'ilike', '%%%s%%' % name)] + args, limit=limit, context=context)
-            newacc = account
-            while newacc:
-                newacc = self.search(cr, uid, [('parent_id', 'in', newacc)]+args, limit=limit, context=context)
-                account += newacc
+        if name:
+            account = self.search(cr, uid, [('code', '=', name)] + args, limit=limit, context=context)
+            if not account:
+                names=map(lambda i : i.strip(),name.split('/'))
+                for i in range(len(names)):
+                    dom=[('name', operator, names[i])]
+                    if i>0:
+                        dom+=[('id','child_of',account)]
+                    account = self.search(cr, uid, dom, limit=limit, context=context)
+                newacc = account
+                while newacc:
+                    newacc = self.search(cr, uid, [('parent_id', 'in', newacc)], limit=limit, context=context)
+                    account += newacc
+                if args:
+                    account = self.search(cr, uid, [('id', 'in', account)] + args, limit=limit, context=context)
+        else:
+            account = self.search(cr, uid, args, limit=limit, context=context)
         return self.name_get(cr, uid, account, context=context)
 
 account_analytic_account()

From 0ae1e8f2b9b6d5d499b145302bc982fcaf7faa4a Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 22 Apr 2011 17:54:52 +0200
Subject: [PATCH 154/188] [IMP] Some code about many2many widgets.

bzr revid: nicolas.vanhoren@openerp.com-20110422155452-9lth3lrm8pwf9c2r
---
 addons/base/static/src/js/form.js   | 16 ++++++++++++++++
 addons/base/static/src/js/list.js   |  8 +++++---
 addons/base/static/src/xml/base.xml |  1 +
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 84d7fe0babd..ea2b377078b 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -896,6 +896,22 @@ openerp.base.form.FieldMany2Many = openerp.base.form.Field.extend({
     init: function(view, node) {
         this._super(view, node);
         this.template = "FieldMany2Many";
+        this.list_id = _.uniqueId("many2many");
+    },
+    start: function() {
+        debugger;
+        this._super.apply(this, arguments);
+        this.dataset = new openerp.base.DataSetSearch(this.session, this.field.relation);
+        this.list_view = new openerp.base.ListView(undefined, this.view.session,
+                this.list_id, this.dataset, false, undefined);
+        this.list_view.start();
+    },
+    set_value: function(value) {
+        if (value != false) {
+            this.dataset.ids = value;
+            this.dataset.count = value.length;
+            this.list_view.do_update();
+        }
     }
 });
 
diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 8035616e59a..aa9882aed36 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -64,7 +64,7 @@ openerp.base.ListView = openerp.base.Controller.extend(
         return this.rpc("/base/listview/load", {
             model: this.model,
             view_id: this.view_id,
-            toolbar: !!this.view_manager.sidebar
+            toolbar: this.view_manager ? !!this.view_manager.sidebar : false
         }, this.on_loaded);
     },
     /**
@@ -168,7 +168,7 @@ openerp.base.ListView = openerp.base.Controller.extend(
                 'tr', 'click', this.on_select_row);
 
         // sidebar stuff
-        if (this.view_manager.sidebar) {
+        if (this.view_manager && this.view_manager.sidebar) {
             this.view_manager.sidebar.set_toolbar(data.fields_view.toolbar);
         }
     },
@@ -262,7 +262,9 @@ openerp.base.ListView = openerp.base.Controller.extend(
         view = view || 'form';
         this.dataset.index = index;
         _.delay(_.bind(function () {
-            this.view_manager.on_mode_switch(view);
+            if(this.view_manager) {
+                this.view_manager.on_mode_switch(view);
+            }
         }, this));
     },
     /**
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index b49ef2c7d6a..4804f34d785 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -353,6 +353,7 @@
 <t t-name="FieldMany2Many">
     <div style="background: #ccc; padding: 20px">
         Many2Many widget
+        <div t-attr-id="widget.list_id"></div>
     </div>
 </t>
 <t t-name="FieldReference">

From 91113680fa18459b534230b1a65fdc23c2b7df0f Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Mon, 25 Apr 2011 11:40:22 +0530
Subject: [PATCH 155/188] [IMP] mail: evaluated expression using safe_eval in
 get_template_value() of email.compose.message

bzr revid: rha@tinyerp.com-20110425061022-daj2rvm0iubtt3dw
---
 addons/mail/wizard/email_compose_message.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/mail/wizard/email_compose_message.py b/addons/mail/wizard/email_compose_message.py
index f69fd2af7e6..80c53b398bb 100644
--- a/addons/mail/wizard/email_compose_message.py
+++ b/addons/mail/wizard/email_compose_message.py
@@ -22,6 +22,7 @@
 from osv import osv
 from osv import fields
 import tools
+from tools.safe_eval import safe_eval as eval
 
 class email_compose_message(osv.osv_memory):
     _name = 'email.compose.message'
@@ -220,7 +221,11 @@ class email_compose_message(osv.osv_memory):
 
 
     def get_template_value(self, cr, uid, message, model, resource_id, context=None):
-        return message
+        locals_for_emails = {
+            'user' : self.pool.get('res.users').browse(cr, uid, uid, context=context),
+            'object' : self.pool.get(model).browse(cr, uid, resource_id),
+        }
+        return message and eval(message, {}, locals_for_emails)
 
 email_compose_message()
 

From ad590ddc86b73d31265f5ea6913cee74f96a755a Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Mon, 25 Apr 2011 11:41:14 +0530
Subject: [PATCH 156/188] [FIX] account: Cancel of invoice throws error,
 validate of move_id is invalid

bzr revid: ara@tinyerp.com-20110425061114-nq2mzpc8w082hu3j
---
 addons/account/account_analytic_line.py |  2 +-
 addons/account/account_move_line.py     | 15 +++------------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index a93dc70b2fb..08123c8f460 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -32,7 +32,7 @@ class account_analytic_line(osv.osv):
         'product_uom_id': fields.many2one('product.uom', 'UoM'),
         'product_id': fields.many2one('product.product', 'Product'),
         'general_account_id': fields.many2one('account.account', 'General Account', required=True, ondelete='restrict'),
-        'move_id': fields.many2one('account.move.line', 'Move Line', ondelete='restrict', select=True),
+        'move_id': fields.many2one('account.move.line', 'Move Line', ondelete='cascade', select=True),
         'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal', required=True, ondelete='restrict', select=True),
         'code': fields.char('Code', size=8),
         'ref': fields.char('Ref.', size=64),
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 2cbe9de9630..83a67df9178 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -1085,24 +1085,15 @@ class account_move_line(osv.osv):
         if context is None:
             context = {}
         move_obj = self.pool.get('account.move')
-        analytic_obj = self.pool.get('account.analytic.line')
         self._update_check(cr, uid, ids, context)
         result = False
         move_ids = set()
-        analytic_ids = set()
-        move_line_ids = set()
         for line in self.browse(cr, uid, ids, context=context):
             move_ids.add(line.move_id.id)
-            move_line_ids.add(line.id)
-            for analytic in line.analytic_lines:
-                analytic_ids.add(analytic.id)
-
-        analytic_ids = list(analytic_ids)
+            context['journal_id'] = line.journal_id.id
+            context['period_id'] = line.period_id.id
+            result = super(account_move_line, self).unlink(cr, uid, [line.id], context=context)
         move_ids = list(move_ids)
-
-        if analytic_ids:
-            analytic_obj.unlink(cr,uid, analytic_ids, context=context)
-        result = super(account_move_line, self).unlink(cr, uid, list(move_line_ids), context=context)
         if check and move_ids:
             move_obj.validate(cr, uid, move_ids, context=context)
         return result

From f5fab681578cdb6c33f81758f8ac73f8bb21ab15 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Mon, 25 Apr 2011 15:41:26 +0530
Subject: [PATCH 157/188] [FIX] mail: improvement in get_template_value() for
 expression evaluation

bzr revid: rha@tinyerp.com-20110425101126-serj3us6yt6drjcn
---
 addons/mail/wizard/email_compose_message.py | 22 ++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/addons/mail/wizard/email_compose_message.py b/addons/mail/wizard/email_compose_message.py
index 80c53b398bb..efa87f6a108 100644
--- a/addons/mail/wizard/email_compose_message.py
+++ b/addons/mail/wizard/email_compose_message.py
@@ -23,6 +23,7 @@ from osv import osv
 from osv import fields
 import tools
 from tools.safe_eval import safe_eval as eval
+import re
 
 class email_compose_message(osv.osv_memory):
     _name = 'email.compose.message'
@@ -221,11 +222,22 @@ class email_compose_message(osv.osv_memory):
 
 
     def get_template_value(self, cr, uid, message, model, resource_id, context=None):
-        locals_for_emails = {
-            'user' : self.pool.get('res.users').browse(cr, uid, uid, context=context),
-            'object' : self.pool.get(model).browse(cr, uid, resource_id),
-        }
-        return message and eval(message, {}, locals_for_emails)
+        if context is None:
+            context = {}
+        def merge(match):
+            exp = str(match.group()[2:-2]).strip()
+            result = eval(exp,
+                          {
+                            'user' : self.pool.get('res.users').browse(cr, uid, uid, context=context),
+                            'context': dict(context), # copy context to prevent side-effects of eval
+                            'object' : self.pool.get(model).browse(cr, uid, resource_id),
+                          })
+            if result in (None, False):
+                return str("--------")
+            return tools.ustr(result)
+
+        com = re.compile('(\[\[.+?\]\])')
+        return message and com.sub(merge, message)
 
 email_compose_message()
 

From 2cb2d1e4eadaab8c54022a6126506937d494daf8 Mon Sep 17 00:00:00 2001
From: Jigar Amin <jam@tinyerp.com>
Date: Mon, 25 Apr 2011 17:52:07 +0530
Subject: [PATCH 158/188] [FIX/BUG] project_lon_term : Task Scheduling shoud
 repect the parent task end date with faces

bzr revid: jam@tinyerp.com-20110425122207-yp32joiufdyl5709
---
 addons/project_long_term/project_long_term.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index c2bc55db212..4620fc81a7a 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -731,6 +731,7 @@ class project_task(osv.osv):
         task = self.browse(cr, uid, task_id, context=context)
         duration = str(task.planned_hours )+ 'H'
         str_resource = False
+        parent = task.parent_ids
         if task.phase_id.resource_ids:
             str_resource = ('%s | '*len(task.phase_id.resource_ids))[:-2]
             str_resource = str_resource % tuple(map(lambda x: 'Resource_%s'%x.resource_id.id, task.phase_id.resource_ids))
@@ -742,7 +743,10 @@ class project_task(osv.osv):
             effort = \'%s\'
             resource = %s
 '''%(task.id, task.name, duration, str_resource)
-            #start = datetime.strftime((datetime.strptime(start, "%Y-%m-%d")), "%Y-%m-%d")
+            if parent:
+                s +='''
+            start = up.Task_%s.end
+'''%(parent[0].id)
         else:
             s = '''
     def Task_%s():
@@ -750,6 +754,10 @@ class project_task(osv.osv):
         effort = \'%s\'
         resource = %s
 '''%(task.id, task.name, duration, str_resource)
+            if parent:
+                s +='''
+        start = up.Task_%s.end
+'''%(parent[0].id)
         s += '\n'
         return s
 project_task()

From 2f1607c786edb621164ab26a9c904ef1585a37fb Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 26 Apr 2011 04:41:54 +0000
Subject: [PATCH 159/188] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110422043906-4a4yeks4mzl3sfef
bzr revid: launchpad_translations_on_behalf_of_openerp-20110423045345-9xga4elfyud8nsec
bzr revid: launchpad_translations_on_behalf_of_openerp-20110424043747-9x0ffekdqw8ldcc1
bzr revid: launchpad_translations_on_behalf_of_openerp-20110425045050-3owniws6mcmmclll
bzr revid: launchpad_translations_on_behalf_of_openerp-20110426044154-jrf1eg82ie49zl0r
---
 addons/account/i18n/de.po               |   18 +-
 addons/account/i18n/pt_BR.po            |    8 +-
 addons/account/i18n/tr.po               |   20 +-
 addons/account_accountant/i18n/lt.po    |   38 +
 addons/account_sequence/i18n/pt.po      |  221 +++
 addons/base_action_rule/i18n/it.po      |   10 +-
 addons/base_calendar/i18n/tr.po         | 1660 +++++++++++++++++++++++
 addons/base_synchro/i18n/ru.po          |   57 +-
 addons/crm/i18n/ru.po                   |   49 +-
 addons/hr_attendance/i18n/pt_BR.po      |   81 +-
 addons/hr_timesheet_sheet/i18n/pt_BR.po |   90 +-
 addons/knowledge/i18n/it.po             |   10 +-
 addons/l10n_ca/i18n/it.po               |   12 +-
 addons/l10n_cr/i18n/it.po               |   10 +-
 addons/mrp_repair/i18n/it.po            |   14 +-
 addons/outlook/i18n/tr.po               |   18 +-
 addons/procurement/i18n/tr.po           |  906 +++++++++++++
 addons/profile_tools/i18n/ru.po         |  144 ++
 addons/project_mailgate/i18n/it.po      |   14 +-
 addons/project_planning/i18n/it.po      |   30 +-
 addons/sale/i18n/ru.po                  |   15 +-
 addons/sale_crm/i18n/it.po              |   10 +-
 addons/sale_mrp/i18n/ru.po              |    8 +-
 23 files changed, 3228 insertions(+), 215 deletions(-)
 create mode 100644 addons/account_accountant/i18n/lt.po
 create mode 100644 addons/account_sequence/i18n/pt.po
 create mode 100644 addons/base_calendar/i18n/tr.po
 create mode 100644 addons/procurement/i18n/tr.po
 create mode 100644 addons/profile_tools/i18n/ru.po

diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index dae24fa0df8..6c0713306f5 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-04-03 09:24+0000\n"
+"PO-Revision-Date: 2011-04-21 05:36+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <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: 2011-04-04 04:47+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-22 04:38+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -911,7 +911,7 @@ msgstr "Erzeuge 3 Monats Periode"
 #. module: account
 #: report:account.overdue:0
 msgid "Due"
-msgstr "fällig am"
+msgstr "Fällig"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -2664,7 +2664,7 @@ msgstr ""
 #: model:ir.actions.server,name:account.ir_actions_server_action_wizard_multi_chart
 #: model:ir.ui.menu,name:account.menu_act_ir_actions_bleble
 msgid "New Company Financial Setting"
-msgstr "Basiskonfiguration Unternehmen"
+msgstr "Neue Firma Financial Rahmen"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
@@ -4014,7 +4014,7 @@ msgstr "Fällige Analytische Konten"
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
 msgid "Paid"
-msgstr "bezahlt am"
+msgstr "bezahlt"
 
 #. module: account
 #: field:account.invoice,tax_line:0
@@ -4189,7 +4189,7 @@ msgstr "Storniere Abschreibung"
 #: field:account.model.line,date_maturity:0
 #: report:account.overdue:0
 msgid "Maturity date"
-msgstr "Fälligkeitstermin"
+msgstr "Datum Fällig"
 
 #. module: account
 #: view:report.account.receivable:0
@@ -7355,7 +7355,7 @@ msgstr "Manueller Kontenausgleich"
 #. module: account
 #: report:account.overdue:0
 msgid "Total amount due:"
-msgstr "Gesamtbetrag (fällig):"
+msgstr "Gesamtbetrag fällig:"
 
 #. module: account
 #: field:account.analytic.chart,to_date:0
@@ -8741,7 +8741,7 @@ msgstr ""
 #. module: account
 #: report:account.overdue:0
 msgid "Best regards."
-msgstr "Viele Grüsse."
+msgstr "Beste Grüsse."
 
 #. module: account
 #: view:account.invoice:0
diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po
index 53eccc4f28f..fd8020ae0b8 100644
--- a/addons/account/i18n/pt_BR.po
+++ b/addons/account/i18n/pt_BR.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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-04-19 14:37+0000\n"
+"PO-Revision-Date: 2011-04-21 21:39+0000\n"
 "Last-Translator: Nédio Batista Marques <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: 2011-04-20 04:36+0000\n"
+"X-Launchpad-Export-Date: 2011-04-22 04:38+0000\n"
 "X-Generator: Launchpad (build 12758)\n"
 
 #. module: account
@@ -1843,7 +1843,7 @@ msgstr "Registros por Linha"
 #. module: account
 #: report:account.tax.code.entries:0
 msgid "A/c Code"
-msgstr ""
+msgstr "Código A/C"
 
 #. module: account
 #: field:account.invoice,move_id:0
@@ -2707,6 +2707,8 @@ msgid ""
 "The statement balance is incorrect !\n"
 "The expected balance (%.2f) is different than the computed one. (%.2f)"
 msgstr ""
+"O saldo final do extrato está incorreto!\n"
+"O saldo experado (%.2f) é diferente do saldo calculado (%.2f)"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentreconcile0
diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po
index 30b597eaf77..fc1edc96b66 100644
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-23 22:42+0000\n"
-"Last-Translator: Ahmet Altınışık <Unknown>\n"
+"PO-Revision-Date: 2011-04-23 18:35+0000\n"
+"Last-Translator: Ayhan KIZILTAN <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: 2011-03-18 04:55+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-24 04:37+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -50,7 +50,7 @@ msgstr "Yevmiye Kaydını Mutabakatla"
 #. module: account
 #: field:account.installer.modules,account_voucher:0
 msgid "Voucher Management"
-msgstr "Çek Yönetimi"
+msgstr ""
 
 #. module: account
 #: view:account.account:0
@@ -114,7 +114,7 @@ msgstr "Fatura ya da ödemeden içe aktar"
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
 msgid "wizard.multi.charts.accounts"
-msgstr "wizard.multi.charts.accounts"
+msgstr ""
 
 #. module: account
 #: view:account.move:0
@@ -243,8 +243,8 @@ msgid ""
 "No period defined for this date: %s !\n"
 "Please create a fiscal year."
 msgstr ""
-"Bu tarih için dönem tanımlanmadı: ( %s )\n"
-"Lütfen mali yıl yaratınız."
+"Bu tarih için dönem belirtilmedi: %s !\n"
+"Lütfen bir mali yıl oluşturun."
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
@@ -279,7 +279,7 @@ msgstr "'%s' faturası parçalı öndendi: (Ödenen %s%s Toplam %s%s Kalan %s%s)
 #. module: account
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
 msgid "Accounting entries are an input of the reconciliation."
-msgstr "Accounting entries are an input of the reconciliation."
+msgstr "Hesap girişleri uzlaşmaya ait girişlerdir."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
@@ -467,7 +467,7 @@ msgstr "Hesap Planı Şablonu"
 #. module: account
 #: help:account.model.line,amount_currency:0
 msgid "The amount expressed in an optional other currency."
-msgstr "The amount expressed in an optional other currency."
+msgstr "Tutar, seçmeli olarak başka bir para birimiyle beliritlebilir."
 
 #. module: account
 #: help:account.journal.period,state:0
diff --git a/addons/account_accountant/i18n/lt.po b/addons/account_accountant/i18n/lt.po
new file mode 100644
index 00000000000..bc9bcaa33ad
--- /dev/null
+++ b/addons/account_accountant/i18n/lt.po
@@ -0,0 +1,38 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-04-25 15:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-04-26 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: account_accountant
+#: model:ir.module.module,description:account_accountant.module_meta_information
+msgid ""
+"\n"
+"This module gives the admin user the access to all the accounting features "
+"like the journal\n"
+"items and the chart of accounts.\n"
+"    "
+msgstr ""
+"\n"
+"Šis modulis suteikia priėjimą administratoriui prie visų apskaitos "
+"galimybių, tokių kaip žurnalų\n"
+"eilutės ar sąskaitų planas.\n"
+"    "
+
+#. module: account_accountant
+#: model:ir.module.module,shortdesc:account_accountant.module_meta_information
+msgid "Accountant"
+msgstr "Apskaitininkas"
diff --git a/addons/account_sequence/i18n/pt.po b/addons/account_sequence/i18n/pt.po
new file mode 100644
index 00000000000..053e67f95b3
--- /dev/null
+++ b/addons/account_sequence/i18n/pt.po
@@ -0,0 +1,221 @@
+# Portuguese translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-04-24 03:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese <pt@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: 2011-04-25 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+#: model:ir.actions.act_window,name:account_sequence.action_account_seq_installer
+msgid "Account Sequence Application Configuration"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move:0
+msgid ""
+"You cannot create entries on different periods/journals in the same move"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.move,internal_sequence_number:0
+#: help:account.move.line,internal_sequence_number:0
+msgid "Internal Sequence Number"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_next:0
+msgid "Next number of this sequence"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_next:0
+msgid "Next Number"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_increment:0
+msgid "Increment Number"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.module.module,description:account_sequence.module_meta_information
+msgid ""
+"\n"
+"    This module maintains internal sequence number for accounting entries.\n"
+"    "
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.module.module,shortdesc:account_sequence.module_meta_information
+msgid "Entries Sequence Numbering"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_increment:0
+msgid "The next number of the sequence will be incremented by this number"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure Your Account Sequence Application"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,suffix:0
+msgid "Suffix value of the record for the sequence"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.journal,internal_sequence_id:0
+msgid ""
+"This sequence will be used to maintain the internal number for the journal "
+"entries related to this journal."
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,padding:0
+msgid "Number padding"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.move,internal_sequence_number:0
+#: field:account.move.line,internal_sequence_number:0
+msgid "Internal Number"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,padding:0
+msgid ""
+"OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
+"get the required padding size."
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move:0
+msgid ""
+"You cannot create more than one move per period on centralized journal"
+msgstr ""
+
+#. module: account_sequence
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.journal,internal_sequence_id:0
+msgid "Internal Sequence"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_sequence_installer
+msgid "account.sequence.installer"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,prefix:0
+msgid "Prefix value of the record for the sequence"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move
+msgid "Account Entry"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,suffix:0
+msgid "Suffix"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "title"
+msgstr ""
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,prefix:0
+msgid "Prefix"
+msgstr ""
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_journal
+msgid "Journal"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "You can enhance the Account Sequence Application by installing ."
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
diff --git a/addons/base_action_rule/i18n/it.po b/addons/base_action_rule/i18n/it.po
index 5eb83aebe3f..06b819cb545 100644
--- a/addons/base_action_rule/i18n/it.po
+++ b/addons/base_action_rule/i18n/it.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-13 11:58+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2011-04-25 09:02+0000\n"
+"Last-Translator: simone.sandri <Unknown>\n"
 "Language-Team: Italian <it@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: 2011-01-15 05:55+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-26 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -78,7 +78,7 @@ msgstr "Giorni"
 #. module: base_action_rule
 #: field:base.action.rule,last_run:0
 msgid "Last Run"
-msgstr ""
+msgstr "Ultima Esecuzione"
 
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:313
diff --git a/addons/base_calendar/i18n/tr.po b/addons/base_calendar/i18n/tr.po
new file mode 100644
index 00000000000..97cefdf1d28
--- /dev/null
+++ b/addons/base_calendar/i18n/tr.po
@@ -0,0 +1,1660 @@
+# Turkish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-04-23 18:46+0000\n"
+"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"Language-Team: Turkish <tr@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: 2011-04-24 04:37+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event starts"
+msgstr "Olay Başlar"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Hourly"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Required to Join"
+msgstr "Katılmak gerekir"
+
+#. module: base_calendar
+#: help:calendar.event,exdate:0
+#: help:calendar.todo,exdate:0
+msgid ""
+"This property defines the list of date/time exceptions for a recurring "
+"calendar component."
+msgstr ""
+"Bu özellik yinelenen takvim öğeleri için istisna tutulan tarih/saat "
+"listesini belirtir."
+
+#. module: base_calendar
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event.edit.all,name:0
+msgid "Title"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Monthly"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invited User"
+msgstr "Davetli Kullanıcı"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,recurrency:0
+#: help:calendar.todo,recurrency:0
+msgid "Recurrent Meeting"
+msgstr "Yinelenen Toplantı"
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
+#: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
+msgid "Alarms"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Sunday"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,role:0
+msgid "Role"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation details"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fourth"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,show_as:0
+#: field:calendar.todo,show_as:0
+msgid "Show as"
+msgstr "Farklı Göster"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,day:0
+#: selection:base.calendar.set.exrule,select1:0
+#: field:calendar.event,day:0
+#: selection:calendar.event,select1:0
+#: field:calendar.todo,day:0
+#: selection:calendar.todo,select1:0
+msgid "Date of month"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Public"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid " "
+msgstr " "
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "March"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Friday"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,allday:0
+#: field:calendar.todo,allday:0
+msgid "All Day"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,select1:0
+#: field:calendar.event,select1:0
+#: field:calendar.todo,select1:0
+msgid "Option"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,availability:0
+#: selection:calendar.event,show_as:0
+#: selection:calendar.todo,show_as:0
+#: selection:res.users,availability:0
+msgid "Free"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,rsvp:0
+msgid "Indicats whether the favor of a reply is requested"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,delegated_to:0
+msgid "The users that the original request was delegated to"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,ref:0
+msgid "Event Ref"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,we:0
+#: field:calendar.event,we:0
+#: field:calendar.todo,we:0
+msgid "Wed"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Show time as"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,tu:0
+#: field:calendar.event,tu:0
+#: field:calendar.todo,tu:0
+msgid "Tue"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Yearly"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event ends"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Last"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,state:0
+msgid "Status of the attendee's participation"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Days"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation Detail"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1356
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:136
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Chair Person"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Procedure"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Minutes"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Display"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event.edit.all:0
+msgid "Edit all Occurrences"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation type"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Secondly"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,event_date:0
+#: field:calendar.attendee,event_date:0
+#: view:calendar.event:0
+msgid "Event Date"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Group By..."
+msgstr ""
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,email:0
+msgid "Provide external email address who will receive this invitation."
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.module.module,description:base_calendar.module_meta_information
+msgid ""
+"Full featured calendar system that supports:\n"
+"    - Calendar of events\n"
+"    - Alerts (create requests)\n"
+"    - Recurring events\n"
+"    - Invitations to people"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,cutype:0
+msgid "Specify the type of Invitation"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Years"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,event_end_date:0
+#: field:calendar.attendee,event_end_date:0
+msgid "Event End Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Optional Participation"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,date_deadline:0
+#: field:calendar.todo,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1092
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,active:0
+#: help:calendar.todo,active:0
+msgid ""
+"If the active field is set to          true, it will allow you to hide the "
+"event alarm information without removing it."
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.module.module,shortdesc:base_calendar.module_meta_information
+msgid "Basic Calendar Functionality"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,organizer:0
+#: field:calendar.event,organizer_id:0
+#: field:calendar.todo,organizer:0
+#: field:calendar.todo,organizer_id:0
+msgid "Organizer"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+#: field:calendar.event,user_id:0
+#: field:calendar.todo,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: model:res.request.link,name:base_calendar.request_link_meeting
+msgid "Event"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,edit_all:0
+#: help:calendar.todo,edit_all:0
+msgid "Edit all Occurrences  of recurrent Meeting."
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_occurs:0
+#: selection:res.alarm,trigger_occurs:0
+msgid "Before"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_calendar_event_edit_all
+msgid "Edit all events"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,attendee_ids:0
+#: field:calendar.event,attendee_ids:0
+#: field:calendar.todo,attendee_ids:0
+msgid "Attendees"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Confirm"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_todo
+msgid "Calendar Task"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,su:0
+#: field:calendar.event,su:0
+#: field:calendar.todo,su:0
+msgid "Sun"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,cutype:0
+msgid "Invite Type"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,partner_id:0
+msgid "Partner related to contact"
+msgstr ""
+
+#. module: base_calendar
+#: view:res.alarm:0
+msgid "Reminder details"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,parent_ids:0
+msgid "Delegrated From"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,select1:0
+#: selection:calendar.event,select1:0
+#: selection:calendar.todo,select1:0
+msgid "Day of month"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event,location:0
+#: field:calendar.event.edit.all,location:0
+#: field:calendar.todo,location:0
+msgid "Location"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,send_mail:0
+msgid "Send mail?"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,email:0
+#: selection:calendar.alarm,action:0
+#: field:calendar.attendee,email:0
+msgid "Email"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Event Detail"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Run"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,exdate:0
+#: field:calendar.todo,exdate:0
+msgid "Exception Date/Times"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Confidential"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,end_date:0
+#: field:calendar.event,end_date:0
+#: field:calendar.todo,end_date:0
+msgid "Repeat Until"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view
+msgid ""
+"Create specific calendar alarms that may be assigned to calendar events or "
+"meetings."
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Visibility"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,rsvp:0
+msgid "Required Reply?"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,base_calendar_url:0
+#: field:calendar.todo,base_calendar_url:0
+msgid "Caldav URL"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "Select range to Exclude"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_uid:0
+#: field:calendar.todo,recurrent_uid:0
+msgid "Recurrent ID"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "July"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Accepted"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,th:0
+#: field:calendar.event,th:0
+#: field:calendar.todo,th:0
+msgid "Thu"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,child_ids:0
+msgid "Delegrated To"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Required Reply"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "Forever"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Participation required"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,create_date:0
+#: field:calendar.todo,create_date:0
+msgid "Created"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Private"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Daily"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:385
+#, python-format
+msgid "Can not Duplicate"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,class:0
+#: field:calendar.todo,class:0
+msgid "Mark as"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,partner_address_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,rrule_type:0
+#: help:calendar.todo,rrule_type:0
+msgid "Let the event automatically repeat at that interval"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Delegate"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,partner_id:0
+#: view:calendar.attendee:0
+#: field:calendar.attendee,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: selection:base_calendar.invite.attendee,type:0
+msgid "Partner Contacts"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "_Ok"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "First"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Privacy"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,vtimezone:0
+#: field:calendar.todo,vtimezone:0
+msgid "Timezone"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Subject"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "September"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "December"
+msgstr ""
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,send_mail:0
+msgid "Check this if you want to send an Email to Invited Person"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Availability"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event.edit.all:0
+msgid "_Save"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Individual"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,count:0
+#: help:calendar.todo,count:0
+msgid "Repeat x times"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,user_id:0
+msgid "Owner"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Delegation Info"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event.edit.all,date:0
+msgid "Start Date"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,cn:0
+msgid "Common name"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Declined"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "My Role"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "My Events"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Decline"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Weeks"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Group"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,edit_all:0
+#: field:calendar.todo,edit_all:0
+msgid "Edit All"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,contact_ids:0
+msgid "Contacts"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_res_alarm
+msgid "Basic Alarm Information"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,fr:0
+#: field:calendar.event,fr:0
+#: field:calendar.todo,fr:0
+msgid "Fri"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Hours"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1092
+#, python-format
+msgid "Count can not be Negative"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,member:0
+msgid "Member"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,location:0
+#: help:calendar.todo,location:0
+msgid "Location of Event"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,rrule:0
+#: field:calendar.todo,rrule:0
+msgid "Recurrent Rule"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,attach:0
+msgid "Attachment"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation From"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "End of recurrency"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event.edit.all,alarm_id:0
+msgid "Reminder"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
+#: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
+msgid "Set Exrule"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: model:ir.actions.act_window,name:base_calendar.action_view_event
+#: model:ir.ui.menu,name:base_calendar.menu_events
+msgid "Events"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_view_calendar_invite_attendee_wizard
+#: model:ir.model,name:base_calendar.model_base_calendar_invite_attendee
+msgid "Invite Attendees"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,email:0
+msgid "Email of Invited Person"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,repeat:0
+#: field:calendar.event,count:0
+#: field:calendar.todo,count:0
+#: field:res.alarm,repeat:0
+msgid "Repeat"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,dir:0
+msgid ""
+"Reference to the URIthat points to the directory information corresponding "
+"to the attendee."
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "August"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Monday"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Third"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "June"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,alarm_id:0
+msgid "Basic Alarm"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+#: view:calendar.event:0
+msgid "The"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,delegated_from:0
+msgid "Delegated From"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event,date:0
+msgid "Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "November"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,member:0
+msgid "Indicate the groups that the attendee belongs to"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+msgid "Data"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,mo:0
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+msgid "Mon"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,count:0
+msgid "Count"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "No Repeat"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "October"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Uncertain"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,language:0
+msgid "Language"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_occurs:0
+#: field:res.alarm,trigger_occurs:0
+msgid "Triggers"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "January"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_related:0
+#: field:res.alarm,trigger_related:0
+msgid "Related to"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,interval:0
+#: field:calendar.alarm,trigger_interval:0
+#: field:res.alarm,trigger_interval:0
+msgid "Interval"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Wednesday"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1090
+#, python-format
+msgid "Interval can not be Negative"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,name:0
+#: view:calendar.event:0
+msgid "Summary"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,active:0
+#: field:calendar.event,active:0
+#: field:calendar.todo,active:0
+#: field:res.alarm,active:0
+msgid "Active"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Choose day in the month where repeat the meeting"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,action:0
+msgid "Action"
+msgstr ""
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,type:0
+msgid "Select whom you want to Invite"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,duration:0
+#: help:res.alarm,duration:0
+msgid ""
+"Duration' and 'Repeat' are both optional, but if one occurs, so MUST the "
+"other"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_event_edit_all
+msgid "Calendar Edit all event"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,role:0
+msgid "Participation role for the calendar user"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,delegated_to:0
+msgid "Delegated To"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,action:0
+msgid "Defines the action to be invoked when an alarm is triggered"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "End date"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Search Events"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Recurrency Option"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Weekly"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,active:0
+#: help:res.alarm,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the event "
+"alarm information without removing it."
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+msgid "Recurrent ID date"
+msgstr ""
+
+#. module: base_calendar
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,state:0
+#: view:calendar.attendee:0
+#: field:calendar.attendee,state:0
+#: view:calendar.event:0
+#: field:calendar.event,state:0
+#: field:calendar.todo,state:0
+msgid "State"
+msgstr ""
+
+#. module: base_calendar
+#: view:res.alarm:0
+msgid "Reminder Details"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "To Review"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,freq:0
+#: field:calendar.event,freq:0
+#: field:calendar.todo,freq:0
+msgid "Frequency"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Done"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,interval:0
+#: help:calendar.todo,interval:0
+msgid "Repeat every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: field:base_calendar.invite.attendee,user_ids:0
+msgid "Users"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "of"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+#: view:calendar.event.edit.all:0
+msgid "Cancel"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Tuesday"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,description:0
+msgid ""
+"Provides a more complete                             description of the "
+"calendar component, than that                             provided by the "
+"\"SUMMARY\" property"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Responsible User"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,availability:0
+#: selection:calendar.event,show_as:0
+#: selection:calendar.todo,show_as:0
+#: selection:res.users,availability:0
+msgid "Busy"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_event
+msgid "Calendar Event"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,state:0
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Tentative"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,interval:0
+#: field:calendar.todo,interval:0
+msgid "Repeat every"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "Fix amout of times"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrency:0
+#: field:calendar.todo,recurrency:0
+msgid "Recurrent"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,rrule_type:0
+#: field:calendar.todo,rrule_type:0
+msgid "Recurrency"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_view_attendee_form
+#: model:ir.ui.menu,name:base_calendar.menu_attendee_invitations
+msgid "Event Invitations"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Thursday"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,exrule:0
+#: field:calendar.todo,exrule:0
+msgid "Exception Rule"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,language:0
+msgid ""
+"To specify the language for text values in aproperty or property parameter."
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Details"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,exrule:0
+#: help:calendar.todo,exrule:0
+msgid ""
+"Defines a rule or repeating pattern of time to exclude from the recurring "
+"rule."
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,month_list:0
+#: field:calendar.event,month_list:0
+#: field:calendar.todo,month_list:0
+msgid "Month"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+msgid "Invite People"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,rrule:0
+#: help:calendar.todo,rrule:0
+msgid ""
+"Defines a rule or repeating pattern for recurring events\n"
+"e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
+"      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,dir:0
+msgid "URI Reference"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,description:0
+#: view:calendar.event:0
+#: field:calendar.event,description:0
+#: field:calendar.event,name:0
+#: field:calendar.todo,description:0
+#: field:calendar.todo,name:0
+msgid "Description"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "May"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,type:0
+#: view:calendar.attendee:0
+msgid "Type"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Search Invitations"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_occurs:0
+#: selection:res.alarm,trigger_occurs:0
+msgid "After"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Stop"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_values
+msgid "ir.values"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_model
+msgid "Objects"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Delegated"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,sa:0
+#: field:calendar.event,sa:0
+#: field:calendar.todo,sa:0
+msgid "Sat"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Choose day where repeat the meeting"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Minutely"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,sent_by:0
+msgid "Specify the user that is acting on behalf of the calendar user"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event.edit.all,date_deadline:0
+msgid "End Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "February"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Months"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Resource"
+msgstr ""
+
+#. module: base_calendar
+#: field:res.alarm,name:0
+msgid "Name"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_alarm
+msgid "Event alarm information"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,name:0
+msgid ""
+"Contains the text to be                      used as the message subject for "
+"email                      or contains the text to be used for display"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,alarm_id:0
+#: field:calendar.event,base_calendar_alarm_id:0
+#: field:calendar.todo,alarm_id:0
+#: field:calendar.todo,base_calendar_alarm_id:0
+msgid "Alarm"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
+#, python-format
+msgid "Please Apply Recurrency before applying Exception Rule."
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,sent_by_uid:0
+msgid "Sent By User"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "April"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Recurrency period"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,week_list:0
+#: field:calendar.event,week_list:0
+#: field:calendar.todo,week_list:0
+msgid "Weekday"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,byday:0
+#: field:calendar.event,byday:0
+#: field:calendar.todo,byday:0
+msgid "By day"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,model_id:0
+msgid "Model"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Audio"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,id:0
+#: field:calendar.todo,id:0
+msgid "ID"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "For information Purpose"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+msgid "Invite"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_attendee
+msgid "Attendee information"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,res_id:0
+msgid "Resource ID"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,state:0
+msgid "Needs Action"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,sent_by:0
+msgid "Sent By"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,sequence:0
+#: field:calendar.todo,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,alarm_id:0
+#: help:calendar.todo,alarm_id:0
+msgid "Set an alarm at this time, before the event occurs"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base_calendar.invite.attendee,type:0
+msgid "Internal User"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Accept"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Saturday"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation To"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Second"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,availability:0
+#: field:res.users,availability:0
+msgid "Free/Busy"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,end_type:0
+#: field:calendar.todo,end_type:0
+msgid "Way to end reccurency"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,duration:0
+#: field:calendar.alarm,trigger_duration:0
+#: field:calendar.event,duration:0
+#: field:calendar.todo,date:0
+#: field:calendar.todo,duration:0
+#: field:res.alarm,duration:0
+#: field:res.alarm,trigger_duration:0
+msgid "Duration"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base_calendar.invite.attendee,type:0
+msgid "External Email"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_date:0
+msgid "Trigger Date"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,attach:0
+msgid ""
+"* Points to a sound resource,                     which is rendered when the "
+"alarm is triggered for audio,\n"
+"                    * File which is intended to be sent as message "
+"attachments for email,\n"
+"                    * Points to a procedure resource, which is invoked when  "
+"                    the alarm is triggered for procedure."
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fifth"
+msgstr ""
diff --git a/addons/base_synchro/i18n/ru.po b/addons/base_synchro/i18n/ru.po
index 2d5595e3191..1bc566195b9 100644
--- a/addons/base_synchro/i18n/ru.po
+++ b/addons/base_synchro/i18n/ru.po
@@ -8,24 +8,24 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-12-11 22:14+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2011-04-25 08:58+0000\n"
+"Last-Translator: Viktor Prokopiev <Unknown>\n"
 "Language-Team: Russian <ru@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: 2011-01-15 05:56+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-26 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: base_synchro
 #: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro
 msgid "Base Synchronization"
-msgstr ""
+msgstr "Базовая синхронизация"
 
 #. module: base_synchro
 #: field:base.synchro.server,server_db:0
 msgid "Server Database"
-msgstr ""
+msgstr "База данных сервера"
 
 #. module: base_synchro
 #: view:base.synchro.server:0
@@ -46,7 +46,7 @@ msgstr "Последняя синхронизация"
 #. module: base_synchro
 #: field:base.synchro,user_id:0
 msgid "Send Result To"
-msgstr ""
+msgstr "Отправить результат"
 
 #. module: base_synchro
 #: model:ir.model,name:base_synchro.model_base_synchro_obj_avoid
@@ -56,7 +56,7 @@ msgstr "Не синхронизируемые поля"
 #. module: base_synchro
 #: view:base.synchro:0
 msgid "_Close"
-msgstr ""
+msgstr "_Закрыть"
 
 #. module: base_synchro
 #: view:base.synchro:0
@@ -66,7 +66,7 @@ msgstr "Передача данных на сервер"
 #. module: base_synchro
 #: model:ir.model,name:base_synchro.model_base_synchro_obj
 msgid "Register Class"
-msgstr ""
+msgstr "Класс регистра"
 
 #. module: base_synchro
 #: view:base.synchro.obj:0
@@ -127,7 +127,7 @@ msgstr "Пароль"
 #. module: base_synchro
 #: field:base.synchro.obj,avoid_ids:0
 msgid "Fields Not Sync."
-msgstr ""
+msgstr "Поля не синхронизированы"
 
 #. module: base_synchro
 #: selection:base.synchro.obj,action:0
@@ -147,12 +147,12 @@ msgstr "Поля"
 #. module: base_synchro
 #: view:base.synchro.obj.line:0
 msgid "Transfered Ids Details"
-msgstr ""
+msgstr "Сведения о переданных идентификаторах"
 
 #. module: base_synchro
 #: field:base.synchro.obj,action:0
 msgid "Synchronisation direction"
-msgstr ""
+msgstr "Направление синхронизации"
 
 #. module: base_synchro
 #: field:base.synchro.obj,server_id:0
@@ -164,12 +164,12 @@ msgstr "Сервер"
 #: model:ir.model,name:base_synchro.model_base_synchro_obj_line
 #: model:ir.ui.menu,name:base_synchro.menu_action_base_synchro_obj_line_tree
 msgid "Synchronized instances"
-msgstr ""
+msgstr "Синхронизированные экземпляры"
 
 #. module: base_synchro
 #: field:base.synchro.obj,active:0
 msgid "Active"
-msgstr ""
+msgstr "Активно"
 
 #. module: base_synchro
 #: view:base.synchro.obj:0
@@ -180,7 +180,7 @@ msgstr "Объект для синхронизации"
 #. module: base_synchro
 #: model:ir.module.module,shortdesc:base_synchro.module_meta_information
 msgid "Base Synchro"
-msgstr ""
+msgstr "Базовый Синхронизация"
 
 #. module: base_synchro
 #: model:ir.actions.act_window,name:base_synchro.action_base_synchro_server_tree
@@ -191,17 +191,17 @@ msgstr "Сервера для синхронизации"
 #. module: base_synchro
 #: view:base.synchro.obj:0
 msgid "Transfer Details"
-msgstr ""
+msgstr "Подробности передачи"
 
 #. module: base_synchro
 #: field:base.synchro.obj.line,remote_id:0
 msgid "Remote Id"
-msgstr ""
+msgstr "Удалённый идентификатор"
 
 #. module: base_synchro
 #: field:base.synchro.obj,line_id:0
 msgid "Ids Affected"
-msgstr ""
+msgstr "Затронутые идентификаторы"
 
 #. module: base_synchro
 #: model:ir.ui.menu,name:base_synchro.next_id_63
@@ -222,7 +222,7 @@ msgstr "Домен"
 #. module: base_synchro
 #: view:base.synchro:0
 msgid "_Synchronize"
-msgstr ""
+msgstr "_Синхронизировать"
 
 #. module: base_synchro
 #: view:base.synchro:0
@@ -237,7 +237,7 @@ msgstr "Имя сервера"
 #. module: base_synchro
 #: field:base.synchro.obj,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Последовательность"
 
 #. module: base_synchro
 #: view:base.synchro:0
@@ -245,48 +245,49 @@ msgid ""
 "The synchronisation has been started.You will receive a request when it's "
 "done."
 msgstr ""
+"Синхронизация была начата. Вы получите запрос когда все будет сделано."
 
 #. module: base_synchro
 #: field:base.synchro.server,server_port:0
 msgid "Server Port"
-msgstr ""
+msgstr "Порт сервера"
 
 #. module: base_synchro
 #: model:ir.ui.menu,name:base_synchro.menu_action_view_base_synchro
 msgid "Synchronize objects"
-msgstr ""
+msgstr "Синхронизировать объекты"
 
 #. module: base_synchro
 #: view:base.synchro:0
 msgid "Synchronization Complited!"
-msgstr ""
+msgstr "Синхронизация выполнена!"
 
 #. module: base_synchro
 #: model:ir.model,name:base_synchro.model_base_synchro
 msgid "base.synchro"
-msgstr ""
+msgstr "base.synchro"
 
 #. module: base_synchro
 #: field:base.synchro.obj.line,local_id:0
 msgid "Local Id"
-msgstr ""
+msgstr "Локальный идентификатор"
 
 #. module: base_synchro
 #: model:ir.actions.act_window,name:base_synchro.actions_regclass_tree
 #: model:ir.actions.act_window,name:base_synchro.actions_transfer_line_form
 msgid "Filters"
-msgstr ""
+msgstr "Фильтры"
 
 #. module: base_synchro
 #: selection:base.synchro.obj,action:0
 msgid "Download"
-msgstr ""
+msgstr "Загрузить"
 
 #. module: base_synchro
 #: field:base.synchro,server_url:0
 #: field:base.synchro.server,server_url:0
 msgid "Server URL"
-msgstr ""
+msgstr "Адрес сервера"
 
 #~ msgid "The name of the module must be unique !"
 #~ msgstr "Название модуля должно быть уникальным !"
diff --git a/addons/crm/i18n/ru.po b/addons/crm/i18n/ru.po
index 21c2bb2263d..d4e920041b5 100644
--- a/addons/crm/i18n/ru.po
+++ b/addons/crm/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-04-15 19:44+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2011-04-25 08:48+0000\n"
+"Last-Translator: Stanislav Hanzhin <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: 2011-04-16 04:58+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-26 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -271,6 +271,10 @@ msgid ""
 "sort out your leads analysis by different groups to get accurate grained "
 "analysis."
 msgstr ""
+"Анализ кандидатов позволяет контролировать различную информацию о "
+"взаимоотношениях с клиентами. Проверять частоту обращений, количество "
+"ответов и отосланных писем. Вы можете разбить анализ кандидатов на группы "
+"для получения более подробного анализа."
 
 #. module: crm
 #: view:crm.lead:0
@@ -448,6 +452,11 @@ msgid ""
 "customer. You can also import a .CSV file with a list of calls to be done by "
 "your sales team."
 msgstr ""
+"\"Исходящие звонки\" - список всех звонков, которые предстоит сделать вашему "
+"отделу продаж. Менеджер продаж может записывать информацию о звонке. Эта "
+"информация будет привязана к контрагенту для отслеживания каждого контакта с "
+"ним. Так же вы можете импортировать файл в формате CSV со списком "
+"необходимых звонков звонков вашего отдела продаж."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_action
@@ -660,6 +669,8 @@ msgid ""
 "Default state of mind for period preceeding the 'Max Interval' computation. "
 "This is the starting state of mind by default if the partner has no event."
 msgstr ""
+"Мнение по умолчанию для периода предшествующего вычислению 'Макс. интервал'. "
+"Это мнение по умолчанию для контрагентов без обращений."
 
 #. module: crm
 #: selection:crm.meeting,end_type:0
@@ -1317,7 +1328,7 @@ msgstr "Рассылки"
 #. module: crm
 #: field:crm.meeting,class:0
 msgid "Mark as"
-msgstr "Пометить как"
+msgstr "Отметить как"
 
 #. module: crm
 #: field:crm.meeting,count:0
@@ -1327,7 +1338,7 @@ msgstr "Повторить"
 #. module: crm
 #: help:crm.meeting,rrule_type:0
 msgid "Let the event automatically repeat at that interval"
-msgstr "Пусть события автоматически повторяются с этим интервалом"
+msgstr "Пусть событие автоматически повторяется с этим интервалом"
 
 #. module: crm
 #: view:base.action.rule:0
@@ -1434,7 +1445,7 @@ msgstr "crm.lead"
 #. module: crm
 #: field:crm.meeting,write_date:0
 msgid "Write Date"
-msgstr ""
+msgstr "Дата записи"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1537,7 +1548,7 @@ msgstr "Предложения по категориям"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Choose day in the month where repeat the meeting"
-msgstr "Выбери день месяца, когда повторить встречу."
+msgstr "Выберите день месяца, когда повторить встречу."
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1622,7 +1633,7 @@ msgstr "Объединить два предложения"
 #. module: crm
 #: selection:crm.meeting,end_type:0
 msgid "Fix amout of times"
-msgstr ""
+msgstr "Определенное количество раз"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1785,6 +1796,10 @@ msgid ""
 "sent/to be sent to your colleagues/partners. You can not only invite OpenERP "
 "users, but also external parties, such as a customer."
 msgstr ""
+"Используя \"Приглашения\" вы можете создавать и управлять приглашениями на "
+"совещания, которые отправлены или будут отправлены вашим "
+"коллегам/контрагентам. Вы можете приглашать не только пользователей OpenERP, "
+"но и внешних адресатов, например заказчиков."
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
@@ -1940,6 +1955,10 @@ msgid ""
 "with a partner. From the phone call form, you can trigger a request for "
 "another call, a meeting or an opportunity."
 msgstr ""
+"Функция \"Входящие звонки\" позволяет вам быстро описывать входящие звонки. "
+"Каждый звонок будет связан с контрагентом для отслеживания каждого контакта. "
+"Из формы ввода звонка вы можете запланировать следующий звонок, совещание "
+"или предложение."
 
 #. module: crm
 #: help:crm.meeting,recurrency:0
@@ -2472,7 +2491,7 @@ msgstr ""
 #. module: crm
 #: help:crm.installer,crm_fundraising:0
 msgid "This may help associations in their fundraising process and tracking."
-msgstr ""
+msgstr "Это может помочь ассоциациям в сборе средств и их отслеживании."
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
@@ -2527,7 +2546,7 @@ msgstr "Другое"
 #: selection:crm.meeting,state:0
 #: selection:crm.phonecall,state:0
 msgid "Done"
-msgstr "Готово"
+msgstr "Сделано"
 
 #. module: crm
 #: help:crm.meeting,interval:0
@@ -2587,7 +2606,7 @@ msgstr "Техподдержка"
 #. module: crm
 #: field:crm.meeting,recurrency:0
 msgid "Recurrent"
-msgstr "Повторение"
+msgstr "Повторяющийся"
 
 #. module: crm
 #: code:addons/crm/crm.py:397
@@ -2742,7 +2761,7 @@ msgstr "Кандидат в Предложение"
 #. module: crm
 #: model:ir.model,name:crm.model_calendar_attendee
 msgid "Attendee information"
-msgstr "Информация о участнике"
+msgstr "Информация об участнике"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -2940,7 +2959,7 @@ msgstr "Кем предложено"
 #: view:crm.lead:0
 #: model:ir.model,name:crm.model_crm_add_note
 msgid "Add Internal Note"
-msgstr "Добавить внутреннею запись"
+msgstr "Добавить внутреннею заметку"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:304
@@ -3916,7 +3935,7 @@ msgstr "Подтвердить"
 #. module: crm
 #: field:crm.segmentation.line,expr_name:0
 msgid "Control Variable"
-msgstr ""
+msgstr "Управляющая переменная"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
diff --git a/addons/hr_attendance/i18n/pt_BR.po b/addons/hr_attendance/i18n/pt_BR.po
index e4a98842975..a742e3352e7 100644
--- a/addons/hr_attendance/i18n/pt_BR.po
+++ b/addons/hr_attendance/i18n/pt_BR.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: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-02-09 00:37+0000\n"
-"Last-Translator: Luiz Fernando M.França <Unknown>\n"
+"PO-Revision-Date: 2011-04-25 23:40+0000\n"
+"Last-Translator: Emerson <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: 2011-02-10 04:35+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-26 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
@@ -24,12 +24,12 @@ msgstr ""
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar Por..."
 
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
-msgstr ""
+msgstr "Hoje"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -42,6 +42,8 @@ msgid ""
 "You did not sign out the last time. Please enter the date and time you "
 "signed out."
 msgstr ""
+"Da última vez você não deu a saída. Favor digitar a data e hora que você "
+"saiu."
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
@@ -56,7 +58,7 @@ msgstr "Motivo"
 #. module: hr_attendance
 #: view:hr.attendance.error:0
 msgid "Print Attendance Report Error"
-msgstr ""
+msgstr "Imprimir Relatório de Erro de Frequência"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:156
@@ -80,18 +82,18 @@ msgstr ""
 #. module: hr_attendance
 #: view:hr.action.reason:0
 msgid "Attendance reasons"
-msgstr ""
+msgstr "Razões de frequência"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
 #: field:hr.attendance,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dia"
 
 #. module: hr_attendance
 #: selection:hr.employee,state:0
 msgid "Present"
-msgstr "Atual"
+msgstr "Presente"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_sign_in_out_ask
@@ -107,29 +109,31 @@ msgstr ""
 #. module: hr_attendance
 #: view:hr.sign.in.out:0
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #. module: hr_attendance
 #: view:hr.action.reason:0
 msgid "Define attendance reason"
-msgstr ""
+msgstr "Definir razões de frequência"
 
 #. module: hr_attendance
 #: constraint:hr.employee:0
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
+"Erro! Você não pode selecionar um departamento do qual o funcionário é o "
+"gerente."
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
-msgstr ""
+msgstr "Frequências Por Mês"
 
 #. module: hr_attendance
 #: field:hr.sign.in.out,name:0
 #: field:hr.sign.in.out.ask,name:0
 msgid "Employees name"
-msgstr ""
+msgstr "Nome do Funcionário"
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.open_view_attendance_reason
@@ -173,7 +177,7 @@ msgstr "A data de entrada precisa ser anterior"
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:162
 #, python-format
 msgid "A sign-in must be right after a sign-out !"
-msgstr ""
+msgstr "Uma entrada deve ocorrer sempre após uma saída!"
 
 #. module: hr_attendance
 #: field:hr.employee,state:0
@@ -184,13 +188,13 @@ msgstr "Frequência"
 #. module: hr_attendance
 #: field:hr.attendance.error,max_delay:0
 msgid "Max. Delay (Min)"
-msgstr ""
+msgstr "Atraso Máx. (Min)"
 
 #. module: hr_attendance
 #: view:hr.attendance.error:0
 #: view:hr.attendance.month:0
 msgid "Print"
-msgstr ""
+msgstr "Imprimir"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
@@ -206,6 +210,13 @@ msgid ""
 "    actions(Sign in/Sign out) performed by them.\n"
 "       "
 msgstr ""
+"\n"
+"    Este módulo tem como objetivo o gerenciamento de frequência de "
+"funcionários.\n"
+"    Ele mantém o apontamento das frequências com base nas ações "
+"(Entrada/Saída)\n"
+"    executadas pelos funcionários.\n"
+"       "
 
 #. module: hr_attendance
 #: constraint:hr.attendance:0
@@ -232,7 +243,7 @@ msgstr "Data de Início"
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
-msgstr ""
+msgstr "Atraso Mín."
 
 #. module: hr_attendance
 #: selection:hr.attendance,action:0
@@ -249,7 +260,7 @@ msgstr "Operação"
 #: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
 #, python-format
 msgid "No Data Available"
-msgstr ""
+msgstr "Nenhum Dado Disponível"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -281,12 +292,12 @@ msgstr ""
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
 msgid "Print Monthly Attendance Report"
-msgstr ""
+msgstr "Imprimir Relatório de Frequência Mensal"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_sign_in_out
 msgid "Sign In Sign Out"
-msgstr ""
+msgstr "Entrada e Saída"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:103
@@ -302,7 +313,7 @@ msgstr "Entrada / Saída"
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 msgid "hr.sign.out.ask"
-msgstr ""
+msgstr "hr.sign.out.ask"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -323,7 +334,7 @@ msgstr "Junho"
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_error
 msgid "Print Error Attendance Report"
-msgstr ""
+msgstr "Imprimir Relatório de Erros de Frequência"
 
 #. module: hr_attendance
 #: model:ir.module.module,shortdesc:hr_attendance.module_meta_information
@@ -343,7 +354,7 @@ msgstr "Novembro"
 #. module: hr_attendance
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Erro! Você não pode criar uma Hierarquia de Funcionários recursiva."
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -353,7 +364,7 @@ msgstr "Outubro"
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendances"
-msgstr ""
+msgstr "Minhas Frequências"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -375,7 +386,7 @@ msgstr ""
 #. module: hr_attendance
 #: view:hr.sign.in.out:0
 msgid "Sign-Out Entry must follow Sign-In."
-msgstr ""
+msgstr "Um apontamento de Saída deve ser depois da Entrada."
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
@@ -400,17 +411,17 @@ msgstr ""
 #. module: hr_attendance
 #: field:hr.sign.in.out,emp_id:0
 msgid "Employee ID"
-msgstr ""
+msgstr "ID de Funcionário"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_week
 msgid "Print Week Attendance Report"
-msgstr ""
+msgstr "Imprimir Relatório de Frequência Semanal"
 
 #. module: hr_attendance
 #: field:hr.sign.in.out.ask,emp_id:0
 msgid "Empoyee ID"
-msgstr ""
+msgstr "ID de Funcionário"
 
 #. module: hr_attendance
 #: view:hr.attendance.error:0
@@ -423,7 +434,7 @@ msgstr "Cancelar"
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
-msgstr ""
+msgstr "Especifica a razão para Entrada/Saída."
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
@@ -436,7 +447,7 @@ msgstr ""
 #. module: hr_attendance
 #: view:hr.attendance.month:0
 msgid "Print Attendance Report Monthly"
-msgstr ""
+msgstr "Imprimir Relatório de Frequência Mensal"
 
 #. module: hr_attendance
 #: selection:hr.action.reason,action_type:0
@@ -510,7 +521,7 @@ msgstr ""
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
 msgid "Employee's Name"
-msgstr ""
+msgstr "Nome do Funcionário"
 
 #. module: hr_attendance
 #: selection:hr.employee,state:0
@@ -551,7 +562,7 @@ msgstr "Indique este atraso, o erro é considerado para ser voluntário"
 #: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
 #, python-format
 msgid "No records found for your selection!"
-msgstr ""
+msgstr "Nenhum registro encontrado para sua consulta!"
 
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
@@ -559,6 +570,8 @@ msgid ""
 "You did not sign in the last time. Please enter the date and time you signed "
 "in."
 msgstr ""
+"Da última vez você não deu entrada. Favor digitar a data e hora que você "
+"entrou."
 
 #. module: hr_attendance
 #: field:hr.attendance.month,year:0
@@ -568,7 +581,7 @@ msgstr "Ano"
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 msgid "hr.sign.in.out.ask"
-msgstr ""
+msgstr "hr.sign.in.out.ask"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/hr_timesheet_sheet/i18n/pt_BR.po b/addons/hr_timesheet_sheet/i18n/pt_BR.po
index 1f60699b465..01c35333f17 100644
--- a/addons/hr_timesheet_sheet/i18n/pt_BR.po
+++ b/addons/hr_timesheet_sheet/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-03-15 15:37+0000\n"
-"Last-Translator: Joe Pimentel <joe.b.pimentel@gmail.com>\n"
+"PO-Revision-Date: 2011-04-23 20:29+0000\n"
+"Last-Translator: Emerson <Unknown>\n"
 "Language-Team: <pt@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: 2011-03-16 04:47+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-24 04:37+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
@@ -40,7 +40,7 @@ msgstr "Planilha"
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
 msgid "Service"
-msgstr ""
+msgstr "Serviço"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
@@ -53,7 +53,7 @@ msgstr "Não há funcionário definido para seu usuário!"
 #: view:hr_timesheet_sheet.sheet:0
 #: view:timesheet.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar Por..."
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
@@ -67,7 +67,7 @@ msgstr "Presença Total"
 #: view:timesheet.report:0
 #: field:timesheet.report,department_id:0
 msgid "Department"
-msgstr ""
+msgstr "Departamento"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
@@ -91,7 +91,7 @@ msgstr ""
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Março"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -100,7 +100,7 @@ msgstr ""
 #: view:timesheet.report:0
 #: field:timesheet.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Empresa"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -127,7 +127,7 @@ msgstr "Data até"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
 msgid "Based on the timesheet"
-msgstr ""
+msgstr "Baseado na planilha de apontamento"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
@@ -151,7 +151,7 @@ msgstr "Presente"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 msgid "Total Cost"
-msgstr ""
+msgstr "Custo Total"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:608
@@ -195,12 +195,12 @@ msgstr "Você não pode efetuar entrada em uma data diferente de hoje"
 #: view:hr.timesheet.report:0
 #: view:timesheet.report:0
 msgid " Month-1 "
-msgstr ""
+msgstr " Mês-1 "
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
 msgid "Validation"
-msgstr ""
+msgstr "Validação"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:199
@@ -237,7 +237,7 @@ msgstr "Data de"
 #: view:hr.timesheet.report:0
 #: view:timesheet.report:0
 msgid " Month "
-msgstr ""
+msgstr " Mês "
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -299,14 +299,14 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Erro! Você não pode criar empresas recursivas."
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state:0
 #: view:timesheet.report:0
 #: field:timesheet.report,state:0
 msgid "State"
-msgstr ""
+msgstr "Status"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
@@ -316,7 +316,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,employee_id:0
 msgid "Employee"
-msgstr ""
+msgstr "Funcionário"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
@@ -363,7 +363,7 @@ msgstr "Linhas do Apontamento de Horas"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 msgid "Hours"
-msgstr ""
+msgstr "Horas"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0
@@ -397,7 +397,7 @@ msgstr ""
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Julho"
 
 #. module: hr_timesheet_sheet
 #: view:res.company:0
@@ -427,7 +427,7 @@ msgstr "Visão Diária"
 #: view:timesheet.report:0
 #: field:timesheet.report,quantity:0
 msgid "#Quantity"
-msgstr ""
+msgstr "#Quantidade"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_timesheet:0
@@ -466,18 +466,18 @@ msgstr "Ir para:"
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Setembro"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Dezembro"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "It will open your current timesheet"
-msgstr ""
+msgstr "Isto irá abrir sua planilha de apontamento atual"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -497,7 +497,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "In Draft"
-msgstr ""
+msgstr "Provisório"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
@@ -507,7 +507,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
 msgid "Billing"
-msgstr ""
+msgstr "Cobrança"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
@@ -556,7 +556,7 @@ msgstr ""
 #: view:hr.timesheet.report:0
 #: view:timesheet.report:0
 msgid " Year "
-msgstr ""
+msgstr " Ano "
 
 #. module: hr_timesheet_sheet
 #: selection:res.company,timesheet_range:0
@@ -567,13 +567,13 @@ msgstr "Semana"
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Junho"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state_attendance:0
@@ -618,13 +618,13 @@ msgstr "Data"
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembro"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 #: view:timesheet.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtros Extendidos..."
 
 #. module: hr_timesheet_sheet
 #: field:res.company,timesheet_range:0
@@ -645,7 +645,7 @@ msgstr ""
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Outubro"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
@@ -659,7 +659,7 @@ msgstr ""
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Janeiro"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
@@ -669,12 +669,12 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Empresas"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,quantity:0
 msgid "Quantity"
-msgstr ""
+msgstr "Quantidade"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -728,12 +728,12 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
 msgid "Validated"
-msgstr ""
+msgstr "Validado"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
@@ -804,7 +804,7 @@ msgstr "Linha de Apontamento de Horas"
 #: view:timesheet.report:0
 #: field:timesheet.report,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Produto"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -829,7 +829,7 @@ msgstr ""
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Maio"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
@@ -879,12 +879,12 @@ msgstr "Ausente"
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Fevereiro"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Employees"
-msgstr ""
+msgstr "Funcionários"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
@@ -895,12 +895,12 @@ msgstr ""
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
 msgid "Confirmation"
-msgstr ""
+msgstr "Confirmação"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
@@ -910,7 +910,7 @@ msgstr "Taxa da Fatura"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Approve"
-msgstr ""
+msgstr "Aprovar"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -921,7 +921,7 @@ msgstr "Contas analíticas"
 #: view:timesheet.report:0
 #: field:timesheet.report,to_invoice:0
 msgid "Type of Invoicing"
-msgstr ""
+msgstr "Tipo de Faturamento"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0
@@ -932,7 +932,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,cost:0
 msgid "Cost"
-msgstr ""
+msgstr "Custo"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
diff --git a/addons/knowledge/i18n/it.po b/addons/knowledge/i18n/it.po
index 6ea8185e2be..58bdb25ee37 100644
--- a/addons/knowledge/i18n/it.po
+++ b/addons/knowledge/i18n/it.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-12 13:16+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-04-23 12:03+0000\n"
+"Last-Translator: simone.sandri <Unknown>\n"
 "Language-Team: Italian <it@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: 2011-01-15 05:53+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-24 04:37+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document
@@ -72,7 +72,7 @@ msgstr ""
 #. module: knowledge
 #: view:knowledge.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configura"
 
 #. module: knowledge
 #: view:knowledge.installer:0
diff --git a/addons/l10n_ca/i18n/it.po b/addons/l10n_ca/i18n/it.po
index 436cee96aa4..049f1e72e18 100644
--- a/addons/l10n_ca/i18n/it.po
+++ b/addons/l10n_ca/i18n/it.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-02 21:08+0000\n"
-"PO-Revision-Date: 2011-01-13 23:14+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2011-04-23 12:00+0000\n"
+"Last-Translator: simone.sandri <Unknown>\n"
 "Language-Team: Italian <it@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: 2011-01-14 05:51+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-24 04:37+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_receivable
@@ -122,9 +122,9 @@ msgstr ""
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_income
 msgid "Income"
-msgstr ""
+msgstr "Entrate"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_view
 msgid "View"
-msgstr ""
+msgstr "Visualizza"
diff --git a/addons/l10n_cr/i18n/it.po b/addons/l10n_cr/i18n/it.po
index de6eb7d021c..45579f226d4 100644
--- a/addons/l10n_cr/i18n/it.po
+++ b/addons/l10n_cr/i18n/it.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-07 05:56+0000\n"
-"PO-Revision-Date: 2011-02-15 15:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-04-23 12:04+0000\n"
+"Last-Translator: simone.sandri <Unknown>\n"
 "Language-Team: Italian <it@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: 2011-02-16 05:03+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-04-24 04:37+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: l10n_cr
 #: model:res.partner.title,name:l10n_cr.res_partner_title_ing
@@ -156,7 +156,7 @@ msgstr ""
 #. module: l10n_cr
 #: model:res.partner.title,name:l10n_cr.res_partner_title_asoc
 msgid "Asociation"
-msgstr ""
+msgstr "Associazione"
 
 #. module: l10n_cr
 #: model:res.partner.title,shortcut:l10n_cr.res_partner_title_asoc
diff --git a/addons/mrp_repair/i18n/it.po b/addons/mrp_repair/i18n/it.po
index 4bc9f8888a0..c5138d7755d 100644
--- a/addons/mrp_repair/i18n/it.po
+++ b/addons/mrp_repair/i18n/it.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: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-12 14:03+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-04-23 12:05+0000\n"
+"Last-Translator: simone.sandri <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: 2011-01-15 05:47+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-24 04:37+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -337,7 +337,7 @@ msgstr "Cerca ordini di riparazione"
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "(Add)"
-msgstr ""
+msgstr "(Aggiungi)"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair_line
@@ -412,7 +412,7 @@ msgstr "Prepara Fatture"
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "(Remove)"
-msgstr ""
+msgstr "(Rimuovi)"
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,type:0
@@ -522,7 +522,7 @@ msgstr ""
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Quotations"
-msgstr ""
+msgstr "Quotazioni"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,product_uom_qty:0
diff --git a/addons/outlook/i18n/tr.po b/addons/outlook/i18n/tr.po
index ed0f1b4c7ff..6d24ae529c4 100644
--- a/addons/outlook/i18n/tr.po
+++ b/addons/outlook/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-03-17 17:54+0000\n"
-"Last-Translator: Arif Aydogmus <arifaydogmus@gmail.com>\n"
+"PO-Revision-Date: 2011-04-24 16:22+0000\n"
+"Last-Translator: lo_ol <Unknown>\n"
 "Language-Team: Turkish <tr@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: 2011-03-18 04:59+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-25 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: outlook
 #: field:outlook.installer,doc_file:0
@@ -93,14 +93,14 @@ msgstr "Belgeleme dosyası :- how to install Outlook Plug-in."
 #. module: outlook
 #: model:ir.model,name:outlook.model_outlook_installer
 msgid "outlook.installer"
-msgstr ""
+msgstr "outlook.yükleyicisi"
 
 #. module: outlook
 #: model:ir.actions.act_window,name:outlook.action_outlook_installer
 #: model:ir.actions.act_window,name:outlook.action_outlook_wizard
 #: view:outlook.installer:0
 msgid "Outlook Plug-In Configuration"
-msgstr ""
+msgstr "Outlook eklenti-içe özel yapılandırma ayarları"
 
 #. module: outlook
 #: field:outlook.installer,progress:0
@@ -123,6 +123,8 @@ msgid ""
 "Allows you to select an object that you would like to add to your email and "
 "its attachments."
 msgstr ""
+"Size, e-postanıza ve eklerine eklemeniz için begendiğiniz bir nesneyi "
+"seçmeyi sağlar."
 
 #. module: outlook
 #: view:outlook.installer:0
@@ -149,8 +151,10 @@ msgstr "Resim"
 msgid ""
 "outlook plug-in file. Save as this file and install this plug-in in outlook."
 msgstr ""
+"Outlook eklenti-içe dosyası. Bu dosyayı kayıt edin ve bu eklenti-içe'yi "
+"outlook'a yükleyin"
 
 #. module: outlook
 #: view:outlook.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Yapılandır"
diff --git a/addons/procurement/i18n/tr.po b/addons/procurement/i18n/tr.po
new file mode 100644
index 00000000000..278c74b1fb4
--- /dev/null
+++ b/addons/procurement/i18n/tr.po
@@ -0,0 +1,906 @@
+# Turkish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-25 11:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish <tr@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: 2011-04-26 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: procurement
+#: view:make.procurement:0
+msgid "Ask New Products"
+msgstr "Yeni Ürün Oluştur"
+
+#. module: procurement
+#: model:ir.ui.menu,name:procurement.menu_stock_sched
+msgid "Schedulers"
+msgstr "Zamanlayıcılar"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_make_procurement
+msgid "Make Procurements"
+msgstr "Sipariş Oluştur"
+
+#. module: procurement
+#: help:procurement.order.compute.all,automatic:0
+msgid ""
+"Triggers an automatic procurement for all products that have a virtual stock "
+"under 0. You should probably not use this option, we suggest using a MTO "
+"configuration on products."
+msgstr ""
+"Stok miktarı 0 ın altına inen tüm ürünler için otomatik bir tedarik sürecini "
+"tetikler. Bu seçeneği muhtemelen kullanmamalısınız, ürünler için MTO "
+"ayarlarını kullanmanızı tavsiye ederiz."
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Group By..."
+msgstr "Grupla..."
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,procurement_draft_ids:0
+msgid "Draft procurement of the product and location of that orderpoint"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:288
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr "Bu ürün için tedarikçi tanımı bulunamadı!"
+
+#. module: procurement
+#: field:make.procurement,uom_id:0
+msgid "Unit of Measure"
+msgstr "Ölçü Birimi"
+
+#. module: procurement
+#: field:procurement.order,procure_method:0
+msgid "Procurement Method"
+msgstr "Satınalma Yöntemi"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:298
+#, python-format
+msgid "No address defined for the supplier"
+msgstr "Bu tedarikçi için bir adres tanımı bulunamadı!"
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.action_procurement_compute
+msgid "Compute Stock Minimum Rules Only"
+msgstr "Sadece Minimum Stok Kuralını Hesapla"
+
+#. module: procurement
+#: field:procurement.order,company_id:0
+#: field:stock.warehouse.orderpoint,company_id:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: procurement
+#: field:procurement.order,product_uos_qty:0
+msgid "UoS Quantity"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,name:0
+msgid "Reason"
+msgstr "Sebep"
+
+#. module: procurement
+#: view:procurement.order.compute:0
+msgid "Compute Procurements"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,message:0
+msgid "Latest error"
+msgstr "Son Hata"
+
+#. module: procurement
+#: help:mrp.property,composition:0
+msgid "Not used in computations, for information purpose only."
+msgstr "Sadece bilgi amaçlıdır, hesaplamalarda kullanılmaz."
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,procurement_id:0
+msgid "Latest procurement"
+msgstr "Son satınalma"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Notes"
+msgstr "Notlar"
+
+#. module: procurement
+#: selection:procurement.order,procure_method:0
+msgid "on order"
+msgstr "Sipariş"
+
+#. module: procurement
+#: help:procurement.order,message:0
+msgid "Exception occurred while computing procurement orders."
+msgstr "Satınalma emirlerini işlerken bir istisna oluştu."
+
+#. module: procurement
+#: help:procurement.order,state:0
+msgid ""
+"When a procurement is created the state is set to 'Draft'.\n"
+" If the procurement is confirmed, the state is set to 'Confirmed'.           "
+" \n"
+"After confirming the state is set to 'Running'.\n"
+" If any exception arises in the order then the state is set to 'Exception'.\n"
+" Once the exception is removed the state becomes 'Ready'.\n"
+" It is in 'Waiting'. state when the procurement is waiting for another one "
+"to finish."
+msgstr ""
+"Satınalma ilk  'Taslak' durumunda oluşturulur.\n"
+" Satınalma onaylandığında durumu 'Onaylandı' olur.            \n"
+"Onaylandıktan sonra durumu 'Yolda' olur.\n"
+" Bir istisna oluşursa durumu 'İstisna' olur.\n"
+" İstisna kaldırıldıktan sonra 'Hazır' durumuna geçer.\n"
+" Başka bir satınalmanın tamamlanmasını bekliyorsa 'Beklemede' durumundadır."
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Minimum Stock Rules Search"
+msgstr "Minimum Stok Kuralı Arama"
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,product_min_qty:0
+msgid ""
+"When the virtual stock goes belong the Min Quantity, OpenERP generates a "
+"procurement to bring the virtual stock to the Max Quantity."
+msgstr ""
+"Stok Min. Değer altına indiğinde, OpenERP stoğu Max. Değere getirecek bir "
+"satınalma oluşturur."
+
+#. module: procurement
+#: view:procurement.order.compute.all:0
+msgid "Scheduler Parameters"
+msgstr "Zamanlayıcı Parametreleri"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_move
+msgid "Stock Move"
+msgstr "Stok Hareketi"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Planification"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Ready"
+msgstr "Hazır"
+
+#. module: procurement
+#: field:procurement.order.compute.all,automatic:0
+msgid "Automatic orderpoint"
+msgstr "Otomatik Sipariş Noktası"
+
+#. module: procurement
+#: field:mrp.property,composition:0
+msgid "Properties composition"
+msgstr "Özellik Birleşimi"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Confirmed"
+msgstr "Onaylandı"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Retry"
+msgstr "Yeniden Dene"
+
+#. module: procurement
+#: view:procurement.order.compute:0
+#: view:procurement.orderpoint.compute:0
+msgid "Parameters"
+msgstr "Parametreler"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Confirm"
+msgstr "Onayla"
+
+#. module: procurement
+#: help:procurement.order,origin:0
+msgid ""
+"Reference of the document that created this Procurement.\n"
+"This is automatically completed by OpenERP."
+msgstr ""
+"Open ERP, bu satınalmayı başlatan belgeyi otomatik olarak kapamıştır."
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Procurement Orders to Process"
+msgstr ""
+
+#. module: procurement
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Hata! İç içe tekrarlayan şirketler seçemezsiniz."
+
+#. module: procurement
+#: field:procurement.order,priority:0
+msgid "Priority"
+msgstr "Öncelik"
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,state:0
+msgid "State"
+msgstr "Durum"
+
+#. module: procurement
+#: field:procurement.order,location_id:0
+#: view:stock.warehouse.orderpoint:0
+#: field:stock.warehouse.orderpoint,location_id:0
+msgid "Location"
+msgstr "Lokasyon"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_picking
+msgid "Picking List"
+msgstr "Paket Listesi"
+
+#. module: procurement
+#: field:make.procurement,warehouse_id:0
+#: view:stock.warehouse.orderpoint:0
+#: field:stock.warehouse.orderpoint,warehouse_id:0
+msgid "Warehouse"
+msgstr "Depo"
+
+#. module: procurement
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Best price (not yet active!)"
+msgstr "En İyi Fiyat(Henüz aktif değil)"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Product & Location"
+msgstr "Ürün & Lokasyon Bilgisi"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order_compute
+msgid "Compute Procurement"
+msgstr "Satınalmayı Hesapla"
+
+#. module: procurement
+#: model:ir.module.module,shortdesc:procurement.module_meta_information
+#: field:stock.move,procurements:0
+msgid "Procurements"
+msgstr "Satınalmalar"
+
+#. module: procurement
+#: field:res.company,schedule_range:0
+msgid "Scheduler Range Days"
+msgstr "Zamanlayıcı Gün Aralığı"
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.procurement_action
+msgid ""
+"A procurement order is used to record a need for a specific product at a "
+"specific location. A procurement order is usually created automatically from "
+"sales orders, a Pull Logistics rule or Minimum Stock Rules. When the "
+"procurement order is confirmed, it automatically creates the necessary "
+"operations to fullfil the need: purchase order proposition, manufacturing "
+"order, etc."
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,date_planned:0
+msgid "Planned Date"
+msgstr "Planlanan Tarih"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Group By"
+msgstr "Grupla"
+
+#. module: procurement
+#: field:make.procurement,qty:0
+#: field:procurement.order,product_qty:0
+msgid "Quantity"
+msgstr "Miktar"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:370
+#, python-format
+msgid "Not enough stock and no minimum orderpoint rule defined."
+msgstr "Yeterli stok yok ve minimum sipariş noktası kuralı tanımlı değil!"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:137
+#, python-format
+msgid "Invalid action !"
+msgstr "Geçersiz eylem !"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "References"
+msgstr "Referanslar"
+
+#. module: procurement
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Yapılandırma"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,qty_multiple:0
+msgid "Qty Multiple"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,procure_method:0
+msgid ""
+"If you encode manually a Procurement, you probably want to use a make to "
+"order method."
+msgstr ""
+
+#. module: procurement
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement
+msgid "Automatic Procurements"
+msgstr "Otomatik Satınalmalar"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_max_qty:0
+msgid "Max Quantity"
+msgstr "Max Miktar"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order
+#: model:process.process,name:procurement.process_process_procurementprocess0
+#: view:procurement.order:0
+msgid "Procurement"
+msgstr "Satınalma"
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.procurement_action
+msgid "Procurement Orders"
+msgstr "Satınalma Siparişleri"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "To Fix"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Exceptions"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,note:procurement.process_node_serviceonorder0
+msgid "Assignment from Production or Purchase Order."
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_mrp_property
+msgid "Property"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.act_make_procurement
+#: view:make.procurement:0
+msgid "Procurement Request"
+msgstr "Satınalma İsteği"
+
+#. module: procurement
+#: view:procurement.orderpoint.compute:0
+msgid "Compute Stock"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Late"
+msgstr "Geç"
+
+#. module: procurement
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr "Hizmet"
+
+#. module: procurement
+#: model:ir.module.module,description:procurement.module_meta_information
+msgid ""
+"\n"
+"    This is the module for computing Procurements.\n"
+"    "
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,procurement_draft_ids:0
+msgid "Related Procurement Orders"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.orderpoint.compute:0
+msgid ""
+"Wizard checks all the stock minimum rules and generate procurement order."
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_min_qty:0
+msgid "Min Quantity"
+msgstr "Min. Miktar"
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Urgent"
+msgstr "Acil"
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "plus"
+msgstr "artı"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:319
+#, python-format
+msgid ""
+"Please check the Quantity in Procurement Order(s), it should not be less "
+"than 1!"
+msgstr ""
+"Lütfen satınalma sipariş(ler)indeki miktarı kontrol ediniz, 1 günden az "
+"olamaz!"
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the "
+"orderpoint without removing it."
+msgstr ""
+"Seçili alan 'False' ise, satınalma noktasını kaldırmadan gizlemenize izin "
+"verecektir."
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,product_max_qty:0
+msgid ""
+"When the virtual stock goes belong the Max Quantity, OpenERP generates a "
+"procurement to bring the virtual stock to the Max Quantity."
+msgstr ""
+
+#. module: procurement
+#: help:procurement.orderpoint.compute,automatic:0
+msgid "If the stock of a product is under 0, it will act like an orderpoint"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Lines"
+msgstr "Satınalma Kalemleri"
+
+#. module: procurement
+#: view:procurement.order.compute.all:0
+msgid ""
+"This wizard allows you to run all procurement, production and/or purchase "
+"orders that should be processed based on their configuration. By default, "
+"the scheduler is launched automatically every night by OpenERP. You can use "
+"this menu to force it to be launched now. Note that it runs in the "
+"background, you may have to wait for a few minutes until it has finished "
+"computing."
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,note:0
+msgid "Note"
+msgstr "Not"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Draft"
+msgstr "Taslak"
+
+#. module: procurement
+#: view:procurement.order.compute:0
+msgid "This wizard will schedule procurements."
+msgstr "Bu sihirbaz satınalmaları zamanlayacaktır."
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Status"
+msgstr "Durum"
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: procurement
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr "Aynı üründen olmayan bir sarf atamaya çalışıyorsunuz"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,active:0
+msgid "Active"
+msgstr "Aktif"
+
+#. module: procurement
+#: model:process.node,name:procurement.process_node_procureproducts0
+msgid "Procure Products"
+msgstr "Ürünleri Satınal"
+
+#. module: procurement
+#: field:procurement.order,date_planned:0
+msgid "Scheduled date"
+msgstr "Planlanan Tarih"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Exception"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:179
+#, python-format
+msgid "Automatic OP: %s"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_orderpoint_compute
+msgid "Automatic Order Point"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
+msgid "Minimum Inventory Rule"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Extra Information"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,name:0
+msgid "Procurement name."
+msgstr ""
+
+#. module: procurement
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Reason"
+msgstr ""
+
+#. module: procurement
+#: sql_constraint:stock.warehouse.orderpoint:0
+msgid "Qty Multiple must be greater than zero."
+msgstr ""
+
+#. module: procurement
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Order to Max"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,date_close:0
+msgid "Date Closed"
+msgstr "Kapanış Tarihi"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:372
+#, python-format
+msgid "Procurement '%s' is in exception: not enough stock."
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:138
+#, python-format
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:318
+#, python-format
+msgid "Data Insufficient !"
+msgstr "Yetersiz Bilgi !"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_mrp_property_group
+#: field:mrp.property,group_id:0
+#: field:mrp.property.group,name:0
+msgid "Property Group"
+msgstr "Özellik Grubu"
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Misc"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Locations"
+msgstr "Lokasyonlar"
+
+#. module: procurement
+#: selection:procurement.order,procure_method:0
+msgid "from stock"
+msgstr "Stoktan"
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "General Information"
+msgstr "Genel Bilgi"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Run Procurement"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Done"
+msgstr "Tamamlandı"
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,qty_multiple:0
+msgid "The procurement quantity will by rounded up to this multiple."
+msgstr ""
+
+#. module: procurement
+#: view:make.procurement:0
+#: view:procurement.order:0
+#: selection:procurement.order,state:0
+#: view:procurement.order.compute:0
+#: view:procurement.order.compute.all:0
+#: view:procurement.orderpoint.compute:0
+msgid "Cancel"
+msgstr "Vazgeç"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,logic:0
+msgid "Reordering Mode"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,origin:0
+msgid "Source Document"
+msgstr "Kaynak Belge"
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Not urgent"
+msgstr "Acil Değil"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Current"
+msgstr "Mevcut"
+
+#. module: procurement
+#: view:board.board:0
+msgid "Procurements in Exception"
+msgstr "İstisnai Satınalmalar"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Details"
+msgstr "Detaylar"
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+msgid "Procurement Exceptions"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.act_procurement_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.act_product_product_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.act_stock_warehouse_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.action_orderpoint_form
+#: model:ir.ui.menu,name:procurement.menu_stock_order_points
+#: view:stock.warehouse.orderpoint:0
+msgid "Minimum Stock Rules"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,close_move:0
+msgid "Close Move at end"
+msgstr "Son Hareketi Kapat"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,product_id:0
+#: view:procurement.order:0
+#: field:procurement.order,product_id:0
+#: field:stock.warehouse.orderpoint,product_id:0
+msgid "Product"
+msgstr "Ürün"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Temporary"
+msgstr "Geçici"
+
+#. module: procurement
+#: field:mrp.property,description:0
+#: field:mrp.property.group,description:0
+msgid "Description"
+msgstr "Açıklama"
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "min"
+msgstr "dk"
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Quantity Rules"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Running"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_uom:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,name:procurement.process_node_serviceonorder0
+msgid "Make to Order"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "UOM"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr "Beklemede"
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.action_orderpoint_form
+msgid ""
+"You can define your minimum stock rules, so that OpenERP will automatically "
+"create draft manufacturing orders or purchase quotations according to the "
+"stock level. Once the virtual stock of a product (= stock on hand minus all "
+"confirmed orders and reservations) is below the minimum quantity, OpenERP "
+"will generate a procurement request to increase the stock up to the maximum "
+"quantity."
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,move_id:0
+msgid "Reservation"
+msgstr "Rezervasyon"
+
+#. module: procurement
+#: model:process.node,note:procurement.process_node_procureproducts0
+msgid "The way to procurement depends on the product type."
+msgstr ""
+
+#. module: procurement
+#: view:make.procurement:0
+msgid ""
+"This wizard will plan the procurement for this product. This procurement may "
+"generate task, production orders or purchase orders."
+msgstr ""
+
+#. module: procurement
+#: view:res.company:0
+msgid "MRP & Logistics Scheduler"
+msgstr ""
+
+#. module: procurement
+#: field:mrp.property,name:0
+#: field:stock.warehouse.orderpoint,name:0
+msgid "Name"
+msgstr "Ad"
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "max"
+msgstr "maks"
+
+#. module: procurement
+#: field:procurement.order,product_uos:0
+msgid "Product UoS"
+msgstr "Stok 2.Birim"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:347
+#, python-format
+msgid "from stock: products assigned."
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.action_compute_schedulers
+#: model:ir.ui.menu,name:procurement.menu_stock_proc_schedulers
+#: view:procurement.order.compute.all:0
+msgid "Compute Schedulers"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.procurement_exceptions
+msgid ""
+"Procurement Orders represent the need for a certain quantity of products, at "
+"a given time, in a given location. Sales Orders are one typical source of "
+"Procurement Orders (but these are distinct documents). Depending on the "
+"procurement parameters and the product configuration, the procurement engine "
+"will attempt to satisfy the need by reserving products from stock, ordering "
+"products from a supplier, or passing a manufacturing order, etc. A "
+"Procurement Exception occurs when the system cannot find a way to fulfill a "
+"procurement. Some exceptions will resolve themselves automatically, but "
+"others require manual intervention (those are identified by a specific error "
+"message)."
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,product_uom:0
+msgid "Product UoM"
+msgstr "Birim"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Search Procurement"
+msgstr ""
+
+#. module: procurement
+#: help:res.company,schedule_range:0
+msgid ""
+"This is the time frame analysed by the scheduler when computing "
+"procurements. All procurements that are not between today and today+range "
+"are skipped for future computation."
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Very Urgent"
+msgstr "Çok Acil"
+
+#. module: procurement
+#: field:procurement.orderpoint.compute,automatic:0
+msgid "Automatic Orderpoint"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Details"
+msgstr "Satınalma Detayları"
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:180
+#, python-format
+msgid "SCHEDULER"
+msgstr "ZAMANLAYICI"
diff --git a/addons/profile_tools/i18n/ru.po b/addons/profile_tools/i18n/ru.po
new file mode 100644
index 00000000000..f5206b9b282
--- /dev/null
+++ b/addons/profile_tools/i18n/ru.po
@@ -0,0 +1,144 @@
+# Russian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-23 20:51+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian <ru@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: 2011-04-24 04:37+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: profile_tools
+#: help:misc_tools.installer,idea:0
+msgid "Promote ideas of the employees, votes and discussion on best ideas."
+msgstr ""
+
+#. module: profile_tools
+#: help:misc_tools.installer,share:0
+msgid ""
+"Allows you to give restricted access to your OpenERP documents to external "
+"users, such as customers, suppliers, or accountants. You can share any "
+"OpenERP Menu such as your project tasks, support requests, invoices, etc."
+msgstr ""
+
+#. module: profile_tools
+#: help:misc_tools.installer,lunch:0
+msgid "A simple module to help you to manage Lunch orders."
+msgstr ""
+
+#. module: profile_tools
+#: field:misc_tools.installer,subscription:0
+msgid "Recurring Documents"
+msgstr "Повторяющийся документ"
+
+#. module: profile_tools
+#: model:ir.model,name:profile_tools.model_misc_tools_installer
+msgid "misc_tools.installer"
+msgstr "misc_tools.installer"
+
+#. module: profile_tools
+#: model:ir.module.module,description:profile_tools.module_meta_information
+msgid ""
+"Installs tools for lunch,survey,subscription and audittrail\n"
+"    module\n"
+"    "
+msgstr ""
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid ""
+"Extra Tools are applications that can help you improve your organization "
+"although they are not key for company management."
+msgstr ""
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid "Configure"
+msgstr "Настройки"
+
+#. module: profile_tools
+#: help:misc_tools.installer,survey:0
+msgid "Allows you to organize surveys."
+msgstr "Позволяет организовать опросы."
+
+#. module: profile_tools
+#: model:ir.module.module,shortdesc:profile_tools.module_meta_information
+msgid "Miscellaneous Tools"
+msgstr "Разные инструменты"
+
+#. module: profile_tools
+#: help:misc_tools.installer,pad:0
+msgid ""
+"This module creates a tighter integration between a Pad instance of your "
+"choosing and your OpenERP Web Client by letting you easily link pads to "
+"OpenERP objects via OpenERP attachments."
+msgstr ""
+
+#. module: profile_tools
+#: field:misc_tools.installer,lunch:0
+msgid "Lunch"
+msgstr ""
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid "Extra Tools Configuration"
+msgstr "Дополнительные инструменты настройки"
+
+#. module: profile_tools
+#: field:misc_tools.installer,idea:0
+msgid "Ideas Box"
+msgstr ""
+
+#. module: profile_tools
+#: help:misc_tools.installer,subscription:0
+msgid "Helps to generate automatically recurring documents."
+msgstr "Помогает генерировать автоматически повторяющиеся документы."
+
+#. module: profile_tools
+#: model:ir.actions.act_window,name:profile_tools.action_misc_tools_installer
+msgid "Tools Configuration"
+msgstr "Средства настройки"
+
+#. module: profile_tools
+#: field:misc_tools.installer,pad:0
+msgid "Collaborative Note Pads"
+msgstr ""
+
+#. module: profile_tools
+#: field:misc_tools.installer,survey:0
+msgid "Survey"
+msgstr "Опрос"
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid "Configure Extra Tools"
+msgstr "Настроить дополнительные инструменты"
+
+#. module: profile_tools
+#: field:misc_tools.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Настройка выполняется"
+
+#. module: profile_tools
+#: field:misc_tools.installer,config_logo:0
+msgid "Image"
+msgstr "Изображение"
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid "title"
+msgstr ""
+
+#. module: profile_tools
+#: field:misc_tools.installer,share:0
+msgid "Web Share"
+msgstr ""
diff --git a/addons/project_mailgate/i18n/it.po b/addons/project_mailgate/i18n/it.po
index 971b25adfc3..496ea120808 100644
--- a/addons/project_mailgate/i18n/it.po
+++ b/addons/project_mailgate/i18n/it.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-13 23:08+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2011-04-22 09:54+0000\n"
+"Last-Translator: simone.sandri <Unknown>\n"
 "Language-Team: Italian <it@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: 2011-01-15 05:57+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-23 04:53+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: project_mailgate
 #: view:project.task:0
 msgid "History Information"
-msgstr ""
+msgstr "Storico informazioni"
 
 #. module: project_mailgate
 #: model:ir.model,name:project_mailgate.model_project_task
@@ -87,13 +87,13 @@ msgstr "Annulla"
 #: code:addons/project_mailgate/project_mailgate.py:143
 #, python-format
 msgid "Done"
-msgstr ""
+msgstr "Completato"
 
 #. module: project_mailgate
 #: code:addons/project_mailgate/project_mailgate.py:129
 #, python-format
 msgid "Open"
-msgstr ""
+msgstr "Apri"
 
 #. module: project_mailgate
 #: code:addons/project_mailgate/project_mailgate.py:135
diff --git a/addons/project_planning/i18n/it.po b/addons/project_planning/i18n/it.po
index 469ebb0a801..9874347a7da 100644
--- a/addons/project_planning/i18n/it.po
+++ b/addons/project_planning/i18n/it.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-10 19:57+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2011-04-25 10:56+0000\n"
+"Last-Translator: simone.sandri <Unknown>\n"
 "Language-Team: Italian <it@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: 2011-01-15 05:58+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-26 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
@@ -52,7 +52,7 @@ msgstr "Riga Pianificazione"
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Unallocated Time"
-msgstr ""
+msgstr "Totale tempo non allocato"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,name:0
@@ -273,12 +273,12 @@ msgstr "Totale Pianificato"
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time Encoding"
-msgstr ""
+msgstr "Orario codificato"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.user,free:0
 msgid "Unallocated Time"
-msgstr ""
+msgstr "Orario non codificato"
 
 #. module: project_planning
 #: help:report_account_analytic.planning.user,plan_open:0
@@ -292,7 +292,7 @@ msgstr ""
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Delegate"
-msgstr ""
+msgstr "Delega"
 
 #. module: project_planning
 #: help:report_account_analytic.planning.user,free:0
@@ -300,6 +300,8 @@ msgid ""
 "Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
 "without Tasks + Holiday Leaves)"
 msgstr ""
+"Calcolato come un giorno lavorativo - (Tempo allocato per attività + Tempo "
+"allocato senza attività + Permessi ferie)"
 
 #. module: project_planning
 #: help:report_account_analytic.planning,business_days:0
@@ -340,7 +342,7 @@ msgstr "Pianificazioni per conto (in giorni)"
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "Time without tasks"
-msgstr ""
+msgstr "Tempo senza attività"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
@@ -350,7 +352,7 @@ msgstr "Data inizio"
 #. module: project_planning
 #: field:report_account_analytic.planning,total_free:0
 msgid "Total Free"
-msgstr ""
+msgstr "Totalmente Libero"
 
 #. module: project_planning
 #: help:report_account_analytic.planning.account,plan_tasks:0
@@ -470,12 +472,12 @@ msgstr "Aziende"
 #. module: project_planning
 #: field:report_account_analytic.planning.line,amount_in_base_uom:0
 msgid "Quantity in base uom"
-msgstr ""
+msgstr "Quantità nell'u.m. di base"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.user,plan_tasks:0
 msgid "Time Planned on Tasks"
-msgstr ""
+msgstr "Tempo pianificato per attività"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
@@ -518,7 +520,7 @@ msgstr "Statistiche di Pianificazione"
 #: view:report_account_analytic.planning:0
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
-msgstr ""
+msgstr "Apri"
 
 #. module: project_planning
 #: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
@@ -564,7 +566,7 @@ msgstr "Cronologia per Utente"
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Time Allocation without Tasks"
-msgstr ""
+msgstr "Totale tempo allocato senza attività"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.user,holiday:0
diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po
index 81c1b81fac3..badd0a459d6 100644
--- a/addons/sale/i18n/ru.po
+++ b/addons/sale/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-03-23 14:07+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2011-04-21 13:03+0000\n"
+"Last-Translator: Stanislav Hanzhin <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: 2011-03-24 04:50+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-22 04:38+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: sale
 #: view:board.board:0
@@ -457,6 +457,9 @@ msgid ""
 "Select a product of type service which is called 'Advance Product'. You may "
 "have to create it and set it as a default value on this field."
 msgstr ""
+"Выберите значение с названием «Предварительное изделие» имеющий тип "
+"«Услуга». Возможно вам понадобится создать его и установить в качестве "
+"значения по-умолчанию для этого поля."
 
 #. module: sale
 #: report:sale.order:0
@@ -1892,7 +1895,7 @@ msgstr "Журналы счетов"
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
-msgstr ""
+msgstr "Продвижение продукта"
 
 #. module: sale
 #: view:sale.report:0
@@ -2088,7 +2091,7 @@ msgstr "Апрель"
 #. module: sale
 #: view:sale.shop:0
 msgid "Accounting"
-msgstr "Бухгалтерский учет"
+msgstr "Бухгалтерия"
 
 #. module: sale
 #: field:sale.config.picking_policy,step:0
diff --git a/addons/sale_crm/i18n/it.po b/addons/sale_crm/i18n/it.po
index 3e00ac4d29a..4b1babbc4e3 100644
--- a/addons/sale_crm/i18n/it.po
+++ b/addons/sale_crm/i18n/it.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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-01-15 19:42+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2011-04-25 10:56+0000\n"
+"Last-Translator: simone.sandri <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: 2011-03-18 04:46+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-26 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
@@ -30,7 +30,7 @@ msgstr "Converti in preventivo"
 #: code:addons/sale_crm/wizard/crm_make_sale.py:108
 #, python-format
 msgid "Opportunity  '%s' is converted to Quotation."
-msgstr ""
+msgstr "L'opportunità '%s' è stata convertita in Quotazione."
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:89
diff --git a/addons/sale_mrp/i18n/ru.po b/addons/sale_mrp/i18n/ru.po
index bbc8dd0e71b..10e2fb3de1d 100644
--- a/addons/sale_mrp/i18n/ru.po
+++ b/addons/sale_mrp/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2010-12-25 11:19+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2011-04-25 08:59+0000\n"
+"Last-Translator: Stanislav Hanzhin <Unknown>\n"
 "Language-Team: Russian <ru@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: 2011-01-15 05:51+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-26 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0

From bcbccd8eb8cf6602546bf2292b698d1d2692703f Mon Sep 17 00:00:00 2001
From: "pso (OpenERP)" <pso@tinyerp.com>
Date: Tue, 26 Apr 2011 11:07:14 +0530
Subject: [PATCH 160/188] [FIX] hr_holidays: Wrong allocation request created
 when allocating holidays per category of employee

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

bzr revid: pso@tinyerp.com-20110426053714-i0jpn1fh620mk1j4
---
 addons/hr_holidays/hr_holidays.py       | 2 ++
 addons/hr_holidays/hr_holidays_view.xml | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 131d38d7001..8cb2845f81b 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -167,6 +167,8 @@ class hr_holidays(osv.osv):
                 result['value'] = {
                     'employee_id': ids_employee[0]
                 }
+        else:
+            result['value'] = {'employee_id': False}
         return result
 
     # TODO: can be improved using resource calendar method
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index f49b2ab388a..f7705da0eef 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -36,6 +36,7 @@
                     </group>
                     <newline />
                     <group expand="0" string="Group By...">
+                    	<filter name="group_category" string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'category_id'}"/>
                         <filter name="group_employee" string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
                         <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'manager_id'}"/>
                         <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id','set_visible':True}"/>
@@ -153,7 +154,9 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="red:state in ('refuse');blue:state in ('draft');black:state in ('confirm','validate','validate1')" string="Leaves" >
+                	<field name="holiday_type"/>
                     <field name="employee_id"/>
+                    <field name="category_id"/>
                     <field name="department_id" invisible="1"/>
                     <field name="holiday_status_id"/>
                     <field name="name"/>
@@ -232,6 +235,7 @@
             <field name="arch" type="xml">
                 <tree colors="red:state in ('refuse');blue:state in (' draft');black:state in ('confirm','validate','validate1')">
                     <field name="employee_id"/>
+                    <field name="category_id"/>
                     <field name="department_id" invisible="not context.get('set_visible',False)"/>
                     <field name="holiday_status_id"/>
                     <field name="name"/>

From 428944635f83ac2e0fbe608308759a9e4fcc9ac6 Mon Sep 17 00:00:00 2001
From: "pso (OpenERP)" <pso@tinyerp.com>
Date: Tue, 26 Apr 2011 11:35:13 +0530
Subject: [PATCH 161/188] [IMP] hr_holidays: Improved Indentation

bzr revid: pso@tinyerp.com-20110426060513-nxbcemw0cfbkpdga
---
 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 f7705da0eef..b9b4989f73e 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -154,7 +154,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="red:state in ('refuse');blue:state in ('draft');black:state in ('confirm','validate','validate1')" string="Leaves" >
-                	<field name="holiday_type"/>
+                    <field name="holiday_type"/>
                     <field name="employee_id"/>
                     <field name="category_id"/>
                     <field name="department_id" invisible="1"/>

From 68122978876bcd886c8ef6a839348ba2b056cf48 Mon Sep 17 00:00:00 2001
From: "pso (OpenERP)" <pso@tinyerp.com>
Date: Tue, 26 Apr 2011 12:11:16 +0530
Subject: [PATCH 162/188] [IMP] hr_holidays: Improved search, tree view of
 holiday and onchange method

bzr revid: pso@tinyerp.com-20110426064116-47pn4y5yuifsbjmg
---
 addons/hr_holidays/hr_holidays.py       | 4 +---
 addons/hr_holidays/hr_holidays_view.xml | 3 ++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 8cb2845f81b..38f58df78d0 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -160,15 +160,13 @@ class hr_holidays(osv.osv):
         return obj_res_leave.unlink(cr, uid, leave_ids)
 
     def onchange_type(self, cr, uid, ids, holiday_type):
-        result = {}
+        result = {'value': {'employee_id': False}}
         if holiday_type == 'employee':
             ids_employee = self.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
             if ids_employee:
                 result['value'] = {
                     'employee_id': ids_employee[0]
                 }
-        else:
-            result['value'] = {'employee_id': False}
         return result
 
     # TODO: can be improved using resource calendar method
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index b9b4989f73e..6b1fdfebbef 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -36,8 +36,8 @@
                     </group>
                     <newline />
                     <group expand="0" string="Group By...">
-                    	<filter name="group_category" string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'category_id'}"/>
                         <filter name="group_employee" string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
+                        <filter name="group_category" string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'category_id'}"/>
                         <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'manager_id'}"/>
                         <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id','set_visible':True}"/>
                         <separator orientation="vertical"/>
@@ -234,6 +234,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="red:state in ('refuse');blue:state in (' draft');black:state in ('confirm','validate','validate1')">
+                    <field name="holiday_type"/>
                     <field name="employee_id"/>
                     <field name="category_id"/>
                     <field name="department_id" invisible="not context.get('set_visible',False)"/>

From 92f18b5289ca2349bfc1c595fca026b2033b3be5 Mon Sep 17 00:00:00 2001
From: Jigar Amin <jam@tinyerp.com>
Date: Tue, 26 Apr 2011 12:40:23 +0530
Subject: [PATCH 163/188] [FIX] crm_profiling worng access roghts to the
 Manager

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

bzr revid: jam@tinyerp.com-20110426071023-avczlyxyt9cmdi34
---
 addons/crm_profiling/security/ir.model.access.csv | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/crm_profiling/security/ir.model.access.csv b/addons/crm_profiling/security/ir.model.access.csv
index fb110ba70d1..43e1528fddb 100644
--- a/addons/crm_profiling/security/ir.model.access.csv
+++ b/addons/crm_profiling/security/ir.model.access.csv
@@ -1,7 +1,7 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_crm_profiling_answer_user","crm_profiling.answer user","model_crm_profiling_answer","base.group_sale_salesman",1,1,1,0
-"access_crm_profiling_answer_manager","crm_profiling.answer manager","model_crm_profiling_answer","base.group_sale_manager",1,0,0,0
-"access_crm_profiling_question_manager","crm_profiling.question manager","model_crm_profiling_question","base.group_sale_salesman",1,1,1,0
-"access_crm_profiling_question_user","crm_profiling.question user","model_crm_profiling_question","base.group_sale_manager",1,0,0,0
-"access_crm_profiling_questionnarie_user","crm_profiling.questionnarie user","model_crm_profiling_questionnaire","base.group_sale_salesman",1,0,0,0
-"access_crm_profiling_questionnarie_manager","crm_profiling.questionnarie manager","model_crm_profiling_questionnaire","base.group_sale_manager",1,1,1,1
+"access_crm_profiling_answer_salesman","crm_profiling.answer.salesman","model_crm_profiling_answer","base.group_sale_salesman",1,1,1,0
+"access_crm_profiling_answer_manager","crm_profiling.answer.manager","model_crm_profiling_answer","base.group_sale_manager",1,1,1,1
+"access_crm_profiling_question_salesman","crm_profiling.question.salesman","model_crm_profiling_question","base.group_sale_salesman",1,1,1,0
+"access_crm_profiling_question_manager","crm_profiling.question.manager","model_crm_profiling_question","base.group_sale_manager",1,1,1,1
+"access_crm_profiling_questionnarie_salesman","crm_profiling.questionnarie.salesman","model_crm_profiling_questionnaire","base.group_sale_salesman",1,1,1,0
+"access_crm_profiling_questionnarie_manager","crm_profiling.questionnarie.manager","model_crm_profiling_questionnaire","base.group_sale_manager",1,1,1,1

From 5e2cda5a0c382c297e45bb28d32b9ad7c89b9271 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 26 Apr 2011 10:55:27 +0200
Subject: [PATCH 164/188] [FIX] Made the list appear in many2many.

bzr revid: nicolas.vanhoren@openerp.com-20110426085527-5ntgrkug2clipp2s
---
 addons/base/static/src/js/form.js   | 1 -
 addons/base/static/src/js/search.js | 1 -
 addons/base/static/src/xml/base.xml | 5 +----
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index ea2b377078b..c6ec07b11e6 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -899,7 +899,6 @@ openerp.base.form.FieldMany2Many = openerp.base.form.Field.extend({
         this.list_id = _.uniqueId("many2many");
     },
     start: function() {
-        debugger;
         this._super.apply(this, arguments);
         this.dataset = new openerp.base.DataSetSearch(this.session, this.field.relation);
         this.list_view = new openerp.base.ListView(undefined, this.view.session,
diff --git a/addons/base/static/src/js/search.js b/addons/base/static/src/js/search.js
index 0f4ab8585b8..ae5e8551b93 100644
--- a/addons/base/static/src/js/search.js
+++ b/addons/base/static/src/js/search.js
@@ -146,7 +146,6 @@ openerp.base.SearchView = openerp.base.Controller.extend({
     do_search: function (e) {
         if (e && e.preventDefault) { e.preventDefault(); }
 
-        //debugger;
         var domains = [], contexts = [];
 
         var errors = [];
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 4804f34d785..ef4cbba46b0 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -351,10 +351,7 @@
     </div>
 </t>
 <t t-name="FieldMany2Many">
-    <div style="background: #ccc; padding: 20px">
-        Many2Many widget
-        <div t-attr-id="widget.list_id"></div>
-    </div>
+    <div t-att-id="widget.list_id"></div>
 </t>
 <t t-name="FieldReference">
     <input type="text" t-att-name="widget.name" t-att-id="widget.element_id" t-att-class="'field_' + widget.type" style="width: 100%" placeholder="Widget Reference"/>

From 4dde77626579cebaa986b30387b363fe1842a76e Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 26 Apr 2011 15:00:26 +0530
Subject: [PATCH 165/188] [FIX] crm: regression on crm meeting view

bzr revid: hmo@tinyerp.com-20110426093026-tixw8l8tvy8yoja5
---
 addons/crm/crm_meeting_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index baa022a7d39..a2d66040fa9 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -44,7 +44,7 @@
                     <field name="alarm_id" string="Reminder"
                         widget="selection" />
                     <group colspan="2" col="4" attrs="{'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">
-                           <field name="recurrency" help="Is Meeting is occurring frequently or repeatedly?"/>
+                           <field name="recurrency"/>
                            <field name="edit_all" attrs="{'invisible':[('recurrency','=', False)]}"
                                 on_change="onchange_edit_all(rrule_type,edit_all)"/>
                     </group>

From 2cfc487ccddc9b1a21c23facdd44aee27b0d82c9 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 26 Apr 2011 13:24:13 +0200
Subject: [PATCH 166/188] [IMP] Read-only many2many implemented.

bzr revid: nicolas.vanhoren@openerp.com-20110426112413-nfoozpnol8zbli26
---
 addons/base/static/src/js/data.js |  9 +++++++++
 addons/base/static/src/js/form.js | 28 ++++++++++++++++++++++------
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/addons/base/static/src/js/data.js b/addons/base/static/src/js/data.js
index a29f320b79c..bd84f1d7229 100644
--- a/addons/base/static/src/js/data.js
+++ b/addons/base/static/src/js/data.js
@@ -183,6 +183,15 @@ openerp.base.DataSetSearch =  openerp.base.DataSet.extend({
 openerp.base.DataSetRelational =  openerp.base.DataSet.extend( /** @lends openerp.base.DataSet# */{
 });
 
+openerp.base.DataSetMany2Many = openerp.base.DataSetSearch.extend({
+    /* should extend DataSetStatic instead, but list view still does not support it
+     */
+
+    unlink: function(ids) {
+        // just do nothing
+    },
+});
+
 };
 
 // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index c6ec07b11e6..08c4a4fbb74 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -900,20 +900,36 @@ openerp.base.form.FieldMany2Many = openerp.base.form.Field.extend({
     },
     start: function() {
         this._super.apply(this, arguments);
-        this.dataset = new openerp.base.DataSetSearch(this.session, this.field.relation);
-        this.list_view = new openerp.base.ListView(undefined, this.view.session,
-                this.list_id, this.dataset, false, undefined);
+        this.dataset = new openerp.base.DataSetMany2Many(this.session, this.field.relation);
+        this.list_view = new openerp.base.form.Many2ManyListView(undefined, this.view.session,
+                this.list_id, this.dataset, false, {'selected': false, 'addable': null, 'deletable': false});
         this.list_view.start();
     },
     set_value: function(value) {
         if (value != false) {
-            this.dataset.ids = value;
-            this.dataset.count = value.length;
-            this.list_view.do_update();
+            // this is not correct behavior, need to change once list view can work with
+            // static datasets
+            this.dataset.domain = [["id","in",value]];
+            /*this.dataset.ids = value;
+            this.dataset.count = value.length;*/
+            this.list_view.do_reload();
         }
     }
 });
 
+openerp.base.form.Many2ManyListView = openerp.base.ListView.extend({
+    do_delete: function (e) {
+        /*
+        e.stopImmediatePropagation();
+        var ids = [this.rows[$(e.currentTarget).closest('tr').prevAll().length].data.id.value];
+        this.dataset.ids = _.without.apply(null, [this.dataset.ids].concat(ids));
+        this.dataset.count = this.dataset.ids.length;
+        // there may be a faster way
+        this.do_reload();
+        */
+    }
+});
+
 openerp.base.form.FieldReference = openerp.base.form.Field.extend({
     init: function(view, node) {
         this._super(view, node);

From d866edf0ae0d8fb955c8f56cf36de7ccaabf85e3 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Tue, 26 Apr 2011 16:57:55 +0530
Subject: [PATCH 167/188] [FIX] hr: Removing Administrator employee record
 causes future updates of hr module to fail

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

bzr revid: ara@tinyerp.com-20110426112755-2n13xwebtlx21wun
---
 addons/hr/hr.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index b10d8a7194f..fcfd0b41a27 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -161,6 +161,17 @@ class hr_employee(osv.osv):
         'passport_id':fields.char('Passport No', size=64)
     }
 
+    def unlink(self, cr, uid, ids, context=None):
+        resource_obj = self.pool.get('resource.resource')
+        resource_ids = []
+        for employee in self.browse(cr, uid, ids, context=context):
+            resource = employee.resource_id
+            if resource:
+                resource_ids.append(resource.id)
+        if resource_ids:
+            resource_obj.unlink(cr, uid, resource_ids, context=context)
+        return super(hr_employee, self).unlink(cr, uid, ids, context=context)
+
     def onchange_address_id(self, cr, uid, ids, address, context=None):
         if address:
             address = self.pool.get('res.partner.address').browse(cr, uid, address, context=context)

From d63731b65f7367f83ef4b18a1772b2b25363a11b Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Tue, 26 Apr 2011 17:24:45 +0530
Subject: [PATCH 168/188] [IMP]: email_template: *able to save email as new
 template to reuse it *evaluating expression type for mail same as
 email_template

bzr revid: rha@tinyerp.com-20110426115445-qpx91w218tyg4jde
---
 addons/email_template/email_template.py       |  4 ---
 .../wizard/email_compose_message.py           | 27 +++++++++++++++++++
 .../wizard/email_compose_message_view.xml     | 11 +++++---
 addons/mail/wizard/email_compose_message.py   |  4 +--
 4 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 192a42314a8..0f35a066f3c 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -152,10 +152,6 @@ class email_template(osv.osv):
         'body_html': fields.text('HTML', help="Contains HTML version of email. Placeholders can be used here."),
     }
 
-    _sql_constraints = [
-        ('name', 'unique (name)','The template name must be unique !')
-    ]
-
     def create_action(self, cr, uid, ids, context=None):
         vals = {}
         if context is None:
diff --git a/addons/email_template/wizard/email_compose_message.py b/addons/email_template/wizard/email_compose_message.py
index 41cbd9fa146..1a566830779 100644
--- a/addons/email_template/wizard/email_compose_message.py
+++ b/addons/email_template/wizard/email_compose_message.py
@@ -79,6 +79,33 @@ class email_compose_message(osv.osv_memory):
             values['attachment_ids'] = att_ids
         return {'value': values}
 
+    def save_as_new_template(self, cr, uid, ids, context=None):
+        '''
+        create a new template record
+        '''
+        if context is None:
+            context = {}
+        template_pool = self.pool.get('email.template')
+        model_pool = self.pool.get('ir.model')
+        for record in self.browse(cr, uid, ids, context=context):
+            model = model_pool.search(cr, uid, [('name','=', record.model)])[0]
+            values = {
+                'name': record.model,
+                'email_from': record.email_from or False,
+                'subject': record.subject or False,
+                'body': record.body or False,
+                'email_to': record.email_to or False,
+                'email_cc': record.email_cc or False,
+                'email_bcc': record.email_bcc or False,
+                'reply_to': record.reply_to or False,
+                'auto_delete': record.auto_delete,
+                'model_id': model or False,
+                'smtp_server_id': record.smtp_server_id.id or False,
+                'attachment_ids': [(6, 0, [att.id for att in record.attachment_ids])]
+            }
+            template_pool.create(cr, uid, values, context=context)
+        return True
+
 email_compose_message()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/email_template/wizard/email_compose_message_view.xml b/addons/email_template/wizard/email_compose_message_view.xml
index a2776662e0d..8c229176c13 100644
--- a/addons/email_template/wizard/email_compose_message_view.xml
+++ b/addons/email_template/wizard/email_compose_message_view.xml
@@ -8,10 +8,15 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="mail.email_compose_message_wizard_form"/>
             <field name="arch" type="xml">
-	            <field name="model" position="after">
-	                <field name="template_id" colspan="4"
+	            <data>
+		            <xpath expr="//field[@name='model']" position="after">
+		                <field name="template_id" colspan="4"
 	                    on_change="on_change_template(template_id, context)"/>
-	            </field>
+		            </xpath>
+		            <xpath expr="//button[@string='Close']" position="after">
+		                <button icon="" type="object" name="save_as_new_template" string="Save As New Template"/>
+		            </xpath>
+	            </data>
             </field>
         </record>
 	</data>
diff --git a/addons/mail/wizard/email_compose_message.py b/addons/mail/wizard/email_compose_message.py
index efa87f6a108..232f10e6a1f 100644
--- a/addons/mail/wizard/email_compose_message.py
+++ b/addons/mail/wizard/email_compose_message.py
@@ -225,7 +225,7 @@ class email_compose_message(osv.osv_memory):
         if context is None:
             context = {}
         def merge(match):
-            exp = str(match.group()[2:-2]).strip()
+            exp = str(match.group()[2:-1]).strip()
             result = eval(exp,
                           {
                             'user' : self.pool.get('res.users').browse(cr, uid, uid, context=context),
@@ -236,7 +236,7 @@ class email_compose_message(osv.osv_memory):
                 return str("--------")
             return tools.ustr(result)
 
-        com = re.compile('(\[\[.+?\]\])')
+        com = re.compile('(\$\{.+?\})')
         return message and com.sub(merge, message)
 
 email_compose_message()

From 96c1dacf4c2fd6b903d2d09697f2b3a21babf64b Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 26 Apr 2011 14:11:46 +0200
Subject: [PATCH 169/188] [IMP] m2m now support suppression of elements.

bzr revid: nicolas.vanhoren@openerp.com-20110426121146-kq1cuu7i1r0nwfiq
---
 addons/base/static/src/js/data.js |  2 +-
 addons/base/static/src/js/form.js | 32 ++++++++++++++++++++++---------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/addons/base/static/src/js/data.js b/addons/base/static/src/js/data.js
index bd84f1d7229..6d566f4de0a 100644
--- a/addons/base/static/src/js/data.js
+++ b/addons/base/static/src/js/data.js
@@ -183,7 +183,7 @@ openerp.base.DataSetSearch =  openerp.base.DataSet.extend({
 openerp.base.DataSetRelational =  openerp.base.DataSet.extend( /** @lends openerp.base.DataSet# */{
 });
 
-openerp.base.DataSetMany2Many = openerp.base.DataSetSearch.extend({
+openerp.base.DataSetMany2Many = openerp.base.DataSetStatic.extend({
     /* should extend DataSetStatic instead, but list view still does not support it
      */
 
diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 08c4a4fbb74..5e0d739a279 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -902,32 +902,46 @@ openerp.base.form.FieldMany2Many = openerp.base.form.Field.extend({
         this._super.apply(this, arguments);
         this.dataset = new openerp.base.DataSetMany2Many(this.session, this.field.relation);
         this.list_view = new openerp.base.form.Many2ManyListView(undefined, this.view.session,
-                this.list_id, this.dataset, false, {'selected': false, 'addable': null, 'deletable': false});
+                this.list_id, this.dataset, false, {'selected': false, 'addable': 'Add'});
+        var self = this;
+        this.list_view.do_delete.add_last(function() {
+            self.on_ui_change();
+        });
         this.list_view.start();
     },
     set_value: function(value) {
         if (value != false) {
-            // this is not correct behavior, need to change once list view can work with
-            // static datasets
-            this.dataset.domain = [["id","in",value]];
-            /*this.dataset.ids = value;
-            this.dataset.count = value.length;*/
+            this.dataset.ids = value;
+            this.dataset.count = value.length;
             this.list_view.do_reload();
         }
+    },
+    get_value: function() {
+        return [[6,false,this.dataset.ids]];
     }
 });
 
 openerp.base.form.Many2ManyListView = openerp.base.ListView.extend({
     do_delete: function (e) {
-        /*
         e.stopImmediatePropagation();
         var ids = [this.rows[$(e.currentTarget).closest('tr').prevAll().length].data.id.value];
         this.dataset.ids = _.without.apply(null, [this.dataset.ids].concat(ids));
         this.dataset.count = this.dataset.ids.length;
         // there may be a faster way
         this.do_reload();
-        */
-    }
+    },
+    do_reload: function () {
+        /* Dear xmo, according to your comments, this method's implementation in list view seems
+         * to be a little bit bullshit.
+         * I assume the list view will be changed later, so I hope it will support static datasets.
+         */
+        return this.rpc('/base/listview/fill', {
+            'model': this.dataset.model,
+            'id': this.view_id,
+            'domain': [["id", "in", this.dataset.ids]],
+            'context': this.dataset.context
+        }, this.do_fill_table);
+    },
 });
 
 openerp.base.form.FieldReference = openerp.base.form.Field.extend({

From f7883303b4876549660e4a2775b642d302bedcc2 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Tue, 26 Apr 2011 17:50:54 +0530
Subject: [PATCH 170/188] [FIX] email_template: added icon for button 'Save As
 Template' and change string and changes in search method domain for
 save_as_template()

bzr revid: rha@tinyerp.com-20110426122054-p4jcrk9zzt97dp8i
---
 addons/email_template/wizard/email_compose_message.py       | 4 ++--
 addons/email_template/wizard/email_compose_message_view.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/email_template/wizard/email_compose_message.py b/addons/email_template/wizard/email_compose_message.py
index 1a566830779..e602d534e48 100644
--- a/addons/email_template/wizard/email_compose_message.py
+++ b/addons/email_template/wizard/email_compose_message.py
@@ -79,7 +79,7 @@ class email_compose_message(osv.osv_memory):
             values['attachment_ids'] = att_ids
         return {'value': values}
 
-    def save_as_new_template(self, cr, uid, ids, context=None):
+    def save_as_template(self, cr, uid, ids, context=None):
         '''
         create a new template record
         '''
@@ -88,7 +88,7 @@ class email_compose_message(osv.osv_memory):
         template_pool = self.pool.get('email.template')
         model_pool = self.pool.get('ir.model')
         for record in self.browse(cr, uid, ids, context=context):
-            model = model_pool.search(cr, uid, [('name','=', record.model)])[0]
+            model = model_pool.search(cr, uid, [('model','=', record.model)])[0]
             values = {
                 'name': record.model,
                 'email_from': record.email_from or False,
diff --git a/addons/email_template/wizard/email_compose_message_view.xml b/addons/email_template/wizard/email_compose_message_view.xml
index 8c229176c13..22a8191541a 100644
--- a/addons/email_template/wizard/email_compose_message_view.xml
+++ b/addons/email_template/wizard/email_compose_message_view.xml
@@ -14,7 +14,7 @@
 	                    on_change="on_change_template(template_id, context)"/>
 		            </xpath>
 		            <xpath expr="//button[@string='Close']" position="after">
-		                <button icon="" type="object" name="save_as_new_template" string="Save As New Template"/>
+		                <button icon="gtk-new" type="object" name="save_as_template" string="Save As Template"/>
 		            </xpath>
 	            </data>
             </field>

From 855b512e74a0618eacce42cbf339cc0f4e56c8dd Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Tue, 26 Apr 2011 18:08:24 +0530
Subject: [PATCH 171/188] [FIX]

bzr revid: rha@tinyerp.com-20110426123824-l49480b3bkm0mr2k
---
 addons/email_template/wizard/email_compose_message.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/email_template/wizard/email_compose_message.py b/addons/email_template/wizard/email_compose_message.py
index e602d534e48..d5289a4e98f 100644
--- a/addons/email_template/wizard/email_compose_message.py
+++ b/addons/email_template/wizard/email_compose_message.py
@@ -89,8 +89,9 @@ class email_compose_message(osv.osv_memory):
         model_pool = self.pool.get('ir.model')
         for record in self.browse(cr, uid, ids, context=context):
             model = model_pool.search(cr, uid, [('model','=', record.model)])[0]
+            model_name = model_pool.browse(cr, uid, model, context=context).name
             values = {
-                'name': record.model,
+                'name': model_name,
                 'email_from': record.email_from or False,
                 'subject': record.subject or False,
                 'body': record.body or False,

From ca3c3fdbc91640fe32f60218c72d5c7a5736ecbe Mon Sep 17 00:00:00 2001
From: "Naresh (OpenERP)" <nch@tinyerp.com>
Date: Tue, 26 Apr 2011 18:19:15 +0530
Subject: [PATCH 172/188] [FIX]:decimal_precision when precision is specified
 as 0

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

bzr revid: nch@tinyerp.com-20110426124915-u1qykxakf9oyc35b
---
 addons/decimal_precision/decimal_precision.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/decimal_precision/decimal_precision.py b/addons/decimal_precision/decimal_precision.py
index b0f8af50ce6..fcd30750437 100644
--- a/addons/decimal_precision/decimal_precision.py
+++ b/addons/decimal_precision/decimal_precision.py
@@ -41,7 +41,9 @@ class decimal_precision(osv.osv):
     def precision_get(self, cr, uid, application):
         cr.execute('select digits from decimal_precision where name=%s', (application,))
         res = cr.fetchone()
-        return res and res[0] or 2
+        if res:
+            return res[0]
+        return 2
 
     def write(self, cr, uid, ids, data, *args, **argv):
         res = super(decimal_precision, self).write(cr, uid, ids, data, *args, **argv)

From 7bb1ffec7bb15d8a8dd246b5717377105e252c27 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 26 Apr 2011 16:13:34 +0200
Subject: [PATCH 173/188] [IMP] Improved m2m to open a popup when we click one
 of the items.

bzr revid: nicolas.vanhoren@openerp.com-20110426141334-s3xl2y8rp9arphmn
---
 addons/base/static/src/js/form.js  | 54 ++++++++++++++++++++++++++++--
 addons/base/static/src/js/views.js |  9 ++++-
 2 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 5e0d739a279..4ed5c8f250a 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -904,9 +904,7 @@ openerp.base.form.FieldMany2Many = openerp.base.form.Field.extend({
         this.list_view = new openerp.base.form.Many2ManyListView(undefined, this.view.session,
                 this.list_id, this.dataset, false, {'selected': false, 'addable': 'Add'});
         var self = this;
-        this.list_view.do_delete.add_last(function() {
-            self.on_ui_change();
-        });
+        this.list_view.m2m_field = this;
         this.list_view.start();
     },
     set_value: function(value) {
@@ -929,6 +927,8 @@ openerp.base.form.Many2ManyListView = openerp.base.ListView.extend({
         this.dataset.count = this.dataset.ids.length;
         // there may be a faster way
         this.do_reload();
+        
+        this.m2m_field.on_ui_change();
     },
     do_reload: function () {
         /* Dear xmo, according to your comments, this method's implementation in list view seems
@@ -942,6 +942,54 @@ openerp.base.form.Many2ManyListView = openerp.base.ListView.extend({
             'context': this.dataset.context
         }, this.do_fill_table);
     },
+    do_add_record: function () {
+        // TODO: need to open a popup with search view
+    },
+    on_select_row: function(event) {
+        var $target = $(event.currentTarget);
+        var row = this.rows[$target.prevAll().length];
+        var id = row.data.id.value;
+        if(! id) {
+            return;
+        }
+        var action_manager = this.m2m_field.view.session.action_manager;
+        action_manager.do_action({
+            "res_model": this.dataset.model,
+            "views":[[false,"form"]],
+            "res_id": id,
+            "type":"ir.actions.act_window",
+            "view_type":"form",
+            "view_mode":"form",
+            "target":"new"
+        });
+        /*action_manager.do_action({
+            "groups_id":[],
+            "domain":"[]",
+            "help":false,
+            "res_model":"partner.sms.send",
+            "search_view_id":false,
+            "id":75,
+            "src_model":"res.partner",
+            "views":[[false,"form"]],
+            "menus":false,
+            "display_menu_tip":true,
+            "usage":"",
+            "type":"ir.actions.act_window",
+            "string":"SMS Send",
+            "view_type":"form",
+            "view_id":false,
+            "auto_refresh":0,
+            "view_mode":"form",
+            "view_ids":[],
+            "target":"new",
+            "multi":false,
+            "name":"SMS Send",
+            "auto_search":true,
+            "filter":false,
+            "limit":0,
+            "context":"{}"
+        });*/
+    }
 });
 
 openerp.base.form.FieldReference = openerp.base.form.Field.extend({
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 8ef14a3edbf..8b29850d071 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -183,7 +183,14 @@ openerp.base.ViewManager =  openerp.base.Controller.extend({
 
 openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({
     init: function(session, element_id, action, sidebar) {
-        var dataset = new openerp.base.DataSetSearch(session, action.res_model);
+        var dataset;
+        if(!action.res_id) {
+            dataset = new openerp.base.DataSetSearch(session, action.res_model);
+        } else {
+            dataset = new openerp.base.DataSetStatic(session, action.res_model);
+            dataset.ids = [action.res_id];
+            dataset.count = 1;
+        }
         this._super(session, element_id, dataset, action.views);
         this.action = action;
         this.sidebar = sidebar;

From 33a7bbb0c489b30f7a4889eb47f8163540e42ae7 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 26 Apr 2011 16:24:24 +0200
Subject: [PATCH 174/188] [FIX] Some problem when clicking 'Add' in many2many.

bzr revid: nicolas.vanhoren@openerp.com-20110426142424-llpiez4i9tgvjkr6
---
 addons/base/static/src/js/form.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 4ed5c8f250a..cda1b0047eb 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -942,7 +942,8 @@ openerp.base.form.Many2ManyListView = openerp.base.ListView.extend({
             'context': this.dataset.context
         }, this.do_fill_table);
     },
-    do_add_record: function () {
+    do_add_record: function (e) {
+        e.stopImmediatePropagation();
         // TODO: need to open a popup with search view
     },
     on_select_row: function(event) {

From c048cdac7503e6bdda56835c856577da7de3bcfa Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 27 Apr 2011 04:37:42 +0000
Subject: [PATCH 175/188] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110427043742-x1bwe8whtov62a5q
---
 bin/addons/base/i18n/vi.po | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/bin/addons/base/i18n/vi.po b/bin/addons/base/i18n/vi.po
index 1ae261cb99e..6bacfb648cd 100644
--- a/bin/addons/base/i18n/vi.po
+++ b/bin/addons/base/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-11 08:47+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-04-26 05:28+0000\n"
+"Last-Translator: Phong Nguyen-Thanh <Unknown>\n"
 "Language-Team: Vietnamese <vi@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: 2011-04-19 04:48+0000\n"
+"X-Launchpad-Export-Date: 2011-04-27 04:37+0000\n"
 "X-Generator: Launchpad (build 12758)\n"
 
 #. module: base
@@ -118,6 +118,8 @@ msgid ""
 "You can not write in this document (%s) ! Be sure your user belongs to one "
 "of these groups: %s."
 msgstr ""
+"Bạn không thể viết trong tài liệu này (% s) ! Hãy chắc chắn người dùng của "
+"bạn thuộc một trong các nhóm: %s."
 
 #. module: base
 #: help:ir.model.fields,domain:0

From 0c72a7e64770369995ab8841b2fe252c51dd3c1e Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 27 Apr 2011 04:41:42 +0000
Subject: [PATCH 176/188] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110427044142-sh0bye0l0c3k70dg
---
 addons/account_payment/i18n/ro.po     |  12 +-
 addons/analytic/i18n/tr.po            | 255 ++++++++++++++
 addons/crm/i18n/lt.po                 |  10 +-
 addons/hr_attendance/i18n/pt_BR.po    |   2 +-
 addons/project/i18n/ro.po             |  58 +--
 addons/share/i18n/ru.po               | 485 ++++++++++++++++++++++++++
 addons/web_livechat/i18n/tr.po        |  39 +++
 addons/wiki_faq/i18n/tr.po            |  32 ++
 addons/wiki_quality_manual/i18n/ru.po |  32 ++
 addons/wiki_quality_manual/i18n/tr.po |  32 ++
 10 files changed, 916 insertions(+), 41 deletions(-)
 create mode 100644 addons/analytic/i18n/tr.po
 create mode 100644 addons/share/i18n/ru.po
 create mode 100644 addons/web_livechat/i18n/tr.po
 create mode 100644 addons/wiki_faq/i18n/tr.po
 create mode 100644 addons/wiki_quality_manual/i18n/ru.po
 create mode 100644 addons/wiki_quality_manual/i18n/tr.po

diff --git a/addons/account_payment/i18n/ro.po b/addons/account_payment/i18n/ro.po
index 405e9574e7a..78a7caaaf1e 100644
--- a/addons/account_payment/i18n/ro.po
+++ b/addons/account_payment/i18n/ro.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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-08-02 22:08+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2011-04-26 18:16+0000\n"
+"Last-Translator: filsys <office@filsystem.ro>\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: 2011-01-15 05:33+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-27 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
@@ -261,7 +261,7 @@ msgstr ""
 #: code:addons/account_payment/account_move_line.py:110
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Eroare !"
 
 #. module: account_payment
 #: view:account.move.line:0
@@ -414,7 +414,7 @@ msgstr "Mesajul următor al dialogului"
 #: code:addons/account_payment/account_move_line.py:110
 #, python-format
 msgid "No partner defined on entry line"
-msgstr ""
+msgstr "Nu a fost definit nici un partener"
 
 #. module: account_payment
 #: help:payment.line,info_partner:0
diff --git a/addons/analytic/i18n/tr.po b/addons/analytic/i18n/tr.po
new file mode 100644
index 00000000000..6934dd45c10
--- /dev/null
+++ b/addons/analytic/i18n/tr.po
@@ -0,0 +1,255 @@
+# Turkish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-04-26 21:49+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish <tr@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: 2011-04-27 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: analytic
+#: field:account.analytic.account,child_ids:0
+msgid "Child Accounts"
+msgstr "Muavin Hesaplar"
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account Name"
+msgstr "Hesap Adı"
+
+#. module: analytic
+#: help:account.analytic.line,unit_amount:0
+msgid "Specifies the amount of quantity to count."
+msgstr ""
+
+#. module: analytic
+#: model:ir.module.module,description:analytic.module_meta_information
+msgid ""
+"Module for defining analytic accounting object.\n"
+"    "
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,state:0
+msgid "State"
+msgstr "Durum"
+
+#. module: analytic
+#: field:account.analytic.account,user_id:0
+msgid "Account Manager"
+msgstr "Hesap Yöneticisi"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Draft"
+msgstr "Taslak"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Closed"
+msgstr "Kapalı"
+
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Borç"
+
+#. module: analytic
+#: help:account.analytic.account,state:0
+msgid ""
+"* When an account is created its in 'Draft' state.                           "
+"       \n"
+"* If any associated partner is there, it can be in 'Open' state.             "
+"                     \n"
+"* If any pending balance is there it can be in 'Pending'.                    "
+"               \n"
+"* And finally when all the transactions are over, it can be in 'Close' "
+"state.                                   \n"
+"* The project can be in either if the states 'Template' and 'Running'.\n"
+" If it is template then we can make projects based on the template projects. "
+"If its in 'Running' state it is a normal project.                            "
+"     \n"
+" If it is to be reviewed then the state is 'Pending'.\n"
+" When the project is completed the state is set to 'Done'."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,type:0
+msgid "Account Type"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Template"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: analytic
+#: model:ir.model,name:analytic.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,description:0
+#: field:account.analytic.line,name:0
+msgid "Description"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "Normal"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,company_id:0
+#: field:account.analytic.line,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,quantity_max:0
+msgid "Maximum Quantity"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.line,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.line,date:0
+msgid "Date"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,currency_id:0
+msgid "Account currency"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,quantity:0
+#: field:account.analytic.line,unit_amount:0
+msgid "Quantity"
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.account,quantity_max:0
+msgid "Sets the higher limit of quantity of hours."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,credit:0
+msgid "Credit"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,contact_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,balance:0
+msgid "Balance"
+msgstr ""
+
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,date:0
+msgid "Date End"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,code:0
+msgid "Account Code"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,complete_name:0
+msgid "Full Account Name"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.line,account_id:0
+#: model:ir.model,name:analytic.model_account_analytic_account
+#: model:ir.module.module,shortdesc:analytic.module_meta_information
+msgid "Analytic Account"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "View"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,date_start:0
+msgid "Date Start"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Open"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,line_ids:0
+msgid "Analytic Entries"
+msgstr ""
diff --git a/addons/crm/i18n/lt.po b/addons/crm/i18n/lt.po
index fd607e6c3d0..a563d8fe75d 100644
--- a/addons/crm/i18n/lt.po
+++ b/addons/crm/i18n/lt.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: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-17 06:57+0000\n"
-"Last-Translator: Paulius Sladkevičius - inovera.lt <Unknown>\n"
+"PO-Revision-Date: 2011-04-26 14:24+0000\n"
+"Last-Translator: Mantas Kriaučiūnas <mantas@akl.lt>\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: 2011-03-18 04:44+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-27 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 "Language: lt\n"
 
 #. module: crm
@@ -1613,7 +1613,7 @@ msgstr "Nuorodos"
 #: view:res.partner:0
 #, python-format
 msgid "Cancel"
-msgstr "Atšaukti"
+msgstr "Atsisakyti"
 
 #. module: crm
 #: model:ir.model,name:crm.model_res_users
diff --git a/addons/hr_attendance/i18n/pt_BR.po b/addons/hr_attendance/i18n/pt_BR.po
index a742e3352e7..0a0bf657009 100644
--- a/addons/hr_attendance/i18n/pt_BR.po
+++ b/addons/hr_attendance/i18n/pt_BR.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: 2011-04-26 04:41+0000\n"
+"X-Launchpad-Export-Date: 2011-04-27 04:41+0000\n"
 "X-Generator: Launchpad (build 12758)\n"
 
 #. module: hr_attendance
diff --git a/addons/project/i18n/ro.po b/addons/project/i18n/ro.po
index 16683f155ea..5f70f4580e6 100644
--- a/addons/project/i18n/ro.po
+++ b/addons/project/i18n/ro.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2009-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2011-04-26 18:27+0000\n"
+"Last-Translator: Dorin <dhongu@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: 2011-03-18 04:38+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-27 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
 msgid "Assigned tasks"
-msgstr ""
+msgstr "Sarcini atribuite"
 
 #. module: project
 #: help:project.task.delegate,new_task_description:0
@@ -59,7 +59,7 @@ msgstr ""
 #: code:addons/project/project.py:121
 #, python-format
 msgid "Operation Not Permitted !"
-msgstr ""
+msgstr "Operație nepermisă !"
 
 #. module: project
 #: code:addons/project/wizard/project_task_delegate.py:67
@@ -102,7 +102,7 @@ msgstr ""
 #: view:report.project.task.user:0
 #: field:report.project.task.user,progress:0
 msgid "Progress"
-msgstr ""
+msgstr "Progres"
 
 #. module: project
 #: help:project.task,remaining_hours:0
@@ -129,7 +129,7 @@ msgstr ""
 #. module: project
 #: field:project.project,members:0
 msgid "Project Members"
-msgstr ""
+msgstr "Membrii proiectului"
 
 #. module: project
 #: model:process.node,name:project.process_node_taskbydelegate0
@@ -139,7 +139,7 @@ msgstr ""
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "March"
-msgstr ""
+msgstr "Matrie"
 
 #. module: project
 #: view:project.task:0
@@ -161,7 +161,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "My Tasks"
-msgstr ""
+msgstr "Sarcinile mele"
 
 #. module: project
 #: constraint:project.task:0
@@ -174,7 +174,7 @@ msgstr ""
 #: view:report.project.task.user:0
 #: field:report.project.task.user,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Firma"
 
 #. module: project
 #: field:project.installer,project_scrum:0
@@ -194,7 +194,7 @@ msgstr ""
 #. module: project
 #: field:project.task.type,name:0
 msgid "Stage Name"
-msgstr ""
+msgstr "Numele etapei"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
@@ -238,7 +238,7 @@ msgstr ""
 #: field:report.project.task.user,day:0
 #: field:task.by.days,day:0
 msgid "Day"
-msgstr ""
+msgstr "Zi"
 
 #. module: project
 #: code:addons/project/project.py:571
@@ -261,12 +261,12 @@ msgstr ""
 #: field:project.task.work,task_id:0
 #: view:report.project.task.user:0
 msgid "Task"
-msgstr ""
+msgstr "Sarcină"
 
 #. module: project
 #: view:project.project:0
 msgid "Members"
-msgstr ""
+msgstr "Membrii"
 
 #. module: project
 #: help:project.task,planned_hours:0
@@ -285,7 +285,7 @@ msgstr ""
 #: view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
-msgstr ""
+msgstr "Notițe"
 
 #. module: project
 #: view:project.vs.hours:0
@@ -310,7 +310,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Start Task"
-msgstr ""
+msgstr "Start sarcină"
 
 #. module: project
 #: help:project.installer,project_timesheet:0
@@ -331,7 +331,7 @@ msgstr ""
 #: selection:report.project.task.user,state:0
 #: selection:task.by.days,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Anulat"
 
 #. module: project
 #: view:board.board:0
@@ -375,12 +375,12 @@ msgstr ""
 #: field:project.task,date_end:0
 #: field:report.project.task.user,date_end:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Data de sfârşit"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Lună   "
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
@@ -392,7 +392,7 @@ msgstr ""
 #: view:project.task:0
 #: view:report.project.task.user:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupează după..."
 
 #. module: project
 #: help:project.task,effective_hours:0
@@ -409,12 +409,12 @@ msgstr ""
 #. module: project
 #: model:ir.model,name:project.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_testing
 msgid "Testing"
-msgstr ""
+msgstr "Testare"
 
 #. module: project
 #: help:project.task.delegate,planned_hours:0
@@ -436,31 +436,31 @@ msgstr ""
 #: model:ir.model,name:project.model_account_analytic_account
 #: field:project.project,analytic_account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Cont analitic"
 
 #. module: project
 #: field:project.task.work,user_id:0
 msgid "Done by"
-msgstr ""
+msgstr "Realizat de"
 
 #. module: project
 #: view:project.task:0
 msgid "Planning"
-msgstr ""
+msgstr "Planificare"
 
 #. module: project
 #: view:project.task:0
 #: field:project.task,date_deadline:0
 #: field:report.project.task.user,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "Termen-limită"
 
 #. module: project
 #: view:project.task.close:0
 #: view:project.task.delegate:0
 #: view:project.task.reevaluate:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Renunță"
 
 #. module: project
 #: model:ir.model,name:project.model_res_partner
@@ -469,7 +469,7 @@ msgstr ""
 #: view:report.project.task.user:0
 #: field:report.project.task.user,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partener"
 
 #. module: project
 #: constraint:account.analytic.account:0
diff --git a/addons/share/i18n/ru.po b/addons/share/i18n/ru.po
new file mode 100644
index 00000000000..ba1a12542e1
--- /dev/null
+++ b/addons/share/i18n/ru.po
@@ -0,0 +1,485 @@
+# Russian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-04-26 05:57+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian <ru@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: 2011-04-27 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: share
+#: code:addons/share/web/editors.py:15
+#, python-format
+msgid "Sharing"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:434
+#, python-format
+msgid ""
+"This additional data has been automatically added to your current access.\n"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Existing External Users"
+msgstr ""
+
+#. module: share
+#: help:res.groups,share:0
+msgid "Group created to set access rights for sharing data with some users."
+msgstr ""
+
+#. module: share
+#: model:ir.module.module,shortdesc:share.module_meta_information
+msgid "Share Management"
+msgstr ""
+
+#. module: share
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Не может быть двух пользователей с одинаковым именем пользователя!"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:76
+#, python-format
+msgid "Sharing Wizard - Step 1"
+msgstr ""
+
+#. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
+#: model:ir.ui.menu,name:share.menu_action_share_wizard
+msgid "Share Access Rules"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:453
+#, python-format
+msgid ""
+"Dear,\n"
+"\n"
+"%s\n"
+"\n"
+msgstr ""
+
+#. module: share
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"Выбранная компания отсутствует в списке разрешённых компаний для этого "
+"пользователя"
+
+#. module: share
+#: model:ir.model,name:share.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Next"
+msgstr "Далее"
+
+#. module: share
+#: help:share.wizard,action_id:0
+msgid ""
+"The action that opens the screen containing the data you wish to share."
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:68
+#, python-format
+msgid "Please specify \"share_root_url\" in context"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Congratulations, you have successfully setup a new shared access!"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:247
+#, python-format
+msgid "(Copy for sharing)"
+msgstr ""
+
+#. module: share
+#: field:share.wizard.result.line,newly_created:0
+msgid "Newly created"
+msgstr "Вновь созданный"
+
+#. module: share
+#: field:share.wizard,share_root_url:0
+msgid "Generic Share Access URL"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:457
+#, python-format
+msgid ""
+"You may use the following login and password to get access to this protected "
+"area:\n"
+msgstr ""
+
+#. module: share
+#: view:res.groups:0
+msgid "Regular groups only (no share groups"
+msgstr ""
+
+#. module: share
+#: selection:share.wizard,access_mode:0
+msgid "Read & Write"
+msgstr "Чтение и запись"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share wizard: step 2"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share wizard: step 0"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share wizard: step 1"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:430
+#: field:share.wizard.result.line,login:0
+#, python-format
+msgid "Username"
+msgstr "Имя пользователя"
+
+#. module: share
+#: field:res.users,share:0
+msgid "Share User"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:424
+#, python-format
+msgid "%s has shared OpenERP %s information with you"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Finish"
+msgstr "Завершить"
+
+#. module: share
+#: field:share.wizard,user_ids:0
+#: field:share.wizard.user,user_id:0
+msgid "Users"
+msgstr "Пользователи"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:103
+#, python-format
+msgid ""
+"This username (%s) already exists, perhaps data has already been shared with "
+"this person.\n"
+"You may want to try selecting existing shared users instead."
+msgstr ""
+
+#. module: share
+#: field:share.wizard,new_users:0
+msgid "New users"
+msgstr "Новые пользователи"
+
+#. module: share
+#: model:ir.model,name:share.model_res_groups
+msgid "res.groups"
+msgstr "res.groups"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:121
+#, python-format
+msgid "%s (Shared)"
+msgstr ""
+
+#. module: share
+#: sql_constraint:res.groups:0
+msgid "The name of the group must be unique !"
+msgstr "Название группы должно быть уникальным !"
+
+#. module: share
+#: selection:share.wizard,user_type:0
+msgid "New users (emails required)"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:390
+#, python-format
+msgid "Sharing filter created by user %s (%s) for group %s"
+msgstr ""
+
+#. module: share
+#: view:res.groups:0
+msgid "Groups"
+msgstr "Группы"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Select the desired shared access mode:"
+msgstr ""
+
+#. module: share
+#: field:res.groups,share:0
+msgid "Share Group"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:431
+#: field:share.wizard.result.line,password:0
+#, python-format
+msgid "Password"
+msgstr "Пароль"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Who would you want to share this data with?"
+msgstr ""
+
+#. module: share
+#: model:ir.module.module,description:share.module_meta_information
+msgid ""
+"The goal is to implement a generic sharing mechanism, where user of OpenERP\n"
+"can share data from OpenERP to their colleagues, customers, or friends.\n"
+"The system will work by creating new users and groups on the fly, and by\n"
+"combining the appropriate access rights and ir.rules to ensure that the "
+"/shared\n"
+"users/ will only have access to the correct data.\n"
+"    "
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:102
+#, python-format
+msgid "User already exists"
+msgstr "Пользователь уже существует"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Send Email Notification(s)"
+msgstr "Отправить уведомление по эл. почте"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:435
+#, python-format
+msgid ""
+"You may use your existing login and password to view it. As a reminder, your "
+"login is %s.\n"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:432
+#, python-format
+msgid "Database"
+msgstr "База данных"
+
+#. module: share
+#: model:ir.model,name:share.model_share_wizard_user
+msgid "share.wizard.user"
+msgstr "share.wizard.user"
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"Please select the action that opens the screen containing the data you want "
+"to share."
+msgstr ""
+
+#. module: share
+#: selection:share.wizard,user_type:0
+msgid "Existing external users"
+msgstr "Cуществующие внешние пользователи"
+
+#. module: share
+#: view:share.wizard:0
+#: field:share.wizard,result_line_ids:0
+msgid "Summary"
+msgstr "Содержание"
+
+#. module: share
+#: field:share.wizard,user_type:0
+msgid "Users to share with"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:276
+#, python-format
+msgid "Indirect sharing filter created by user %s (%s) for group %s"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:420
+#, python-format
+msgid "Email required"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:212
+#, python-format
+msgid "Copied access for sharing"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"Optionally, you may specify an additional domain restriction that will be "
+"applied to the shared data."
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "New Users (please provide one e-mail address per line below)"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:420
+#, python-format
+msgid ""
+"The current user must have an email address configured in User Preferences "
+"to be able to send outgoing emails."
+msgstr ""
+
+#. module: share
+#: view:res.users:0
+msgid "Regular users only (no share user)"
+msgstr ""
+
+#. module: share
+#: field:share.wizard.result.line,share_url:0
+msgid "Share URL"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,domain:0
+msgid "Domain"
+msgstr "Домен"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:286
+#, python-format
+msgid ""
+"Sorry, the current screen and filter you are trying to share are not "
+"supported at the moment.\n"
+"You may want to try a simpler filter."
+msgstr ""
+
+#. module: share
+#: field:share.wizard,access_mode:0
+msgid "Access Mode"
+msgstr "Режим доступа"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Access info"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:426
+#, python-format
+msgid ""
+"To access it, you can go to the following URL:\n"
+"    %s"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,action_id:0
+msgid "Action to share"
+msgstr ""
+
+#. module: share
+#: code:addons/share/web/editors.py:18
+#, python-format
+msgid "Share"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:406
+#, python-format
+msgid "Sharing Wizard - Step 2"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Here is a summary of the access points you have just created:"
+msgstr ""
+
+#. module: share
+#: model:ir.model,name:share.model_share_wizard_result_line
+msgid "share.wizard.result.line"
+msgstr "share.wizard.result.line"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:285
+#, python-format
+msgid "Sharing access could not be setup"
+msgstr ""
+
+#. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard_step1
+#: model:ir.model,name:share.model_share_wizard
+#: field:share.wizard.result.line,share_wizard_id:0
+#: field:share.wizard.user,share_wizard_id:0
+msgid "Share Wizard"
+msgstr ""
+
+#. module: share
+#: help:share.wizard,user_type:0
+msgid "Select the type of user(s) you would like to share data with."
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Cancel"
+msgstr "Отменить"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Close"
+msgstr "Закрыть"
+
+#. module: share
+#: help:res.users,share:0
+msgid ""
+"External user with limited access, created only for the purpose of sharing "
+"data."
+msgstr ""
+
+#. module: share
+#: help:share.wizard,domain:0
+msgid "Optional domain for further data filtering"
+msgstr "Дополнительный домен для дальнейшей фильтрации данных"
+
+#. module: share
+#: selection:share.wizard,access_mode:0
+msgid "Read-only"
+msgstr "Только чтение"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:295
+#, python-format
+msgid "*usual password*"
+msgstr "*Обычный пароль*"
+
+#, python-format
+#~ msgid ""
+#~ "You may use the following login and password to get access to this protected "
+#~ "area:"
+#~ msgstr ""
+#~ "Вы можете использовать следующие логин и пароль, для доступа к этой "
+#~ "защищенной зоне:"
diff --git a/addons/web_livechat/i18n/tr.po b/addons/web_livechat/i18n/tr.po
new file mode 100644
index 00000000000..e03d64cac46
--- /dev/null
+++ b/addons/web_livechat/i18n/tr.po
@@ -0,0 +1,39 @@
+# Turkish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-04-26 14:31+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish <tr@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: 2011-04-27 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: web_livechat
+#: sql_constraint:publisher_warranty.contract:0
+msgid ""
+"Your publisher warranty contract is already subscribed in the system !"
+msgstr "Yayıncı garanti sözleşmeniz halihazırda sistemde kayıtlı !"
+
+#. module: web_livechat
+#: model:ir.module.module,shortdesc:web_livechat.module_meta_information
+msgid "Live Chat Support"
+msgstr "Canlı Sohbet Desteği"
+
+#. module: web_livechat
+#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
+msgid "publisher_warranty.contract"
+msgstr "publisher_warranty.contract"
+
+#. module: web_livechat
+#: model:ir.module.module,description:web_livechat.module_meta_information
+msgid "Enable live chat support for whom have a maintenance contract"
+msgstr "Bakım sözleşmesi olanlar için canlı sohbet desteğini açar"
diff --git a/addons/wiki_faq/i18n/tr.po b/addons/wiki_faq/i18n/tr.po
new file mode 100644
index 00000000000..2217d0c43a2
--- /dev/null
+++ b/addons/wiki_faq/i18n/tr.po
@@ -0,0 +1,32 @@
+# Turkish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-04-26 14:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish <tr@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: 2011-04-27 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: wiki_faq
+#: model:ir.module.module,description:wiki_faq.module_meta_information
+msgid ""
+"This module provides a wiki FAQ Template\n"
+"    "
+msgstr ""
+"Bu modül bir wiki Sıkça Sorulan Sorular Şablonu içerir\n"
+"    "
+
+#. module: wiki_faq
+#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
+msgid "Document Management - Wiki - FAQ"
+msgstr "Döküman Yönetimi - Wiki - SSS"
diff --git a/addons/wiki_quality_manual/i18n/ru.po b/addons/wiki_quality_manual/i18n/ru.po
new file mode 100644
index 00000000000..2a3518f245f
--- /dev/null
+++ b/addons/wiki_quality_manual/i18n/ru.po
@@ -0,0 +1,32 @@
+# Russian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-04-26 05:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian <ru@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: 2011-04-27 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: wiki_quality_manual
+#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
+msgid ""
+"Quality Manual Template\n"
+"    "
+msgstr ""
+"Шаблон руководства по качеству\n"
+"    "
+
+#. module: wiki_quality_manual
+#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
+msgid "Document Management - Wiki - Quality Manual"
+msgstr "Управление документами - Вики - Руководство по качеству"
diff --git a/addons/wiki_quality_manual/i18n/tr.po b/addons/wiki_quality_manual/i18n/tr.po
new file mode 100644
index 00000000000..0427a2b010c
--- /dev/null
+++ b/addons/wiki_quality_manual/i18n/tr.po
@@ -0,0 +1,32 @@
+# Turkish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-04-26 14:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish <tr@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: 2011-04-27 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: wiki_quality_manual
+#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
+msgid ""
+"Quality Manual Template\n"
+"    "
+msgstr ""
+"Kalite El Kitabı Şablonu\n"
+"    "
+
+#. module: wiki_quality_manual
+#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
+msgid "Document Management - Wiki - Quality Manual"
+msgstr "Döküman Yönetimi - Wiki - Kalite El Kitabı"

From 44344056d39344ddfffd6e61dbf536c76e41a077 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Wed, 27 Apr 2011 11:16:48 +0530
Subject: [PATCH 177/188] [FIX] thunderbird: fixed import error

bzr revid: rha@tinyerp.com-20110427054648-axfgp2dnqm63bjqv
---
 addons/thunderbird/partner/partner.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/thunderbird/partner/partner.py b/addons/thunderbird/partner/partner.py
index d67238db5fc..180499ae5b7 100644
--- a/addons/thunderbird/partner/partner.py
+++ b/addons/thunderbird/partner/partner.py
@@ -23,6 +23,7 @@ from osv import osv
 import base64
 import email
 import tools
+from tools.translate import _
 
 class thunderbird_partner(osv.osv_memory):
     _name = "thunderbird.partner"

From d0db365ac5accf3d51a45cf3fb35bea11cb0341e Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Wed, 27 Apr 2011 16:05:36 +0530
Subject: [PATCH 178/188] [FIX] email_template: closing wizard on creating new
 template

bzr revid: rha@tinyerp.com-20110427103536-ppnufnu1ae8dbgt4
---
 addons/email_template/wizard/email_compose_message.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/email_template/wizard/email_compose_message.py b/addons/email_template/wizard/email_compose_message.py
index d5289a4e98f..a1f6d6245df 100644
--- a/addons/email_template/wizard/email_compose_message.py
+++ b/addons/email_template/wizard/email_compose_message.py
@@ -105,7 +105,7 @@ class email_compose_message(osv.osv_memory):
                 'attachment_ids': [(6, 0, [att.id for att in record.attachment_ids])]
             }
             template_pool.create(cr, uid, values, context=context)
-        return True
+        return {'type': 'ir.actions.act_window_close'}
 
 email_compose_message()
 

From ad9b8bded96c0217099be491af27fec1c9923416 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Wed, 27 Apr 2011 13:39:09 +0200
Subject: [PATCH 179/188] [FIX] account/project: renamed
 account.analytic.Journal.report to lowercase. - although it is an osv_memory,
 it is done for consistency - proper check will be added in the server for
 both osv and osv_memory - translation will be broken until we regenerate the
 .pot files and launchpad regenrates the .po files.

bzr revid: vmt@openerp.com-20110427113909-qej15r9k08whlzj5
---
 .../project/wizard/account_analytic_journal_report.py     | 8 ++++----
 .../wizard/account_analytic_journal_report_view.xml       | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/account/project/wizard/account_analytic_journal_report.py b/addons/account/project/wizard/account_analytic_journal_report.py
index cb2b67aad39..59dd0361805 100644
--- a/addons/account/project/wizard/account_analytic_journal_report.py
+++ b/addons/account/project/wizard/account_analytic_journal_report.py
@@ -22,8 +22,8 @@ import time
 
 from osv import osv, fields
 
-class account_analytic_Journal_report(osv.osv_memory):
-    _name = 'account.analytic.Journal.report'
+class account_analytic_journal_report(osv.osv_memory):
+    _name = 'account.analytic.journal.report'
     _description = 'Account Analytic Journal'
 
     _columns = {
@@ -52,5 +52,5 @@ class account_analytic_Journal_report(osv.osv_memory):
             'datas': datas,
             }
 
-account_analytic_Journal_report()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+account_analytic_journal_report()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/project/wizard/account_analytic_journal_report_view.xml b/addons/account/project/wizard/account_analytic_journal_report_view.xml
index 137920ee056..20777401da0 100644
--- a/addons/account/project/wizard/account_analytic_journal_report_view.xml
+++ b/addons/account/project/wizard/account_analytic_journal_report_view.xml
@@ -4,7 +4,7 @@
 
 		<record id="account_analytic_journal_view" model="ir.ui.view">
 			<field name="name">Account Analytic Journal</field>
-			<field name="model">account.analytic.Journal.report</field>
+			<field name="model">account.analytic.journal.report</field>
 			<field name="type">form</field>
 			<field name="arch" type="xml">
 				<form string="Select Period">
@@ -24,7 +24,7 @@
 		<record id="action_account_analytic_journal" model="ir.actions.act_window">
 			<field name="name">Analytic Journal</field>
 			<field name="type">ir.actions.act_window</field>
-			<field name="res_model">account.analytic.Journal.report</field>
+			<field name="res_model">account.analytic.journal.report</field>
 			<field name="view_type">form</field>
 			<field name="view_mode">form</field>
 			<field name="view_id" ref="account_analytic_journal_view"/>
@@ -42,4 +42,4 @@
 		</record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>

From 8b701308ec90e9ff16f2f5e47152196f9b435926 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Wed, 27 Apr 2011 18:38:52 +0530
Subject: [PATCH 180/188] [FIX] hr_attendance: encoded with utf8

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

bzr revid: mtr@mtr-20110427130852-6d8odic2ng8wwmlm
---
 addons/hr_attendance/report/timesheet.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/hr_attendance/report/timesheet.py b/addons/hr_attendance/report/timesheet.py
index 53cbb004872..900f982dc74 100644
--- a/addons/hr_attendance/report/timesheet.py
+++ b/addons/hr_attendance/report/timesheet.py
@@ -109,6 +109,7 @@ class report_custom(report_rml):
         %s
         </report>
         ''' % '\n'.join(user_xml)
+        xml = tools.ustr(xml).encode('utf8')
         return self.post_process_xml_data(cr, uid, xml, context)
 
 report_custom('report.hr.attendance.allweeks', 'hr.employee', '', 'addons/hr_attendance/report/timesheet.xsl')

From 2fa1c59ddf22564384ce9abe0809aa1f4cb6f072 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Wed, 27 Apr 2011 19:17:11 +0530
Subject: [PATCH 181/188] [IMP] outlook,mail: improvements for outlook plugin

bzr revid: rha@tinyerp.com-20110427134711-uqfm7m4s4lwj1tgi
---
 addons/mail/email_thread.py                   |  2 +
 .../dialogs/dialog_map.py                     |  1 -
 .../dialogs/resources/dialogs.py              |  6 +-
 .../openerp-outlook-plugin/tiny_xmlrpc.py     | 74 +++++++++----------
 4 files changed, 41 insertions(+), 42 deletions(-)

diff --git a/addons/mail/email_thread.py b/addons/mail/email_thread.py
index df26adab354..33bee007548 100644
--- a/addons/mail/email_thread.py
+++ b/addons/mail/email_thread.py
@@ -180,6 +180,8 @@ class email_thread(osv.osv):
         for thread in threads:
             attachments = []
             for fname, fcontent in attach.items():
+                if isinstance(fcontent, unicode):
+                    fcontent = fcontent.encode('utf-8')
                 data_attach = {
                     'name': fname,
                     'datas': binascii.b2a_base64(str(fcontent)),
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
index a05220ad7e0..87138554e16 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
@@ -186,7 +186,6 @@ def check():
         win32ui.MessageBox("No server running on host "+ server+" at port "+str(port), "OpenERP Connection", flag_excl)
         return False
     if str(NewConn.getitem('_login')) == 'False':
-        win32ui.MessageBox("Please login to the database first", "OpenERP Connection", flag_excl)
         return False
     return True
 
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py
index 247b9c7a533..aa417b2cd59 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py
@@ -1,7 +1,7 @@
-#C:\workspace\openerp-outlook-plugin\dialogs\resources\dialogs.py
-#This is a generated file. Please edit C:\workspace\openerp-outlook-plugin\dialogs\resources\dialogs.rc instead.
+#C:\Program Files\Openerp Outlook Addin\dialogs\resources\dialogs.py
+#This is a generated file. Please edit C:\Program Files\Openerp Outlook Addin\dialogs\resources\dialogs.rc instead.
 _rc_size_=16350
-_rc_mtime_=1296563638
+_rc_mtime_=1296608638
 class FakeParser:
 	dialogs = {'IDD_OPEN_DOCUEMNT_DIALOG': [['Open Document', (0, 0, 200, 65), -1865940928, 1024, (8, 'Tahoma')], [130, 'Link to Document : (If this link does not opens directly in web browser then copy an the link and paste in web browser.) ', -1, (5, 3, 190, 25), 1342177280], [129, '', 2086, (5, 31, 190, 12), 1350631552], [128, 'Ok', 2, (150, 45, 45, 14), 1342242816]], 'IDD_VIEW_PARTNER_DIALOG': [['Open Contact', (0, 0, 350, 215), -1865940928, 1024, (8, 'Tahoma')], [130, 'Email ID : ', -1, (32, 17, 40, 12), 1342177280], [129, '', 2051, (70, 15, 200, 12), 1350631552], [128, 'Search Contact ', 2052, (280, 15, 60, 14), 1342242816], [130, 'Partner Name : ', -1, (13, 42, 50, 17), 1342177280], [129, '', 2064, (70, 42, 150, 12), 1350568064], [128, 'Search Partner', 2070, (225, 41, 60, 14), 1342242816], [128, 'New Partner', 2093, (290, 41, 50, 14), 1342242816], [128, 'Postal Address ', 2024, (10, 65, 175, 125), 1342177287], [130, 'Contact Name : ', -1, (18, 83, 50, 17), 1342177280], [129, '', 2046, (76, 82, 100, 12), 1350631552], [130, 'Street : ', -1, (18, 97, 50, 17), 1342177280], [129, '', 2053, (76, 96, 100, 12), 1350631552], [130, 'Street2 : ', -1, (18, 112, 50, 17), 1342177280], [129, '', 2054, (76, 111, 100, 12), 1350631552], [130, 'Zip : ', -1, (18, 126, 50, 14), 1342177280], [129, '', 40010, (76, 125, 100, 12), 1350631552], [130, 'City : ', -1, (18, 140, 50, 17), 1342177280], [129, '', 40011, (76, 139, 100, 12), 1350631552], [130, 'Fed. State : ', -1, (18, 154, 50, 17), 1342177280], [129, '', 2062, (76, 153, 54, 12), 1350568064], [128, 'Search', 2104, (135, 153, 40, 12), 1342242816], [130, 'Country :', -1, (18, 169, 35, 17), 1342177280], [129, '', 2063, (76, 168, 54, 12), 1350568064], [128, 'Search', 2105, (135, 168, 40, 12), 1342242816], [128, 'Communication ', 2024, (188, 65, 152, 125), 1342177287], [130, 'Phone : ', -1, (194, 83, 30, 17), 1342177280], [129, '', 2048, (224, 82, 100, 12), 1350631552], [130, 'Mobile : ', -1, (194, 97, 30, 17), 1342177280], [129, '', 2050, (224, 96, 100, 12), 1350631552], [130, 'Email : ', -1, (194, 111, 30, 17), 1342177280], [129, '', 2058, (224, 110, 100, 12), 1350568064], [130, 'Fax : ', -1, (194, 125, 30, 17), 1342177280], [129, '', 2047, (224, 124, 100, 12), 1350631552], [128, 'Create a New Contact', 2071, (124, 195, 82, 14), 1342242816], [128, 'Save', 2059, (213, 195, 60, 14), 1342242816], [128, 'Cancel', 2, (281, 195, 60, 14), 1342242816]], 'IDD_OPEN_PARTNER_DIALOG': [['Open Partner', (0, 0, 200, 65), -1865940928, 1024, (8, 'Tahoma')], [130, 'Link to Partner : (If this link does not opens directly in web browser then copy an the link and paste in web browser.) ', -1, (5, 3, 190, 25), 1342177280], [129, '', 2085, (5, 31, 190, 12), 1350631552], [128, 'Ok', 2, (150, 45, 45, 13), 1342242816]], 'IDD_SELECT_STATE': [['Search Fed. State', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2100, (55, 10, 100, 12), 1350631552], [128, 'Search', 40012, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2101, (8, 40, 200, 185), 1353711657], [128, 'Select', 2102, (170, 230, 40, 14), 1342242816]], 'IDD_GENERAL': [['Connection Parameters', (0, 0, 430, 210), 1355284544, None, (8, 'Tahoma')], [128, 'Connection Parameters', 2024, (10, 10, 250, 130), 1342177287], [130, 'Server   : ', -1, (30, 30, 100, 17), 1342177280], [129, '', 2003, (85, 30, 120, 12), 1350633472], [128, 'Change', 2021, (210, 30, 30, 13), 1342242816], [130, 'Database : ', -1, (30, 50, 100, 17), 1342177280], [133, '', 2004, (85, 50, 154, 40), 1344339971], [130, 'Username : ', -1, (30, 70, 100, 17), 1342177280], [129, '', 2005, (85, 70, 154, 12), 1350631552], [130, 'Password : ', -1, (30, 90, 100, 17), 1342177280], [129, '', 2006, (85, 90, 154, 12), 1350631584], [128, 'Connect', 2007, (179, 110, 60, 13), 1342242816], [128, 'WebServer Parameters', 2024, (270, 10, 150, 130), 1342177287], [130, 'Server : ', -1, (280, 30, 50, 15), 1342177280], [129, '', 2080, (310, 29, 90, 12), 1350568064], [128, 'Change', 2082, (295, 50, 50, 12), 1342242816], [128, 'Connect', 2083, (350, 50, 50, 12), 1342242816]], 'IDD_OBJECT_SETTINGS': [['Documents Setting', (0, 0, 430, 210), 1355284672, 1024, (8, 'Tahoma')], [128, 'Document Attributes', 2024, (2, 2, 343, 32), 1342177287], [130, 'Title:', -1, (5, 16, 30, 17), 1342177280], [129, '', 2013, (22, 14, 57, 12), 1350631552], [130, 'Document Name:', -1, (83, 16, 60, 17), 1342177280], [129, '', 2014, (138, 14, 57, 12), 1350631552], [130, 'Image:', -1, (200, 16, 22, 17), 1342177280], [129, '', 2015, (223, 14, 57, 12), 1350631552], [128, 'Load Image', 2010, (289, 13, 50, 15), 1342242816], [128, 'Add', 2011, (350, 13, 38, 15), 1342242816], [128, 'Delete', 2012, (392, 13, 38, 15), 1342242816], ['SysListView32', 'List1', 2016, (8, 40, 535, 160), 1353711657]], 'IDD_NEW_PARTNER_DIALOG': [['Create a New Partner', (0, 0, 140, 40), -1865940928, 1024, (8, 'Tahoma')], [130, 'Name : ', -1, (5, 3, 100, 17), 1342177280], [129, '', 2036, (40, 3, 94, 12), 1350631552], [128, 'Cancel', 2, (90, 22, 45, 14), 1342242816], [128, 'Save', 2035, (40, 22, 45, 14), 1342242817]], 'IDD_MANAGER': [['OpenERP Configuration', (0, 0, 460, 260), -1865940800, None, (8, 'Tahoma')], [128, 'Close', 2008, (400, 239, 50, 14), 1342177281], ['SysTabControl32', '', 1068, (8, 7, 440, 228), 1342177280], ['SysListView32', '', 2016, (0, 0, 0, 0), 1353711657]], 'IDD_WEB_SERVER_PORT_DIALOG': [['OpenERP Connection', (0, 0, 160, 80), -1865940928, 1024, (8, 'Tahoma')], [130, 'Server : ', -1, (5, 3, 150, 17), 1342177280], [129, '', 2089, (40, 3, 100, 12), 1350631552], [130, 'Port   : ', -1, (5, 18, 100, 17), 1342177280], [129, '', 2090, (40, 18, 100, 12), 1350631552], [128, 'Close', 2, (110, 50, 45, 14), 1342242816], [128, 'OK', 2091, (50, 50, 50, 14), 1342242817], [128, 'SSL (https)', 2111, (20, 35, 100, 14), 1342242819]], 'IDD_ABOUT': [['About', (0, 0, 430, 210), 1355284672, 1024, (8, 'Tahoma')], [128, 'About Plugin', -1, (7, 3, 422, 200), 1342177287], [130, '1062', 1062, (60, 30, 20, 20), 1342179342], [130, '', 2028, (80, 90, 300, 100), 1342177280]], 'IDD_NEW_CONTACT_DIALOG': [['Create a New Contact', (0, 0, 350, 180), -1865940928, 1024, (8, 'Tahoma')], [130, 'Select Partner : ', -1, (13, 20, 50, 17), 1342177280], [129, '', 2079, (70, 18, 150, 12), 1350568064], [128, 'Search Partner', 2033, (225, 17, 60, 14), 1342242816], [128, 'New Partner', 2092, (290, 17, 50, 14), 1342242816], [128, 'Postal Address ', 2024, (10, 35, 175, 123), 1342177287], [130, 'Contact Name : ', -1, (18, 53, 100, 17), 1342177280], [129, '', 40005, (76, 52, 100, 12), 1350631552], [130, 'Street : ', -1, (18, 67, 40, 17), 1342177280], [129, '', 2062, (76, 66, 100, 12), 1350631552], [130, 'Street2 : ', -1, (18, 81, 40, 17), 1342177280], [129, '', 2063, (76, 80, 100, 12), 1350631552], [130, 'Zip : ', -1, (18, 94, 50, 17), 1342177280], [129, '', 2068, (76, 93, 100, 12), 1350631552], [130, 'City : ', -1, (18, 106, 50, 17), 1342177280], [129, '', 2067, (76, 107, 100, 12), 1350631552], [130, 'Fed. State : ', -1, (18, 134, 50, 15), 1342177280], [129, '', 2106, (76, 135, 54, 12), 1350568064], [128, 'Search', 2107, (135, 136, 40, 12), 1342242816], [130, 'Country :', -1, (18, 121, 35, 15), 1342177280], [129, '', 2108, (76, 122, 54, 12), 1350568064], [128, 'Search', 2109, (135, 121, 40, 12), 1342242816], [128, 'Communication ', 2024, (188, 35, 150, 123), 1342177287], [130, 'Office : ', -1, (194, 53, 30, 17), 1342177280], [129, '', 40006, (224, 52, 100, 12), 1350631552], [130, 'Mobile : ', -1, (194, 67, 30, 17), 1342177280], [129, '', 40007, (224, 66, 100, 12), 1350631552], [130, 'Fax : ', -1, (194, 81, 30, 17), 1342177280], [129, '', 2066, (224, 80, 100, 12), 1350631552], [130, 'Email  : ', -1, (194, 95, 30, 17), 1342177280], [129, '', 40008, (224, 94, 100, 12), 1350631552], [128, 'Cancel', 2, (290, 162, 45, 13), 1342242816], [128, 'Save', 40009, (240, 162, 45, 13), 1342242816]], 'IDD_SERVER_PORT_DIALOG': [['OpenERP Connection', (0, 0, 160, 90), -1865940928, 1024, (8, 'Tahoma')], [130, 'Server : ', -1, (5, 3, 150, 17), 1342177280], [129, '', 2001, (45, 3, 100, 12), 1350631552], [130, '  Port   : ', -1, (5, 18, 100, 17), 1342177280], [129, '', 2002, (45, 18, 100, 12), 1350631552], [128, '', 2024, (5, 35, 150, 5), 1342177287], [130, 'Protocol Connection :', -1, (5, 45, 80, 17), 1342177280], [133, '', 2110, (75, 43, 75, 50), 1344339971], [128, 'Close', 2, (60, 70, 45, 14), 1342242816], [128, 'OK', 1, (110, 70, 45, 14), 1342242817]], 'IDD_SELECT_PARTNER': [['Search Partner', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2076, (55, 10, 100, 12), 1350631552], [128, 'Search', 2077, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2072, (8, 40, 200, 185), 1353711657], [128, 'Create New Partner', 2078, (10, 230, 100, 14), 1342242816], [128, 'Select', 2075, (170, 230, 40, 14), 1342242816]], 'IDD_SYNC': [['Push to OpenERP', (0, 0, 470, 320), -1865940928, 1024, (8, 'Tahoma')], [128, 'Link to an Existing Documents ', 2024, (8, 5, 250, 290), 1342242823], [130, 'Search : ', -1, (15, 17, 40, 12), 1342177280], [129, '', 40003, (60, 15, 120, 12), 1350631552], [128, 'Search', 40004, (187, 15, 40, 14), 1342242816], [130, 'Documents : ', -1, (15, 140, 100, 14), 1342177280], ['SysListView32', 'List1', 2026, (15, 150, 234, 110), 1350631433], [128, 'Push', 2019, (160, 270, 85, 14), 1342242816], [128, ' Create a New Document ', 2024, (263, 5, 202, 100), 1342242823], [130, 'Type of Document : ', -1, (266, 25, 100, 12), 1342177280], [133, '', 2025, (332, 24, 75, 45), 1344339971], [128, 'Create', 2020, (412, 23, 50, 14), 1342242816], [128, ' Create a New Contact ', 2024, (263, 110, 202, 185), 1342242823], [130, 'Create a New Contact : ', -1, (280, 140, 100, 12), 1342177280], [128, 'Create Contact', 2018, (360, 138, 60, 14), 1342242816], [128, 'Close', 2, (385, 300, 60, 14), 1342242816]], 'IDD_SELECT_COUNTRY': [['Search Country', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2095, (55, 10, 100, 12), 1350631552], [128, 'Search', 2098, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2096, (8, 40, 200, 185), 1353711657], [128, 'Select', 2097, (170, 230, 40, 14), 1342242816]]}
 	ids = {'IDC_BUT_DEL_OBJECT': 2012, 'IDD_OPEN_PARTNER_DIALOG': 2084, 'IDD_SELECT_STATE': 2099, 'IDC_DELAY1_SLIDER': 1056, 'IDC_PROGRESS': 1000, 'IDD_MANAGER': 101, 'IDC_ABOUT': 2028, 'IDD_DIAGNOSTIC': 113, 'IDET_PARTNER_COUNTRY': 2063, 'IDD_TRAINING': 102, 'ID_CONTACT_EMAIL_TEXT': 40008, 'IDC_DELAY2_TEXT': 1059, 'IDC_DELAY1_TEXT': 1057, 'IDD_WIZARD': 114, 'IDC_CHKBX': 2023, 'IDC_STATIC_HAM': 1002, 'IDC_PROGRESS_TEXT': 1001, 'IDR_XMLS_PROTOCOL': 2042, 'IDD_GENERAL': 108, 'IDD_ABOUT': 2027, 'IDD_SYNC': 40002, 'IDC_TAB': 1068, 'IDC_FOLDER_UNSURE': 1033, '_APS_NEXT_SYMED_VALUE': 101, 'IDC_VERBOSE_LOG': 1061, 'IDC_EDIT1': 1094, 'IDC_BROWSE': 1037, 'ID_DB_DROPDOWNLIST': 2004, 'IDC_BACK_BTN': 1069, 'ID_CONTACT_NAME_TEXT': 40005, 'IDPB_PARTNER_SEARCH': 2077, 'IDD_WIZARD_FINISHED_UNCONFIGURED': 119, 'IDC_ACTION_CERTAIN': 1025, 'IDC_BUT_ACT_ALL': 1019, 'IDD_FILTER_NOW': 104, 'IDET_WED_SERVER': 2080, 'ID_WEB_OK': 2091, 'ID_PROTOCOL_GRP': 2040, 'IDC_HEADER': 2017, 'IDC_MARK_SPAM_AS_READ': 1047, 'IDPB_NEW_PARTNER_BUTTON': 2092, 'ID_PARTNER_NAME_TEXT': 2036, 'IDC_RECOVER_RS': 1075, 'IDC_NAME_LIST1': 2037, 'ID_CONTACT_OFFICE_TEXT': 40006, 'IDC_STATIC': -1, 'IDC_PAGE_PLACEHOLDER': 1078, 'IDC_BROWSE_WATCH': 1039, 'IDET_ZIP': 40010, 'IDET_PARTNER_CITY': 40011, 'IDET_PARTNER_LINK_TEXT': 2085, 'IDC_FOLDER_HAM': 1083, 'IDC_LIST_COUNTRY': 2096, 'IDD_WIZARD_FOLDERS_REST': 117, 'IDC_SHOW_DATA_FOLDER': 1071, 'IDC_BUT_ACT_SCORE': 1018, 'IDET_STATE_SEARCH_NAME': 2100, 'IDET_WEB_SERVER': 2089, '_APS_NEXT_RESOURCE_VALUE': 128, 'ID_SET_WEB_CONNECTION': 2082, 'ID_DROPDOWNLIST_PROTOCOL': 2110, 'IDC_LIST_STATE': 2101, 'IDC_CONTACT_LIST': 2029, 'IDC_SLIDER_CERTAIN': 1023, 'IDET_PARTNER_STREET': 2053, 'IDC_BUT_UNREAD': 1020, 'ID_PARTNER_DROPDOWNLIST': 2032, 'ID_COUNTRY_DROPLIST': 2065, 'IDC_BUT_ABOUT': 1017, 'IDC_BUT_RESCORE': 1008, 'IDC_BUT_SEARCHSUB': 1041, 'IDC_BUT_TRAIN_FROM_SPAM_FOLDER': 1010, 'IDET_PARTNER_MOBILENO': 2050, 'ID_CONTACT_MOBILE_TEXT': 40007, 'IDD_VIEW_PARTNER_DIALOG': 2044, 'IDD_WIZARD_FOLDERS_TRAIN': 120, 'IDC_BUT_FILTER_ENABLE': 1013, 'IDPB_WEB_CONNECTION': 2083, 'IDC_ABOUT_BTN': 1072, 'IDD_WIZARD_FINISHED_TRAINED': 122, 'ID_SERVER': 2001, 'IDD_SELECT_PARTNER': 2073, 'IDET_NC_PARTNER_STATE': 2106, 'IDD_FOLDER_SELECTOR': 105, 'IDC_BUT_SET_SERVER_PORT': 2021, 'ID_DONE': 2008, 'IDC_LIST_FOLDERS': 1040, 'IDC_IMAGE_PATH': 2015, 'IDB_SBWIZLOGO': 125, 'IDB_OPENERPLOGO': 1062, 'ID_ZIP_TEXT': 2068, 'IDEB_OPENDOC_LINK_TEXT': 2086, 'IDD_NEW_PARTNER_DIALOG': 2034, 'ID_PARTNER_DROPLIST': 2069, 'IDC_BUT_VIEW_LOG': 1093, 'IDC_STATUS2': 1044, 'IDC_STATUS1': 1043, 'IDCANCEL': 2, 'IDC_BROWSE_HAM': 1004, 'ID_BUT_TESTCONNECTION': 2007, 'IDR_NETRPC_PROTOCOL': 2043, 'IDC_BROWSE_SPAM': 1005, 'IDCB_WEB_SECURE': 2111, 'IDD_OPEN_DOCUEMNT_DIALOG': 2087, 'IDD_WIZARD_FINISHED_UNTRAINED': 116, 'IDC_MARK_UNSURE_AS_READ': 1051, 'IDPB_SEARCH_COUNTRY1': 2105, 'ID_PARTNER_CITY_TEXT': 2067, 'IDC_BUT_WIZARD': 1070, 'IDC_VERSION': 1009, 'ID_NEW_PARTNER_BUTTON': 2033, 'IDC_FOLDER_NAMES': 1036, 'ID_ATT_METHOD_DROPDOWNLIST': 2025, 'IDC_BUT_TIMER_ENABLED': 1091, 'IDPB_WRITE_CHANGES': 2059, 'IDC_SLIDER_UNSURE': 1029, 'IDC_BUT_NEW': 1046, 'IDC_FOLDER_WATCH': 1038, 'IDPB_CREATE_NEW_PARTNER': 2078, 'IDC_BUT_UNTRAINED': 1088, 'IDC_STATIC_SPAM': 1003, 'IDD_NEW_CONTACT_DIALOG': 2031, 'IDC_EDIT_UNSURE': 1030, 'IDC_BUT_CLEARALL': 1042, 'IDC_BUT_UNSEEN': 1021, 'IDC_OBJECT_NAME': 2014, 'IDD_WIZARD_FOLDERS_WATCH': 118, 'IDPB_SEARCH_STATE': 2103, 'IDET_COUNTRY_SEARCH_NAME': 2095, 'IDC_BUT_SAVE_OBJECT': 2011, 'ID_FED_STATE_DROPLIST': 2064, 'ID_ALL_COUNTRY_DROPDOWNLIST': 2061, 'IDC_EDIT_CERTAIN': 1024, 'IDC_BUT_FILTER_DEFINE': 1016, 'ID_NEW_PART_BUTTON': 2070, 'ID_FAX_TEXT': 2066, 'IDD_WIZARD_TRAINING_IS_IMPORTANT': 123, 'ID_ALL_STATE_DROPDOWNLIST': 2060, 'IDPB_SEARCH_STATE1': 2104, 'IDC_INBOX_TIMER_ONLY': 1060, 'IDPB_SEARCH_PARTNER': 2052, 'ID_USERNAME': 2005, '_APS_NEXT_CONTROL_VALUE': 1096, 'IDC_WIZ_GRAPHIC': 1092, 'IDD_OBJECT_SETTINGS': 2009, 'IDD_FILTER_UNSURE': 111, 'IDC_DEL_SPAM_RS': 1074, 'IDD_SELECT_COUNTRY': 2094, 'ID_SERVER_PORT': 2003, 'IDR_XML_PROTOCOL': 2041, 'IDET_PARTNER_OFFICENO': 2048, 'IDB_FOLDERS': 127, 'IDC_BUT_PREPARATION': 1081, 'ID_STREET2_TEXT': 2063, 'IDC_DELAY2_SLIDER': 1058, 'IDET_PARTNER': 2064, 'IDC_SAVE_SPAM_SCORE': 1048, 'IDC_OBJECT_TITLE': 2013, 'IDC_FOLDER_CERTAIN': 1027, 'IDET_WEB_PORT': 2090, 'IDC_BROWSE_UNSURE': 1034, 'IDC_STATISTICS': 1095, 'IDPB_STATE_SEARCH': 40012, 'ID_MAKE_ATTACHMENT': 2019, 'IDC_BUT_LOAD_IMAGE': 2010, 'IDC_NAME_LIST': 2026, 'IDC_BUT_TRAIN_TO_SPAM_FOLDER': 1011, 'IDET_PARTNER_SEARCH_NAME': 2076, 'IDC_BUT_RESET': 1073, 'ID_SEARCH': 40004, 'IDET_PARTNER_CONTACT_NAME': 2046, 'IDPB_SELECT_STATE': 2102, 'IDC_ACTION_UNSURE': 1031, 'IDD_WIZARD_TRAIN': 121, 'IDC_STATIC_GROUP': 2024, 'IDPB_NEWPARTNER_BUTTON': 2071, 'ID_PARTNER_TEXT': 2079, 'IDD_WIZARD_FINISHED_TRAIN_LATER': 124, 'IDET_PARTNER_NAME': 2045, 'IDPB_NEW_PART_BUTTON': 2093, 'IDC_BUT_REBUILD': 1007, 'IDET_PARTNER_STREET2': 2054, 'IDPB_SEARCH_COUNTRY': 2098, 'ID_SAVE_PARTNER_BUTTON': 2035, 'IDPB_SELECT_PARTNER': 2075, 'ID_STREET_TEXT': 2062, '_APS_NEXT_COMMAND_VALUE': 40001, 'IDET_SEARCH_PARTNER': 2051, 'IDC_LIST_PARTNER': 2072, 'IDD_WEB_SERVER_PORT_DIALOG': 2088, 'ID_PORT': 2002, 'IDD_SERVER_PORT_DIALOG': 2022, 'IDET_PARTNER_STATE': 2062, 'IDPB_SELECT_COUNTRY': 2097, 'ID_SEARCH_TEXT': 40003, 'IDET_NC_PARTNER_COUNTRY': 2108, 'ID_CREATE_CONTACT': 2018, 'IDC_FORWARD_BTN': 1077, 'IDC_TRAINING_STATUS': 1035, 'IDD_WIZARD_WELCOME': 115, 'IDET_PARTNER_FAX': 2058, 'IDC_BUT_TRAIN': 1089, 'IDC_LIST': 2016, 'ID_CREATE_CASE': 2020, 'IDET_PARTNER_EMAIL': 2047, 'IDC_START': 1006, 'IDD_FILTER': 103, 'IDC_RELOAD': 2038, 'ID_PASSWORD': 2006, 'ID_NAME_TEXT': 2030, 'IDC_FILTER_STATUS': 1014, 'IDPB_NC_SEARCH_STATE1': 2107, 'ID_CONTACT_SAVE_BUTTON': 40009, 'IDOK': 1, 'IDC_BROWSE_CERTAIN': 1028, 'IDC_BUT_SHOW_DIAGNOSTICS': 1080, 'IDC_BUT_TRAIN_NOW': 1012, 'IDPB_NC_SEARCH_COUNTRY1': 2109}
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
index 28244e84fe2..90aa90fd09e 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
@@ -20,6 +20,8 @@
 ##############################################################################
 
 import xmlrpclib
+import binascii
+import base64
 import sys
 import socket
 import os
@@ -146,6 +148,7 @@ class XMLRpcConn(object):
     	flag = False
     	new_msg =  ext_msg =""
     	message_id = referances  = None
+        context = {}
     	try:
             session = win32com.client.Dispatch("MAPI.session")
             session.Logon('Outlook')
@@ -177,10 +180,10 @@ class XMLRpcConn(object):
     	for rec in recs: #[('res.partner', 3, 'Agrolait')]
             model = rec[0]
             res_id = rec[1]
-            #Check if mailgate installed
+            #Check if mail installed
             object_id = execute ( conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','search',[('model','=','email.message')])
             if not object_id:
-            	win32ui.MessageBox("Mailgate is not installed on your configured database '%s' !!\n\nPlease install it to archive the mail."%(self._dbname),"Mailgate not installed",win32con.MB_ICONERROR)
+            	win32ui.MessageBox("Mail is not installed on your configured database '%s' !!\n\nPlease install it to archive the mail."%(self._dbname),"Mail not installed",win32con.MB_ICONERROR)
             	return
             object_ids = execute ( conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','search',[('model','=',model)])
             object_name  = execute( conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','read',object_ids,['name'])[0]['name']
@@ -201,14 +204,19 @@ class XMLRpcConn(object):
             	'message-id':message_id,
             	'references':ustr(referances),
             }
-            obj_list= ['crm.lead','project.issue','hr.applicant','res.partner']
-            if rec[0] not in obj_list:
-                self.CreateEmailAttachment(rec,mail)
             result = {}
+            context['thread_model'] = model
             if attachments:
             	result = self.MakeAttachment([rec], mail)
-            attachment_ids = result.get(model, {}).get(res_id, [])
-            execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'email.thread','history',model, res_id, msg, attachment_ids)
+            execute(conn,'execute',self._dbname,int(self._uid),self._pwd, \
+                    'email.thread','history', [res_id], 'receive', \
+                    True, msg.get('subject',False),\
+                    msg.get('to'), msg.get('body', False),\
+                    msg.get('from'), msg.get('message-id'),\
+                    msg.get('references', False), result,\
+                    msg.get('cc'), False,\
+                    msg.get('date'), context)
+
             new_msg += """- {0} : {1}\n""".format(object_name,str(rec[2]))
             flag = True
 
@@ -310,39 +318,29 @@ class XMLRpcConn(object):
     		return flag
 
     def MakeAttachment(self, recs, mail):
-    	attachments = mail.Attachments
-    	result = {}
-    	conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-    	att_folder_path = os.path.abspath(os.path.dirname("%temp%\\"))
-    	if not os.path.exists(att_folder_path):
+        attachments = mail.Attachments
+        attachment = {}
+        conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
+        att_folder_path = os.path.abspath(os.path.dirname("%temp%\\"))
+        if not os.path.exists(att_folder_path):
     		os.makedirs(att_folder_path)
     	for rec in recs: #[('res.partner', 3, 'Agrolait')]
-    		obj = rec[0]
-    		obj_id = rec[1]
-    		res={}
-    		res['res_model'] = obj
-    		attachment_ids = []
-    		if obj not in result:
-    			result[obj] = {}
-    		for i in xrange(1, attachments.Count+1):
-    			fn = ustr(attachments[i].FileName)
-    			if len(fn) > 64:
-    				l = 64 - len(fn)
-    				f = fn.split('.')
-    				fn = f[0][0:l] + '.' + f[-1]
-    			att_path = os.path.join(att_folder_path,fn)
-    			attachments[i].SaveAsFile(att_path)
-    			f=open(att_path,"rb")
-    			content = "".join(f.readlines()).encode('base64')
-    			f.close()
-    			res['name'] = ustr(attachments[i].DisplayName)
-    			res['datas_fname'] = ustr(fn)
-    			res['datas'] = content
-    			res['res_id'] = obj_id
-    			id = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.attachment','create',res)
-    			attachment_ids.append(id)
-    		result[obj].update({obj_id: attachment_ids})
-    	return result
+            obj = rec[0]
+            obj_id = rec[1]
+            for i in xrange(1, attachments.Count+1):
+            	fn = ustr(attachments[i].FileName)
+            	if len(fn) > 64:
+            		l = 64 - len(fn)
+            		f = fn.split('.')
+            		fn = f[0][0:l] + '.' + f[-1]
+                att_path = os.path.join(att_folder_path,fn)
+                attachments[i].SaveAsFile(att_path)
+                f=open(att_path,"rb")
+                content = "".join(f.readlines()).encode('base64')
+                f.close()
+                content = content.decode('base64')
+                attachment[fn] = content
+        return attachment
 
     def CreateContact(self, res=None):
     	res=eval(str(res))

From 625126ada9023e494784a612282f905ad0ecf32c Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 28 Apr 2011 04:37:50 +0000
Subject: [PATCH 182/188] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110428043750-hxznxmmi77c1htfe
---
 addons/account/i18n/gl.po           |  10 +-
 addons/account/i18n/tr.po           | 173 +++++++++++++++++-----------
 addons/decimal_precision/i18n/tr.po |  71 ++++++++++++
 addons/web_uservoice/i18n/tr.po     |  29 +++++
 4 files changed, 212 insertions(+), 71 deletions(-)
 create mode 100644 addons/decimal_precision/i18n/tr.po
 create mode 100644 addons/web_uservoice/i18n/tr.po

diff --git a/addons/account/i18n/gl.po b/addons/account/i18n/gl.po
index 2d629ed90f1..28ae44ff267 100644
--- a/addons/account/i18n/gl.po
+++ b/addons/account/i18n/gl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-02-02 10:14+0000\n"
-"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
+"PO-Revision-Date: 2011-04-27 15:37+0000\n"
+"Last-Translator: Xosé <Unknown>\n"
 "Language-Team: Galician <gl@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: 2011-03-18 04:49+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-28 04:37+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -2140,7 +2140,7 @@ msgstr ""
 #: field:analytic.entries.report,name:0
 #: field:report.invoice.created,name:0
 msgid "Description"
-msgstr "Descripción"
+msgstr "Descrición"
 
 #. module: account
 #: code:addons/account/account.py:2844
diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po
index fc1edc96b66..81f376dcd82 100644
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-04-23 18:35+0000\n"
+"PO-Revision-Date: 2011-04-27 21:47+0000\n"
 "Last-Translator: Ayhan KIZILTAN <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: 2011-04-24 04:37+0000\n"
+"X-Launchpad-Export-Date: 2011-04-28 04:37+0000\n"
 "X-Generator: Launchpad (build 12758)\n"
 
 #. module: account
@@ -39,8 +39,8 @@ msgid ""
 "You cannot remove/deactivate an account which is set as a property to any "
 "Partner."
 msgstr ""
-"You cannot remove/deactivate an account which is set as a property to any "
-"Partner."
+"Herhangi bir Ortağa bir özellik olarak ayarlanmış bir hesabı "
+"kaldıramaz/durdurmazsınız."
 
 #. module: account
 #: view:account.move.reconcile:0
@@ -50,7 +50,7 @@ msgstr "Yevmiye Kaydını Mutabakatla"
 #. module: account
 #: field:account.installer.modules,account_voucher:0
 msgid "Voucher Management"
-msgstr ""
+msgstr "Fiş Yönetimi"
 
 #. module: account
 #: view:account.account:0
@@ -75,7 +75,7 @@ msgstr "Lütfen fatura dizisi tanımlayınız"
 #. module: account
 #: constraint:account.period:0
 msgid "Error ! The duration of the Period(s) is/are invalid. "
-msgstr "Hata! Dönem bilgisi hatalı "
+msgstr "Hata! Dönem(ler)in süresi geçersiz. "
 
 #. module: account
 #: field:account.analytic.line,currency_id:0
@@ -95,7 +95,7 @@ msgstr "Bugüne kadarki Yaşlandırılmış Alacak"
 #. module: account
 #: field:account.partner.ledger,reconcil:0
 msgid "Include Reconciled Entries"
-msgstr "Mutabakatlı girişler dahil"
+msgstr "Mutabakatlı girişleri içer"
 
 #. module: account
 #: view:account.pl.report:0
@@ -103,7 +103,7 @@ msgid ""
 "The Profit and Loss report gives you an overview of your company profit and "
 "loss in a single document"
 msgstr ""
-"Kar / Zarar raporu, tek sayfada şirketinizin kar ve zarar durumu ile ilgili "
+"Kar ve Zarar raporu, tek sayfada şirketinizin kar ve zarar durumu ile ilgili "
 "bilgi sunar."
 
 #. module: account
@@ -114,7 +114,7 @@ msgstr "Fatura ya da ödemeden içe aktar"
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
 msgid "wizard.multi.charts.accounts"
-msgstr ""
+msgstr "sihirbaz.çoklu.plan.hesaplar"
 
 #. module: account
 #: view:account.move:0
@@ -127,8 +127,8 @@ msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disabled"
 msgstr ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
+"Bir işlemin uzlaşmasını kaldırdığınızda, o işleme bağlı eylemler devre dışı "
+"bırakılmayacağı için o işleme bağlı bütün eylemleri de kontrol etmelisiniz."
 
 #. module: account
 #: report:account.tax.code.entries:0
@@ -139,7 +139,7 @@ msgstr "Muhasebe Girdileri-"
 #: code:addons/account/account.py:1291
 #, python-format
 msgid "You can not delete posted movement: \"%s\"!"
-msgstr "You can not delete posted movement: \"%s\"!"
+msgstr "İşlenmiş hareketleri sizmezsiniz: \"%s\"!"
 
 #. module: account
 #: report:account.invoice:0
@@ -155,7 +155,7 @@ msgstr "Menşei"
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
 msgid "Reconcile"
-msgstr "Reconcile"
+msgstr "Mutabakat"
 
 #. module: account
 #: field:account.bank.statement.line,ref:0
@@ -177,9 +177,7 @@ msgstr "Mali Yılı Seçin "
 msgid ""
 "If the active field is set to False, it will allow you to hide the payment "
 "term without removing it."
-msgstr ""
-"'Aktif' seçeneği işaretli değilse, ödeme bilgilerini silmeden gizlemenize "
-"izin verir."
+msgstr "Aktif seçeneği seçili değilse, Ödeme şartları silmeden gizlenir."
 
 #. module: account
 #: code:addons/account/invoice.py:1421
@@ -196,12 +194,12 @@ msgstr "Hesap Kaynağı"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
 msgid "All Analytic Entries"
-msgstr "Bütün Analiz girişleri"
+msgstr "Bütün Analitik hareketler"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
 msgid "Invoices Created Within Past 15 Days"
-msgstr "Son 15 günde yaratılmış faturalar"
+msgstr "Son 15 Günde Oluşturulmuş Faturalar"
 
 #. module: account
 #: selection:account.account.type,sign:0
@@ -221,9 +219,9 @@ msgid ""
 "invoice) to create analytic entries, OpenERP will look for a matching "
 "journal of the same type."
 msgstr ""
-"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."
+"Analitik yevmiye defterinin tipini belirtir. Bir belge için (ör: fatura) "
+"analitik giriş oluşturmak gerektiğinde OpenERP aynı tipe uyan yevmiye "
+"defteri arayacaktır."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_template_form
@@ -234,7 +232,7 @@ msgstr "Vergi Şablonu"
 #. module: account
 #: model:ir.model,name:account.model_account_tax
 msgid "account.tax"
-msgstr "account.tax"
+msgstr "muhasebe.vergi"
 
 #. module: account
 #: code:addons/account/account.py:901
@@ -249,7 +247,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
-msgstr "Move line reconcile select"
+msgstr "Seçilen mutabakat satırını taşı"
 
 #. module: account
 #: help:account.model.line,sequence:0
@@ -257,8 +255,7 @@ msgid ""
 "The sequence field is used to order the resources from lower sequences to "
 "higher ones"
 msgstr ""
-"The sequence field is used to order the resources from lower sequences to "
-"higher ones"
+"Sıra alanı, kaynakları küçükten büyüğe doğru sıralamak için kullanılır."
 
 #. module: account
 #: help:account.tax.code,notprintable:0
@@ -267,14 +264,14 @@ msgid ""
 "Check this box if you don't want any VAT related to this Tax Code to appear "
 "on invoices"
 msgstr ""
-"Check this box if you don't want any VAT related to this Tax Code to appear "
-"on invoices"
+"Faturalarda bu Vergi Koduyla ilintili KDV görünmesini istemiyorsanız bu "
+"kutuyu işaretleyin."
 
 #. module: account
 #: code:addons/account/invoice.py:1210
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
-msgstr "'%s' faturası parçalı öndendi: (Ödenen %s%s Toplam %s%s Kalan %s%s)"
+msgstr "'%s' nolu fatura kısmen ödendi: (Ödenen %s%s Toplam %s%s Kalan %s%s)"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
@@ -284,7 +281,7 @@ msgstr "Hesap girişleri uzlaşmaya ait girişlerdir."
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
 msgid "Belgian Reports"
-msgstr "Belgian Reports"
+msgstr "Belçika Raporları"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1176
@@ -302,7 +299,7 @@ msgstr "Hesaplanan bakiye"
 #: model:ir.actions.act_window,name:account.action_view_account_use_model
 #: model:ir.ui.menu,name:account.menu_action_manual_recurring
 msgid "Manual Recurring"
-msgstr "Manual Recurring"
+msgstr "El ile Yineleme"
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
@@ -312,7 +309,7 @@ msgstr "Mali Yılı Kapat"
 #. module: account
 #: field:account.automatic.reconcile,allow_write_off:0
 msgid "Allow write off"
-msgstr "Allow write off"
+msgstr "Borcu silmeye izin ver"
 
 #. module: account
 #: view:account.analytic.chart:0
@@ -322,7 +319,7 @@ msgstr "Analiz için dönem seçin"
 #. module: account
 #: view:account.move.line:0
 msgid "St."
-msgstr "St."
+msgstr "Ara Toplam"
 
 #. module: account
 #: code:addons/account/invoice.py:529
@@ -341,8 +338,8 @@ msgid ""
 "Installs localized accounting charts to match as closely as possible the "
 "accounting needs of your company based on your country."
 msgstr ""
-"Installs localized accounting charts to match as closely as possible the "
-"accounting needs of your company based on your country."
+"Ülkenizde kullanılan hesap planına en uygun yerelleştirilmiş hesap planını "
+"kurar."
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:63
@@ -391,16 +388,20 @@ msgid ""
 "OpenERP. Journal items are created by OpenERP if you use Bank Statements, "
 "Cash Registers, or Customer/Supplier payments."
 msgstr ""
+"Bu görünüm, OpenERP de kayıtların toplu olarak girilmesi için muhasebeciler "
+"tarafından kullanılır. Banka Hesap Özetleri, Kasa Kayıtları, veya "
+"Müşteri/Satıcı ödemelerine ait yevmiye girişleri OpenERP tarafından "
+"oluşturulur."
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
 msgid "account.tax.template"
-msgstr "account.tax.template"
+msgstr "muhasebe.vergi.şablonu"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_accounts_wizard
 msgid "account.bank.accounts.wizard"
-msgstr "account.bank.accounts.wizard"
+msgstr "muhasebe.banka.hesap.sihirbazı"
 
 #. module: account
 #: field:account.move.line,date_created:0
@@ -421,7 +422,7 @@ msgstr "Açma/Kapama Durumu"
 #. module: account
 #: help:account.journal,currency:0
 msgid "The currency used to enter statement"
-msgstr "The currency used to enter statement"
+msgstr "hesap özeti girişi için kullanılacak para birimi"
 
 #. module: account
 #: field:account.open.closed.fiscalyear,fyear_id:0
@@ -434,8 +435,8 @@ msgid ""
 "This field contains the informatin related to the numbering of the journal "
 "entries of this journal."
 msgstr ""
-"This field contains the informatin related to the numbering of the journal "
-"entries of this journal."
+"Bu Alan, bu yevmiyenin yevmiye girişleri numaralandırılmasıyla ilintili "
+"bilgi içerir."
 
 #. module: account
 #: field:account.journal,default_debit_account_id:0
@@ -476,9 +477,9 @@ msgid ""
 "it comes to 'Printed' state. When all transactions are done, it comes in "
 "'Done' state."
 msgstr ""
-"When journal period is created. The state is 'Draft'. If a report is printed "
-"it comes to 'Printed' state. When all transactions are done, it comes in "
-"'Done' state."
+"Yevmiye dönemi oluşturulduğunda, durum 'Taslak' tır. Bir rapor "
+"yazdırıldığındadurum 'Yazdırılmış' halini alır. Bütün işlemlemler "
+"tamamalandığında durum 'Tamamlandı' halini alır."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_tax_chart
@@ -488,6 +489,10 @@ msgid ""
 "amount of each area of the tax declaration for your country. It’s presented "
 "in a hierarchical structure, which can be modified to fit your needs."
 msgstr ""
+"Vergi Tablosu, Vergi Durumlarını (veya vergi kodlarını) gösteren bir ağaç "
+"görünümüdür ve geçerli vergi durumunu belirtir. Vergi Tablosu, ülkenize ait "
+"vergi tutarlarını gösterir. Gereksinimlerinize göre uyarlayabileceğiniz bir "
+"sıradüzenli yapıdadır."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -531,12 +536,12 @@ msgstr "Seçili faturaları onayla"
 #. module: account
 #: field:account.addtmpl.wizard,cparent_id:0
 msgid "Parent target"
-msgstr "Hedef Cari"
+msgstr "Ana Hedef"
 
 #. module: account
 #: field:account.bank.statement,account_id:0
 msgid "Account used in this journal"
-msgstr "Cari bu yevmiyede kullanıldı"
+msgstr "Bu yevmiyede kullanılan hesap"
 
 #. module: account
 #: help:account.aged.trial.balance,chart_account_id:0
@@ -575,7 +580,7 @@ msgstr "Li."
 #. module: account
 #: field:account.automatic.reconcile,unreconciled:0
 msgid "Not reconciled transactions"
-msgstr "Hareketler için mutabakat yapılmadı"
+msgstr "Mutabakat yapılmayan hareketler"
 
 #. module: account
 #: code:addons/account/account_cash_statement.py:348
@@ -599,7 +604,7 @@ msgstr "Bir Mali Yılı Kapat"
 #. module: account
 #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
 msgid "The accountant confirms the statement."
-msgstr "The accountant confirms the statement."
+msgstr "Muhasebeci hesap özetini onaylar."
 
 #. module: account
 #: selection:account.balance.report,display_account:0
@@ -1123,6 +1128,10 @@ msgid ""
 "purchase orders or receipts. This way, you can control the invoice from your "
 "supplier according to what you purchased or received."
 msgstr ""
+"Satıcı Faturaları ile satıcılarınızın kestiği faturaları girip "
+"işleyebilirsiniz. OpenERP, satınalma siparişlerinden veya satıanalma "
+"fişlerinden taslak faturalar da oluşturabilir. Bu yolla siz de satıcı "
+"faturalarını satıalınan ve teslim alınan mala göre kontrol edebilirsainiz."
 
 #. module: account
 #: view:account.invoice.cancel:0
@@ -1403,6 +1412,8 @@ msgid ""
 "entry per accounting document: invoice, refund, supplier payment, bank "
 "statements, etc."
 msgstr ""
+"Borç ya da alacak işlemi olmak üzere bir çok yevmiye kalemi içeren Yevmiye "
+"Girişidir. Her hesap belgesi için OpenERP bir tek Yevmiye girişi oluşturur."
 
 #. module: account
 #: view:account.entries.report:0
@@ -1547,6 +1558,11 @@ msgid ""
 "the Payment column of a line, you can press F1 to open the reconciliation "
 "form."
 msgstr ""
+"Banka hesap özeti, belirli bir tarih aralığında, bir mevduat hesabında, "
+"kredi kartı hesabında veya herhangi bir finansal hesapta yapılan mali "
+"işlemlerin özetidir. Açılış bakiyesi otomatik olarak belirir ve özette "
+"kapanış bakiyesi degörülmelidir. Bir satırda Ödeme kolonunda iken F1 basarak "
+"Uzlaşm Formunu açabilirsiniz."
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -1654,6 +1670,9 @@ msgid ""
 "Have a complete tree view of all journal items per account code by clicking "
 "on an account."
 msgstr ""
+"Şirket Hesap Planı, her mali yıl için ve arama süzgeci dönemsel aramaya "
+"ayarlı olarak görünür. Bir hesaba tıklayarak o hesaba ait bütün yevmiye "
+"girişlerinin ağaç görünümü elde edilir."
 
 #. module: account
 #: constraint:account.fiscalyear:0
@@ -1786,7 +1805,7 @@ msgstr "Reserve And Profit/Loss Account"
 #. module: account
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Hesap girişindeki Alacak / Borç değeri hatalı !"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -1834,7 +1853,7 @@ msgstr "Sub Total"
 #. module: account
 #: view:account.account:0
 msgid "Treasury Analysis"
-msgstr ""
+msgstr "Maliye İncelemesi"
 
 #. module: account
 #: constraint:res.company:0
@@ -1953,6 +1972,7 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the tax "
 "without removing it."
 msgstr ""
+"Aktif alan Yanlışa ayarlıysa, vergiyi silmeden gizlemenize izin verir."
 
 #. module: account
 #: help:account.bank.statement,name:0
@@ -2033,6 +2053,8 @@ msgid ""
 "Invalid period ! Some periods overlap or the date period is not in the scope "
 "of the fiscal year. "
 msgstr ""
+"Geçersiz dönem ! Bazı dönemler çakışıyor veya mali yıl tarih dönemini "
+"kapsamıyor. "
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -2046,7 +2068,7 @@ msgstr "Pro-forma"
 #: code:addons/account/installer.py:348
 #, python-format
 msgid " Journal"
-msgstr ""
+msgstr " Yevmiye"
 
 #. module: account
 #: code:addons/account/account.py:1319
@@ -2055,6 +2077,8 @@ msgid ""
 "There is no default default debit account defined \n"
 "on journal \"%s\""
 msgstr ""
+"Yevmiyede \"%s\" \n"
+"Varsayılan borç hesabı tanımlanmamış"
 
 #. module: account
 #: help:account.account,type:0
@@ -2085,6 +2109,9 @@ msgid ""
 "certified Chart of Accounts exists for your specified country, a generic one "
 "can be installed and will be selected by default."
 msgstr ""
+"Varsayılan Hesap planı ülke seçiminize uyuyor. Belirlediğiniz ülke için "
+"onaylı Hesap Planı yoksa, genel bir hesap planı kurulur ve varsayılan "
+"seçilir."
 
 #. module: account
 #: view:account.account.type:0
@@ -2282,6 +2309,10 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration\\Financial Accounting\\Accounts\\Journals."
 msgstr ""
+"Bu firma için %s tipindehesap yevmiyesi bulunamadı\n"
+"\n"
+"Menüde bir tane oluşturabilirsiniz \n"
+"Konfigürason\\Mali Hesap\\Hesaplar\\evmiyeler."
 
 #. module: account
 #: field:account.invoice.tax,base_code_id:0
@@ -2312,6 +2343,11 @@ msgid ""
 "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 ""
+"Bu menü, fatura ve ödemelere göre KDV beyanı yazdırır. Bir ya da birkaç mali "
+"yıl dönemi seçin. Vergi beyanı için gerekli bilgi OpenERP tarafından "
+"faturalardan (veya bazı ülkelerde ödemelerden) otomatik olarak çıkartılır. "
+"Bu bilgi gerçek zamana güncellenir. Bu bilgi, vergiyi ay başlarında ve ay "
+"sonlarında ya da üçer aylık sürelerde izleminiz açısından yararlıdır."
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -2397,7 +2433,7 @@ msgstr ""
 #: view:account.print.journal:0
 msgid ""
 "This report gives you an overview of the situation of a specific journal"
-msgstr ""
+msgstr "Bu rapor, belirli bir yevmiyenin durumuna gözatmanızı sağlar."
 
 #. module: account
 #: constraint:product.category:0
@@ -2724,7 +2760,7 @@ msgstr "Base Code Amount"
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
-msgstr ""
+msgstr "Varsayılan Satış Vergisi"
 
 #. module: account
 #: help:account.model.line,date_maturity:0
@@ -2908,7 +2944,7 @@ msgstr "Görünüm"
 #: code:addons/account/account.py:2951
 #, python-format
 msgid "BNK%s"
-msgstr ""
+msgstr "BNK%s"
 
 #. module: account
 #: code:addons/account/account.py:2906
@@ -3155,7 +3191,7 @@ msgstr "Faturada Yazılamaz"
 #: report:account.vat.declaration:0
 #: field:account.vat.declaration,chart_tax_id:0
 msgid "Chart of Tax"
-msgstr ""
+msgstr "Vergi Tablosu"
 
 #. module: account
 #: view:account.journal:0
@@ -3260,7 +3296,7 @@ msgstr ""
 #. module: account
 #: report:account.general.ledger:0
 msgid "Counterpart"
-msgstr ""
+msgstr "Karşılık"
 
 #. module: account
 #: view:account.journal:0
@@ -3514,7 +3550,7 @@ msgstr "Satıcılar Hesabı"
 #: constraint:account.move:0
 msgid ""
 "You cannot create entries on different periods/journals in the same move"
-msgstr ""
+msgstr "Aynı işlemde farklı dönemlere/yevmiyelere girişler oluşturamazsınız"
 
 #. module: account
 #: model:process.node,name:account.process_node_supplierpaymentorder0
@@ -3542,7 +3578,7 @@ msgstr "Unit Price"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tree1
 msgid "Analytic Items"
-msgstr ""
+msgstr "Çözümsel Kalemler"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1128
@@ -3560,7 +3596,7 @@ msgstr "#Entries"
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
-msgstr ""
+msgstr "ürünle uyumlu olmayan bir Ölçü Birimi seçtiniz."
 
 #. module: account
 #: code:addons/account/invoice.py:473
@@ -3695,6 +3731,7 @@ msgstr "Onayla"
 #: sql_constraint:account.model.line:0
 msgid "Wrong credit or debit value in model (Credit Or Debit Must Be \"0\")!"
 msgstr ""
+"Modelde yanlış alacak veya borç değeri (Alacak veya Borç \"0\" olmalı) !"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_invoice_report_all
@@ -3771,7 +3808,7 @@ msgstr "Analytic Balance"
 #: code:addons/account/report/account_profit_loss.py:124
 #, python-format
 msgid "Net Loss"
-msgstr ""
+msgstr "Net Zarar"
 
 #. module: account
 #: help:account.account,active:0
@@ -3779,6 +3816,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the account "
 "without removing it."
 msgstr ""
+"Aktif alan Yanlış olarak ayarlıysa, hesabı silmeden gizlemenize izin "
+"verecektir."
 
 #. module: account
 #: view:account.tax.template:0
@@ -3975,7 +4014,7 @@ msgstr "Statement %s is confirmed, journal items are created."
 #. module: account
 #: constraint:account.fiscalyear:0
 msgid "Error! The duration of the Fiscal Year is invalid. "
-msgstr ""
+msgstr "Hata! Mali Yıl süresi geçersiz. "
 
 #. module: account
 #: field:report.aged.receivable,name:0
@@ -3990,7 +4029,7 @@ msgstr "Check if you want to display Accounts with 0 balance too."
 #. module: account
 #: view:account.tax:0
 msgid "Compute Code"
-msgstr ""
+msgstr "Kodu Hesapla"
 
 #. module: account
 #: view:account.account.template:0
@@ -4096,7 +4135,7 @@ msgstr "Account Journal Select"
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
-msgstr ""
+msgstr "Faturayı Yazdır"
 
 #. module: account
 #: view:account.tax.template:0
@@ -4146,6 +4185,8 @@ msgid ""
 "This will automatically configure your chart of accounts, bank accounts, "
 "taxes and journals according to the selected template"
 msgstr ""
+"Bu Hesap Planınızı, banka hesaplarınızı, vergilerinizi ve yevmiyeleri "
+"seçilen şablona uygun olarak otomatikmen yapılandıracaktır."
 
 #. module: account
 #: field:account.tax,price_include:0
@@ -4229,7 +4270,7 @@ msgstr "Closing balance based on cashBox"
 #: constraint:account.account:0
 #: constraint:account.tax.code:0
 msgid "Error ! You can not create recursive accounts."
-msgstr ""
+msgstr "Hata! Yinelen hesap oluşturamazsınız."
 
 #. module: account
 #: constraint:account.account:0
@@ -4248,7 +4289,7 @@ msgstr "Generate Entries"
 #. module: account
 #: help:account.vat.declaration,chart_tax_id:0
 msgid "Select Charts of Taxes"
-msgstr ""
+msgstr "Vergi Tablosu seçin"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -9874,12 +9915,12 @@ msgstr "Maturity"
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
 msgid "Future"
-msgstr "Future"
+msgstr "İleri Tarihli İşlemler"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Search Journal Items"
-msgstr "Search Journal Items"
+msgstr "Yevmiye Maddelerini Araştır"
 
 #. module: account
 #: help:account.tax,base_sign:0
@@ -9891,7 +9932,7 @@ msgstr "Search Journal Items"
 #: help:account.tax.template,ref_tax_sign:0
 #: help:account.tax.template,tax_sign:0
 msgid "Usually 1 or -1."
-msgstr "Usually 1 or -1."
+msgstr "Genelde 1 veya -1"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
diff --git a/addons/decimal_precision/i18n/tr.po b/addons/decimal_precision/i18n/tr.po
new file mode 100644
index 00000000000..90ef12bed7f
--- /dev/null
+++ b/addons/decimal_precision/i18n/tr.po
@@ -0,0 +1,71 @@
+# Turkish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-04-27 17:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish <tr@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: 2011-04-28 04:37+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: decimal_precision
+#: field:decimal.precision,digits:0
+msgid "Digits"
+msgstr "Basamaklar"
+
+#. module: decimal_precision
+#: view:decimal.precision:0
+msgid "Decimal Precision"
+msgstr "Ondalık Hassasiyet"
+
+#. module: decimal_precision
+#: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form
+#: model:ir.ui.menu,name:decimal_precision.menu_decimal_precision_form
+msgid "Decimal Accuracy Definitions"
+msgstr "Ondalık Hassasiyet Tanımları"
+
+#. module: decimal_precision
+#: model:ir.module.module,description:decimal_precision.module_meta_information
+msgid ""
+"\n"
+"This module allows to configure the price accuracy you need for different "
+"kind\n"
+"of usage: accounting, sales, purchases, ...\n"
+"\n"
+"The decimal precision is configured per company.\n"
+msgstr ""
+"\n"
+"Bu modül farklı kullanım yerlerinde fiyat hassasiyetlerini yönetmenize "
+"olanak verir.\n"
+"mesela: muhasebe, satış, satınalma, ...\n"
+"\n"
+"Ondalık hassasiyet şirket bazlı olarak ayarlanır.\n"
+
+#. module: decimal_precision
+#: field:decimal.precision,name:0
+msgid "Usage"
+msgstr "Kullanım"
+
+#. module: decimal_precision
+#: sql_constraint:decimal.precision:0
+msgid "Only one value can be defined for each given usage!"
+msgstr "Her kullanım için sadece bir değer tanımlanabilir !"
+
+#. module: decimal_precision
+#: model:ir.module.module,shortdesc:decimal_precision.module_meta_information
+msgid "Decimal Precision Configuration"
+msgstr "Ondalık Hassasiyet Ayarları"
+
+#. module: decimal_precision
+#: model:ir.model,name:decimal_precision.model_decimal_precision
+msgid "decimal.precision"
+msgstr "Ondalık.hassasiyet"
diff --git a/addons/web_uservoice/i18n/tr.po b/addons/web_uservoice/i18n/tr.po
new file mode 100644
index 00000000000..3b21df4ae98
--- /dev/null
+++ b/addons/web_uservoice/i18n/tr.po
@@ -0,0 +1,29 @@
+# Turkish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-12 16:15+0000\n"
+"PO-Revision-Date: 2011-04-27 14:05+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish <tr@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: 2011-04-28 04:37+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: web_uservoice
+#: model:ir.module.module,shortdesc:web_uservoice.module_meta_information
+msgid "Add uservoice button in header"
+msgstr "Başlığa Uservoice tuşu ekle"
+
+#. module: web_uservoice
+#: code:addons/web_uservoice/web/editors.py:72
+#, python-format
+msgid "feedback"
+msgstr "geri bildirim"

From 7f84fb5857c75558e7222050fd30ad9826beec8c Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Thu, 28 Apr 2011 12:23:00 +0530
Subject: [PATCH 183/188] [IMP] hr_evaluation: *removed compose wizard from the
 menu *added wizard in Inteview Requests form

bzr revid: rha@tinyerp.com-20110428065300-bq90bkpdvjql9hxt
---
 addons/hr_evaluation/hr_evaluation_view.xml | 32 +++++++++++----------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index f39fb138551..c06138db871 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -306,6 +306,10 @@
                         <field name="response" readonly="1"/>
                         <field name="user_to_review_id"/>
                         <field name="user_id" string="Interviewer"/>
+                        <button string="Send Reminder Email"
+                        name="%(mail.action_email_compose_message_wizard)d"
+                        icon="terp-mail-message-new" type="action" colspan="2"
+                        states="waiting_answer"/>
                     </group>
                     <newline/>
                     <separator string="State" colspan="4"/>
@@ -329,6 +333,7 @@
                     <field name="response" readonly="1" invisible="True"/>
                     <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response, 'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
                     <button name="%(survey.survey_browse_response)d" string="Print Interview" type="action" states="done" icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0}" attrs="{'readonly':[('response','=',False)]}" />
+                    <button name="%(mail.action_email_compose_message_wizard)d" string="Send Reminder Email" icon="terp-mail-message-new" type="action" colspan="2" states="waiting_answer"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -401,23 +406,20 @@
             <field name="act_window_id" ref="action_hr_evaluation_interview_tree"/>
         </record>
 
-
-        <!-- Email Compose message Action-->
-        <record id="action_email_compose_message_menu_wizard" model="ir.actions.act_window">
-            <field name="name">Send E-mail</field>
-            <field name="res_model">email.compose.message</field>
-            <field name="src_model">email.compose.message</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="context">{'email_model':'hr.evaluation.interview'}</field>
-            <field name="target">new</field>
-        </record>
-
         <menuitem name="Interview Requests" parent="menu_eval_hr" id="menu_open_hr_evaluation_interview_requests"
             action="action_hr_evaluation_interview_tree"/>
-        <menuitem name="Evaluation Reminders" parent="menu_eval_hr" id="menu_eval_send_mail"
-           action="action_email_compose_message_menu_wizard" sequence="45" groups="base.group_hr_manager"/>
+
+      <!-- Email Compose message Action-->
+      <act_window
+      id="evaluation_reminders"
+      multi="True"
+      key2="client_action_multi"
+      name="Evaluation Reminders"
+      res_model="email.compose.message"
+      src_model="hr.evaluation.interview"
+      view_type="form"
+      view_mode="form"
+      target="new"/>
 
       <!-- Evaluation Interviews Button on Employee Form -->
       <act_window

From 1ac3e387b2727ea0656e74a0e52f83bd0cc2611d Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Thu, 28 Apr 2011 12:59:13 +0530
Subject: [PATCH 184/188] [FIX] hr_evaluation: act_window

bzr revid: rha@tinyerp.com-20110428072913-jvc9eckai7g82wm2
---
 addons/hr_evaluation/hr_evaluation_view.xml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index c06138db871..77cf5abe090 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -411,15 +411,13 @@
 
       <!-- Email Compose message Action-->
       <act_window
-      id="evaluation_reminders"
-      multi="True"
-      key2="client_action_multi"
-      name="Evaluation Reminders"
+      id="evaluation_reminders" name="Evaluation Reminders"
       res_model="email.compose.message"
       src_model="hr.evaluation.interview"
-      view_type="form"
-      view_mode="form"
-      target="new"/>
+      view_type="form" view_mode="form"
+      target="new" multi="True"
+      key2="client_action_multi"
+      context="{'mass_mail':True}"/>
 
       <!-- Evaluation Interviews Button on Employee Form -->
       <act_window

From 8ac91b833666ad30152452979eed52faa7ae4b86 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Thu, 28 Apr 2011 14:21:07 +0530
Subject: [PATCH 185/188] [FIX] email_template: fix model in save_as_template()

bzr revid: rha@tinyerp.com-20110428085107-vv2l6ue1vzf2pdfk
---
 addons/email_template/wizard/email_compose_message.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/email_template/wizard/email_compose_message.py b/addons/email_template/wizard/email_compose_message.py
index a1f6d6245df..9dbb940d3da 100644
--- a/addons/email_template/wizard/email_compose_message.py
+++ b/addons/email_template/wizard/email_compose_message.py
@@ -88,7 +88,8 @@ class email_compose_message(osv.osv_memory):
         template_pool = self.pool.get('email.template')
         model_pool = self.pool.get('ir.model')
         for record in self.browse(cr, uid, ids, context=context):
-            model = model_pool.search(cr, uid, [('model','=', record.model)])[0]
+            model = context.get('active_model', record.model or False)
+            model = model_pool.search(cr, uid, [('model','=', model)])[0]
             model_name = model_pool.browse(cr, uid, model, context=context).name
             values = {
                 'name': model_name,

From ec101f8ec39fe31c8beb977654802db6f425afac Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Thu, 28 Apr 2011 14:50:03 +0530
Subject: [PATCH 186/188] [IMP]: partner mass mailing

bzr revid: rha@tinyerp.com-20110428092003-v9xbe2qn0bbu7nu3
---
 addons/mail/wizard/email_compose_message_view.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/addons/mail/wizard/email_compose_message_view.xml b/addons/mail/wizard/email_compose_message_view.xml
index fab0bfdd43e..dd89d0267ff 100644
--- a/addons/mail/wizard/email_compose_message_view.xml
+++ b/addons/mail/wizard/email_compose_message_view.xml
@@ -49,5 +49,13 @@
             <field name="target">new</field>
         </record>
 
+	<act_window name="Mass Mailing"
+            res_model="email.compose.message"
+            src_model="res.partner"
+            view_mode="form"
+            target="new"
+            key2="client_action_multi"
+            id="base.action_partner_mass_mail"
+            context="{'mass_mail':True}"/>
 	</data>
 </openerp>

From 3ec3fdc5b7b7e89b6f345f0aefc98e55031d3a0b Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 28 Apr 2011 15:42:50 +0530
Subject: [PATCH 187/188] [FIX] crm_partner_assign: fixed regression

bzr revid: hmo@tinyerp.com-20110428101250-l9au5ucweq4mkw8n
---
 .../wizard/crm_forward_to_partner_view.xml        | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
index 002ebf4dfec..d3ecddb1aa3 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
@@ -46,25 +46,12 @@
                     <group col="4" colspan="4">
                         <label string="" colspan="1"/>
                         <button icon="gtk-close" special="cancel" string="Close"/>
-                        <button icon="gtk-ok" name="send_mail" string="Send now" type="object"/>
+                        <button icon="gtk-ok" name="send_mail" string="Send" type="object"/>
                     </group>
                 </form>
             </field>
         </record>
 
-
-        <record model="ir.ui.view" id="crm_lead_forward_to_partner_form1">
-            <field name="name">crm_lead_forward_to_partner1</field>
-            <field name="model">crm.lead.forward.to.partner</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="crm.crm_send_new_mail_view"/>
-            <field name="arch" type="xml">
-                <button name="action_send" position="replace">
-                    <button name="action_forward" string="Forward" icon="gtk-go-forward" type="object" />
-                </button>
-            </field>
-        </record>
-
         <record model="ir.actions.act_window" id="crm_lead_forward_to_partner_act">
             <field name="name">Forward to Partner</field>
             <field name="res_model">crm.lead.forward.to.partner</field>

From 6b38a3a097023fce6ef017001296acb568040cbb Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Thu, 28 Apr 2011 15:45:28 +0530
Subject: [PATCH 188/188] [FIX] outlook: removed encodeing for the attachment
 content

bzr revid: rha@tinyerp.com-20110428101528-pljylyati4kq3xls
---
 addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
index 90aa90fd09e..4bafe893704 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
@@ -336,9 +336,8 @@ class XMLRpcConn(object):
                 att_path = os.path.join(att_folder_path,fn)
                 attachments[i].SaveAsFile(att_path)
                 f=open(att_path,"rb")
-                content = "".join(f.readlines()).encode('base64')
+                content = "".join(f.readlines())
                 f.close()
-                content = content.decode('base64')
                 attachment[fn] = content
         return attachment