From e111336ba6d809ece05bb9c08e1085e2283a70c0 Mon Sep 17 00:00:00 2001
From: Christophe Chauvet <christophe.chauvet@syleam.fr>
Date: Mon, 7 Dec 2009 11:56:45 +0100
Subject: [PATCH 01/68] [IMP] Check if the config file exists (only if -c used,
 and not -s argument in the same time)

bzr revid: christophe.chauvet@syleam.fr-20091207105645-9m8qclwrzfbo5cbh
---
 bin/tools/config.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bin/tools/config.py b/bin/tools/config.py
index 2dd6b1131bf..4c6de0bba3c 100644
--- a/bin/tools/config.py
+++ b/bin/tools/config.py
@@ -202,6 +202,10 @@ class configmanager(object):
         die(opt.translate_out and (not opt.db_name),
             "the i18n-export option cannot be used without the database (-d) option")
 
+        # Check if the config file exists (only if -c used, and not -s argument)
+        die(not opt.save and opt.config and not os.path.exists(opt.config),
+            "The config file define with (-c) doesn't exists, use (-s) if you want to create it")
+
         # place/search the config file on Win32 near the server installation
         # (../etc from the server)
         # if the server is run by an unprivileged user, he has to specify location of a config file where he has the rights to write,

From f41e52413326d19db5c7f263b860229f08166913 Mon Sep 17 00:00:00 2001
From: "Cristian Salamea (GnuThink)" <>
Date: Sun, 13 Dec 2009 16:16:01 -0200
Subject: [PATCH 02/68] [REF] get rid of the mx.Datetime C dependency, meaning
 better portability, especially to alternative Python interpreters, better
 maintainability; implements this blueprint:
 https://blueprints.launchpad.net/openobject-server/+spec/get-rid-of-mx-datetime-dependency;
 largely the work of Cristian Salamea (GnuThink)

bzr revid: rvalyi@gmail.com-20091213181601-4k4mhtgnv2qynrjo
---
 bin/addons/base/ir/ir_cron.py       | 19 ++++++++++---------
 bin/addons/base/res/res_currency.py |  3 ---
 bin/openerp-server.py               |  4 ----
 bin/report/printscreen/ps_list.py   |  8 ++++----
 bin/report/report_sxw.py            | 10 +++++-----
 bin/tools/convert.py                |  4 ++--
 bin/tools/translate.py              |  5 +++--
 setup.py                            |  2 +-
 8 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/bin/addons/base/ir/ir_cron.py b/bin/addons/base/ir/ir_cron.py
index 3966a816f4f..c30abbfffe9 100644
--- a/bin/addons/base/ir/ir_cron.py
+++ b/bin/addons/base/ir/ir_cron.py
@@ -20,8 +20,9 @@
 #
 ##############################################################################
 
-from mx import DateTime
 import time
+import datetime
+from dateutil.relativedelta import *
 import netsvc
 import tools
 import pooler
@@ -31,12 +32,12 @@ def str2tuple(s):
     return eval('tuple(%s)' % (s or ''))
 
 _intervalTypes = {
-    'work_days': lambda interval: DateTime.RelativeDateTime(days=interval),
-    'days': lambda interval: DateTime.RelativeDateTime(days=interval),
-    'hours': lambda interval: DateTime.RelativeDateTime(hours=interval),
-    'weeks': lambda interval: DateTime.RelativeDateTime(days=7*interval),
-    'months': lambda interval: DateTime.RelativeDateTime(months=interval),
-    'minutes': lambda interval: DateTime.RelativeDateTime(minutes=interval),
+    'work_days': lambda interval: relativedelta(days=interval),
+    'days': lambda interval: relativedelta(days=interval),
+    'hours': lambda interval: relativedelta(hours=interval),
+    'weeks': lambda interval: relativedelta(days=7*interval),
+    'months': lambda interval: relativedelta(months=interval),
+    'minutes': lambda interval: relativedelta(minutes=interval),
 }
 
 class ir_cron(osv.osv, netsvc.Agent):
@@ -100,10 +101,10 @@ class ir_cron(osv.osv, netsvc.Agent):
         cr = db.cursor()
         try:
             if not pool._init:
-                now = DateTime.now()
+                now = datetime.datetime.now()
                 cr.execute('select * from ir_cron where numbercall<>0 and active and nextcall<=now() order by priority')
                 for job in cr.dictfetchall():
-                    nextcall = DateTime.strptime(job['nextcall'], '%Y-%m-%d %H:%M:%S')
+                    nextcall = datetime.datetime.strptime(job['nextcall'], '%Y-%m-%d %H:%M:%S')
                     numbercall = job['numbercall']
                 
                     ok = False
diff --git a/bin/addons/base/res/res_currency.py b/bin/addons/base/res/res_currency.py
index 0cd80c141c6..f15566f9075 100644
--- a/bin/addons/base/res/res_currency.py
+++ b/bin/addons/base/res/res_currency.py
@@ -26,9 +26,6 @@ import ir
 from tools.misc import currency
 from tools.translate import _
 
-import mx.DateTime
-from mx.DateTime import RelativeDateTime, now, DateTime, localtime
-
 class res_currency(osv.osv):
     def _current_rate(self, cr, uid, ids, name, arg, context={}):
         res={}
diff --git a/bin/openerp-server.py b/bin/openerp-server.py
index 33b5fef9aeb..f4f8e1e2371 100755
--- a/bin/openerp-server.py
+++ b/bin/openerp-server.py
@@ -79,10 +79,6 @@ for name, value in [('addons_path', tools.config['addons_path']),
 
 import time
 
-if sys.platform == 'win32':
-    import mx.DateTime
-    mx.DateTime.strptime = lambda x, y: mx.DateTime.mktime(time.strptime(x, y))
-
 #----------------------------------------------------------
 # init net service
 #----------------------------------------------------------
diff --git a/bin/report/printscreen/ps_list.py b/bin/report/printscreen/ps_list.py
index 2d3ee002633..1496077a2c5 100644
--- a/bin/report/printscreen/ps_list.py
+++ b/bin/report/printscreen/ps_list.py
@@ -29,7 +29,7 @@ import libxslt
 import locale
 
 import time, os
-import mx.DateTime
+import datetime
 
 class report_printscreen_list(report_int):
     def __init__(self, name):
@@ -178,19 +178,19 @@ class report_printscreen_list(report_int):
 
                 if fields[f]['type'] == 'date' and line[f]:
                     format = str(locale.nl_langinfo(locale.D_FMT).replace('%y', '%Y'))
-                    d1= mx.DateTime.strptime(line[f],'%Y-%m-%d')
+                    d1 = datetime.datetime.strptime(line[f],'%y-%m-%d')
                     new_d1 = d1.strftime(format)
                     line[f] = new_d1
                     
                 if fields[f]['type'] == 'time' and line[f]:
                     format = str(locale.nl_langinfo(locale.T_FMT))
-                    d1= mx.DateTime.strptime(line[f],'%H:%M:%S')
+                    d1 = datetime.datetime.strptime(line[f], '%H:%M:%S')
                     new_d1 = d1.strftime(format)
                     line[f] = new_d1
                     
                 if fields[f]['type'] == 'datetime' and line[f]:
                     format = str(locale.nl_langinfo(locale.D_FMT).replace('%y', '%Y'))+' '+str(locale.nl_langinfo(locale.T_FMT))
-                    d1= mx.DateTime.strptime(line[f],'%Y-%m-%d %H:%M:%S')
+                    d1 = datetime.datetime.strptime(line[f], '%Y-%m-%d %H:%M:%S')
                     new_d1 = d1.strftime(format)
                     line[f] = new_d1
                     
diff --git a/bin/report/report_sxw.py b/bin/report/report_sxw.py
index f1df81e60bc..987ec9c4b58 100644
--- a/bin/report/report_sxw.py
+++ b/bin/report/report_sxw.py
@@ -25,7 +25,7 @@ import cStringIO
 import base64
 import copy
 import locale
-import mx.DateTime
+import datetime
 import os
 import re
 import time
@@ -109,7 +109,7 @@ class _date_format(str, _format):
     def __str__(self):
         if self.val:
             if hasattr(self,'name') and (self.name):
-                date = mx.DateTime.strptime(self.name,DT_FORMAT)
+                date = datetime.datetime.strptime(self.name, DT_FORMAT)
                 return date.strftime(self.lang_obj.date_format)
         return self.val
 
@@ -121,7 +121,7 @@ class _dttime_format(str, _format):
     def __str__(self):
         if self.val:
             if hasattr(self,'name') and self.name:
-                datetime = mx.DateTime.strptime(self.name,DHM_FORMAT)
+                datetime = datetime.strptime(self.name, DHM_FORMAT)
                 return datetime.strftime(self.lang_obj.date_format+ " " + self.lang_obj.time_format)
         return self.val
 
@@ -262,11 +262,11 @@ class rml_parse(object):
 
             if not isinstance(value, time.struct_time):
                 try:
-                    date = mx.DateTime.strptime(str(value),parse_format)
+                    date = datetime.datetime(str(value), parse_format)
                 except:# sometimes it takes converted values into value, so we dont need conversion.
                     return str(value)
             else:
-                date = mx.DateTime.DateTime(*(value.timetuple()[:6]))
+                date = datetime.datetime(*value.timetuple()[:6])
             return date.strftime(date_format)
         return self.lang_dict['lang_obj'].format('%.' + str(digits) + 'f', value, grouping=grouping, monetary=monetary)
 
diff --git a/bin/tools/convert.py b/bin/tools/convert.py
index 36eb1751c93..73b4d453b76 100644
--- a/bin/tools/convert.py
+++ b/bin/tools/convert.py
@@ -87,10 +87,10 @@ def _eval_xml(self,node, pool, cr, uid, idref, context=None):
             a_eval = node.get('eval','')
             if len(a_eval):
                 import time
-                from mx import DateTime
+                import datetime
                 idref2 = idref.copy()
                 idref2['time'] = time
-                idref2['DateTime'] = DateTime
+                idref2['DateTime'] = datetime
                 import release
                 idref2['version'] = release.major_version
                 idref2['ref'] = lambda x: self.id_get(cr, False, x)
diff --git a/bin/tools/translate.py b/bin/tools/translate.py
index 83e90325e70..2b1c7a81946 100644
--- a/bin/tools/translate.py
+++ b/bin/tools/translate.py
@@ -20,6 +20,8 @@
 ##############################################################################
 
 import os
+import datetime
+
 from os.path import join
 import fnmatch
 import csv, re
@@ -29,7 +31,6 @@ import ir
 import netsvc
 from tools.misc import UpdateableStr
 import inspect
-import mx.DateTime as mxdt
 import tempfile
 import tarfile
 import codecs
@@ -279,7 +280,7 @@ class TinyPoFile(object):
                               'version': release.version,
                               'modules': reduce(lambda s, m: s + "#\t* %s\n" % m, modules, ""),
                               'bugmail': release.support_email,
-                              'now': mxdt.ISO.strUTC(mxdt.ISO.DateTime.utc()),
+                              'now': datetime.datetime.now().isoformat(' '),
                             }
                           )
 
diff --git a/setup.py b/setup.py
index 1c088b3f8f2..ef8eb4bd72b 100755
--- a/setup.py
+++ b/setup.py
@@ -184,7 +184,7 @@ options = {
         "dist_dir": 'dist',
         "packages": ["lxml", "lxml.builder", "lxml._elementpath", "lxml.etree",
                      "lxml.objectify", "decimal", "xml", "xml.dom", "xml.xpath",
-                     "encodings","mx.DateTime","wizard","pychart","PIL", "pyparsing",
+                     "encodings","wizard","pychart","PIL", "pyparsing",
                      "pydot","asyncore","asynchat", "reportlab", "vobject",
                      "HTMLParser", "select"],
         "excludes" : ["Tkconstants","Tkinter","tcl"],

From 15b965fb6f19abed1edebdf07a59c2efa0ac2fbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= <rvalyi@gmail.com>
Date: Mon, 14 Dec 2009 01:10:18 -0200
Subject: [PATCH 03/68] [FIX] correct datetime replacement for
 mxdt.ISO.strUTC(mxdt.ISO.DateTime.utc())

bzr revid: rvalyi@gmail.com-20091214031018-xxl8l8r9s02jvxva
---
 bin/tools/translate.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/tools/translate.py b/bin/tools/translate.py
index 2b1c7a81946..99218a91f70 100644
--- a/bin/tools/translate.py
+++ b/bin/tools/translate.py
@@ -280,7 +280,7 @@ class TinyPoFile(object):
                               'version': release.version,
                               'modules': reduce(lambda s, m: s + "#\t* %s\n" % m, modules, ""),
                               'bugmail': release.support_email,
-                              'now': datetime.datetime.now().isoformat(' '),
+                              'now': datetime.datetime.now().isoformat(' ')[0:-7] + '+0000',
                             }
                           )
 

From 6e2d1e6b710ec3f518f21310e8cb69ff8745e6b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= <rvalyi@gmail.com>
Date: Mon, 14 Dec 2009 10:23:55 -0200
Subject: [PATCH 04/68] [REF] avoid import *

bzr revid: rvalyi@gmail.com-20091214122355-eta5tkktvouxiv6i
---
 bin/addons/base/ir/ir_cron.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/ir/ir_cron.py b/bin/addons/base/ir/ir_cron.py
index c30abbfffe9..f841bdbb759 100644
--- a/bin/addons/base/ir/ir_cron.py
+++ b/bin/addons/base/ir/ir_cron.py
@@ -22,7 +22,7 @@
 
 import time
 import datetime
-from dateutil.relativedelta import *
+from dateutil.relativedelta import relativedelta
 import netsvc
 import tools
 import pooler

From 1cbec3a6429f49189ec25ef6dcef9407a16cba5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= <rvalyi@gmail.com>
Date: Mon, 14 Dec 2009 13:21:04 -0200
Subject: [PATCH 05/68] [REF] changed coding style from datetime.datime.foo to
 datetime.foo, changing the import accordingly

bzr revid: rvalyi@gmail.com-20091214152104-evcck2uv66bbulnf
---
 bin/addons/base/ir/ir_cron.py     | 6 +++---
 bin/report/printscreen/ps_list.py | 8 ++++----
 bin/report/report_sxw.py          | 6 +++---
 bin/tools/convert.py              | 2 +-
 bin/tools/translate.py            | 4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/bin/addons/base/ir/ir_cron.py b/bin/addons/base/ir/ir_cron.py
index f841bdbb759..dcf76945904 100644
--- a/bin/addons/base/ir/ir_cron.py
+++ b/bin/addons/base/ir/ir_cron.py
@@ -21,7 +21,7 @@
 ##############################################################################
 
 import time
-import datetime
+from datetime import datetime
 from dateutil.relativedelta import relativedelta
 import netsvc
 import tools
@@ -101,10 +101,10 @@ class ir_cron(osv.osv, netsvc.Agent):
         cr = db.cursor()
         try:
             if not pool._init:
-                now = datetime.datetime.now()
+                now = datetime.now()
                 cr.execute('select * from ir_cron where numbercall<>0 and active and nextcall<=now() order by priority')
                 for job in cr.dictfetchall():
-                    nextcall = datetime.datetime.strptime(job['nextcall'], '%Y-%m-%d %H:%M:%S')
+                    nextcall = datetime.strptime(job['nextcall'], '%Y-%m-%d %H:%M:%S')
                     numbercall = job['numbercall']
                 
                     ok = False
diff --git a/bin/report/printscreen/ps_list.py b/bin/report/printscreen/ps_list.py
index 1496077a2c5..a131848cfac 100644
--- a/bin/report/printscreen/ps_list.py
+++ b/bin/report/printscreen/ps_list.py
@@ -29,7 +29,7 @@ import libxslt
 import locale
 
 import time, os
-import datetime
+from datetime import datetime
 
 class report_printscreen_list(report_int):
     def __init__(self, name):
@@ -178,19 +178,19 @@ class report_printscreen_list(report_int):
 
                 if fields[f]['type'] == 'date' and line[f]:
                     format = str(locale.nl_langinfo(locale.D_FMT).replace('%y', '%Y'))
-                    d1 = datetime.datetime.strptime(line[f],'%y-%m-%d')
+                    d1 = datetime.strptime(line[f],'%y-%m-%d')
                     new_d1 = d1.strftime(format)
                     line[f] = new_d1
                     
                 if fields[f]['type'] == 'time' and line[f]:
                     format = str(locale.nl_langinfo(locale.T_FMT))
-                    d1 = datetime.datetime.strptime(line[f], '%H:%M:%S')
+                    d1 = datetime.strptime(line[f], '%H:%M:%S')
                     new_d1 = d1.strftime(format)
                     line[f] = new_d1
                     
                 if fields[f]['type'] == 'datetime' and line[f]:
                     format = str(locale.nl_langinfo(locale.D_FMT).replace('%y', '%Y'))+' '+str(locale.nl_langinfo(locale.T_FMT))
-                    d1 = datetime.datetime.strptime(line[f], '%Y-%m-%d %H:%M:%S')
+                    d1 = datetime.strptime(line[f], '%Y-%m-%d %H:%M:%S')
                     new_d1 = d1.strftime(format)
                     line[f] = new_d1
                     
diff --git a/bin/report/report_sxw.py b/bin/report/report_sxw.py
index 987ec9c4b58..fafbf4a9172 100644
--- a/bin/report/report_sxw.py
+++ b/bin/report/report_sxw.py
@@ -25,7 +25,7 @@ import cStringIO
 import base64
 import copy
 import locale
-import datetime
+from datetime import datetime
 import os
 import re
 import time
@@ -109,7 +109,7 @@ class _date_format(str, _format):
     def __str__(self):
         if self.val:
             if hasattr(self,'name') and (self.name):
-                date = datetime.datetime.strptime(self.name, DT_FORMAT)
+                date = datetime.strptime(self.name, DT_FORMAT)
                 return date.strftime(self.lang_obj.date_format)
         return self.val
 
@@ -266,7 +266,7 @@ class rml_parse(object):
                 except:# sometimes it takes converted values into value, so we dont need conversion.
                     return str(value)
             else:
-                date = datetime.datetime(*value.timetuple()[:6])
+                date = datetime(*value.timetuple()[:6])
             return date.strftime(date_format)
         return self.lang_dict['lang_obj'].format('%.' + str(digits) + 'f', value, grouping=grouping, monetary=monetary)
 
diff --git a/bin/tools/convert.py b/bin/tools/convert.py
index 73b4d453b76..b6ed68f2f11 100644
--- a/bin/tools/convert.py
+++ b/bin/tools/convert.py
@@ -87,7 +87,7 @@ def _eval_xml(self,node, pool, cr, uid, idref, context=None):
             a_eval = node.get('eval','')
             if len(a_eval):
                 import time
-                import datetime
+                from datetime import datetime
                 idref2 = idref.copy()
                 idref2['time'] = time
                 idref2['DateTime'] = datetime
diff --git a/bin/tools/translate.py b/bin/tools/translate.py
index 99218a91f70..c4dc1bb0617 100644
--- a/bin/tools/translate.py
+++ b/bin/tools/translate.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 import os
-import datetime
+from datetime import datetime
 
 from os.path import join
 import fnmatch
@@ -280,7 +280,7 @@ class TinyPoFile(object):
                               'version': release.version,
                               'modules': reduce(lambda s, m: s + "#\t* %s\n" % m, modules, ""),
                               'bugmail': release.support_email,
-                              'now': datetime.datetime.now().isoformat(' ')[0:-7] + '+0000',
+                              'now': datetime.now().isoformat(' ')[0:-7] + '+0000',
                             }
                           )
 

From d9fbe66f337167bd30ef454b5d6499813cd8d6a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= <rvalyi@gmail.com>
Date: Mon, 14 Dec 2009 13:21:52 -0200
Subject: [PATCH 06/68] [FIX] added datutil pure Python lib dependency

bzr revid: rvalyi@gmail.com-20091214152152-3mfngzhagcpl47u6
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index ef8eb4bd72b..3d9bbd8154d 100755
--- a/setup.py
+++ b/setup.py
@@ -184,7 +184,7 @@ options = {
         "dist_dir": 'dist',
         "packages": ["lxml", "lxml.builder", "lxml._elementpath", "lxml.etree",
                      "lxml.objectify", "decimal", "xml", "xml.dom", "xml.xpath",
-                     "encodings","wizard","pychart","PIL", "pyparsing",
+                     "encodings","dateutil","wizard","pychart","PIL", "pyparsing",
                      "pydot","asyncore","asynchat", "reportlab", "vobject",
                      "HTMLParser", "select"],
         "excludes" : ["Tkconstants","Tkinter","tcl"],

From b53e15b5768674bbd4f0b16c62d1f8ac2153c7ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= <rvalyi@gmail.com>
Date: Fri, 25 Dec 2009 16:03:29 -0200
Subject: [PATCH 07/68] [FIX] translate; Launchpad export: time is now UTC and
 we use a clean strftime rather than a hacky split/concat, output is exactly
 the same as mx.Datetime

bzr revid: rvalyi@gmail.com-20091225180329-a22s8o5lr5qw4qr2
---
 bin/tools/translate.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/tools/translate.py b/bin/tools/translate.py
index 3d5bd754f1a..b62dc61f1c6 100644
--- a/bin/tools/translate.py
+++ b/bin/tools/translate.py
@@ -21,6 +21,7 @@
 
 import os
 from datetime import datetime
+from dateutil.tz import tzutc
 
 from os.path import join
 import fnmatch
@@ -280,7 +281,7 @@ class TinyPoFile(object):
                               'version': release.version,
                               'modules': reduce(lambda s, m: s + "#\t* %s\n" % m, modules, ""),
                               'bugmail': release.support_email,
-                              'now': datetime.now().isoformat(' ')[0:-7] + '+0000',
+                              'now': datetime.now(tzutc()).strftime('%Y-%m-%d %H:%M:%S%z'),
                             }
                           )
 

From b86c913db882273670a396c3b4dc4cfe5f4a5202 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Mon, 1 Feb 2010 14:39:42 +0530
Subject: [PATCH 08/68] [IMP] crm: Changed Convert to Opportunity functionality
 if state is not Open.

bzr revid: uco@tinyerp.co.in-20100201090942-fgoujb6j97vxy0if
---
 addons/crm/crm_opportunity_view.xml         |  5 +++--
 addons/crm/wizard/crm_lead_wizard.py        | 12 +++++++++++-
 addons/crm/wizard/crm_opportunity_wizard.py |  4 ++++
 addons/crm/wizard/crm_phonecall_wizard.py   | 11 ++++++++++-
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index a19eb2f3587..526accf3732 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -52,9 +52,10 @@
                         <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
                         </group>
                     <field name="date" />
-                    <field name="date_deadline"/>                    
+                    <field name="date_deadline"/>
+                    <field name="phonecall_id" invisible="1"/>                    
                     <button string="Schedule a Phone Call"
-                        name="%(wizard_crm_opportunity_reschedule_phone_call)d" icon="gtk-redo" type="action"  />                    
+                        name="%(wizard_crm_opportunity_reschedule_phone_call)d" icon="gtk-redo" type="action" attrs="{'invisible':[('phonecall_id','!=',False)]}" />                    
                 </group>
                 <notebook colspan="4">
                 <page string="Description">
diff --git a/addons/crm/wizard/crm_lead_wizard.py b/addons/crm/wizard/crm_lead_wizard.py
index a7c24863ee1..95127336a4c 100644
--- a/addons/crm/wizard/crm_lead_wizard.py
+++ b/addons/crm/wizard/crm_lead_wizard.py
@@ -62,6 +62,15 @@ class lead2opportunity(wizard.interface):
         'probability': {'type':'float', 'digits':(16,2), 'string': 'Success Probability'},
         'partner_id' : {'type':'many2one', 'relation':'res.partner', 'string':'Partner'},
     }
+    
+    def _check_state(self, cr, uid, data, context):
+        pool = pooler.get_pool(cr.dbname)
+        case_obj = pool.get('crm.lead')
+        for case in case_obj.browse(cr, uid, data['ids']):
+            if case.state != 'open':
+                raise wizard.except_wizard(_('Warning !'),
+                    _('Lead should be in \'Open\' state before converting to Opportunity.'))
+        return {}
 
     def _selectopportunity(self, cr, uid, data, context):
         pool = pooler.get_pool(cr.dbname)
@@ -105,6 +114,7 @@ class lead2opportunity(wizard.interface):
                 'partner_id': data['form']['partner_id'],
                 'section_id':lead.section_id.id,
                 'description':lead.description,
+                'date_deadline': lead.date_deadline,
                 'partner_address_id':lead.partner_address_id.id, 
                 'priority':lead.priority,         
             })       
@@ -170,7 +180,7 @@ class lead2opportunity(wizard.interface):
 
     states = {
         'init': {
-            'actions': [],
+            'actions': [_check_state],
             'result': {'type':'choice','next_state':_selectChoice}
         },
         'create_partner': {
diff --git a/addons/crm/wizard/crm_opportunity_wizard.py b/addons/crm/wizard/crm_opportunity_wizard.py
index 945f92ea688..960baca12ad 100644
--- a/addons/crm/wizard/crm_opportunity_wizard.py
+++ b/addons/crm/wizard/crm_opportunity_wizard.py
@@ -56,6 +56,10 @@ class opportunity2phonecall(wizard.interface):
         case_obj = pooler.get_pool(cr.dbname).get('crm.opportunity')        
         categ_id = pooler.get_pool(cr.dbname).get('crm.case.categ').search(cr, uid, [('name','=','Outbound')])            
         case = case_obj.browse(cr, uid, data['id'])
+        if case.state != 'open':
+            raise wizard.except_wizard(_('Warning !'),
+                _('Opportunity should be in \'Open\' state before converting to Phone Call.'))
+            return {}
         return {
                 'user_id' : case.user_id and case.user_id.id,
                 'category_id' : categ_id and categ_id[0] or case.categ_id and case.categ_id.id,
diff --git a/addons/crm/wizard/crm_phonecall_wizard.py b/addons/crm/wizard/crm_phonecall_wizard.py
index e341e46f03e..581c8019d87 100644
--- a/addons/crm/wizard/crm_phonecall_wizard.py
+++ b/addons/crm/wizard/crm_phonecall_wizard.py
@@ -62,6 +62,15 @@ class phonecall2opportunity(wizard.interface):
         'probability': {'type':'float', 'digits':(16,2), 'string': 'Success Probability'},
         'partner_id' : {'type':'many2one', 'relation':'res.partner', 'string':'Partner'},
     }
+    
+    def _check_state(self, cr, uid, data, context):
+        pool = pooler.get_pool(cr.dbname)
+        case_obj = pool.get('crm.phonecall')
+        for case in case_obj.browse(cr, uid, data['ids']):
+            if case.state != 'open':
+                raise wizard.except_wizard(_('Warning !'),
+                    _('Phone Call state should be \'Open\' before converting to Opportunity.'))
+        return {}
 
     def _selectopportunity(self, cr, uid, data, context):
         pool = pooler.get_pool(cr.dbname)
@@ -164,7 +173,7 @@ class phonecall2opportunity(wizard.interface):
 
     states = {
         'init': {
-            'actions': [],
+            'actions': [_check_state],
             'result': {'type':'choice','next_state':_selectChoice}
         },
         'create_partner': {

From 2a9ce6bc21f27d2dd5265af040ceddcf4a9eb4bc Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 1 Feb 2010 16:28:07 +0530
Subject: [PATCH 09/68] [Fix] : Problem of pending invoice menu fixed

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

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 9480f3327c3..2f612c159a6 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -27,8 +27,8 @@
      <!--Invoice control-->
       <menuitem id="menu_procurement_management_invoice" name="Invoice Control"
             parent="menu_purchase_root" sequence="6"/>
-      <menuitem name="Pending Invoices" id="menu_procurement_management_panding_invoice" action="account.action_invoice_tree_panding_invoice"
-      parent="menu_procurement_management_invoice"/>
+     <!-- <menuitem name="Pending Invoices" id="menu_procurement_management_panding_invoice" action="account.action_invoice_tree_panding_invoice"
+      parent="menu_procurement_management_invoice"/>-->
 
       <!--product menu-->
       <menuitem id="menu_procurement_management_product" name="Product"

From 7d2cfdc1220ba64f8b0ae493f9fcf4638fd57268 Mon Sep 17 00:00:00 2001
From: "RCH(Open ERP)" <>
Date: Mon, 1 Feb 2010 16:37:19 +0530
Subject: [PATCH 10/68] [ADD] New module added as board_hr

bzr revid: vir@tinyerp.com-20100201110719-nf5b0fm61d6e4pdo
---
 addons/board_hr/__init__.py       | 24 +++++++++++
 addons/board_hr/__terp__.py       | 42 ++++++++++++++++++
 addons/board_hr/board_hr_view.xml | 72 +++++++++++++++++++++++++++++++
 3 files changed, 138 insertions(+)
 create mode 100644 addons/board_hr/__init__.py
 create mode 100644 addons/board_hr/__terp__.py
 create mode 100644 addons/board_hr/board_hr_view.xml

diff --git a/addons/board_hr/__init__.py b/addons/board_hr/__init__.py
new file mode 100644
index 00000000000..e68279cad8d
--- /dev/null
+++ b/addons/board_hr/__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/>.     
+#
+##############################################################################
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/board_hr/__terp__.py b/addons/board_hr/__terp__.py
new file mode 100644
index 00000000000..80b00961dbe
--- /dev/null
+++ b/addons/board_hr/__terp__.py
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+    'name': 'Board for Human Reasources Management',
+    'version': '1.0',
+    'category': '',
+    'description': """
+This module implements a dashboard for human resource management that includes:
+    * My Current Timesheet
+    * My Leaves
+    * My Expenses
+    """,
+    'author': 'Tiny',
+    'depends': [ 'crm_project','board','hr_expense','hr_timesheet_sheet','hr_holidays'
+    ],
+    'update_xml': ['board_hr_view.xml'],
+    'demo_xml': [],
+    'installable': True,
+    'active': False,
+    'certificate': '',
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/board_hr/board_hr_view.xml b/addons/board_hr/board_hr_view.xml
new file mode 100644
index 00000000000..2e84eff0749
--- /dev/null
+++ b/addons/board_hr/board_hr_view.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+	    <menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
+        <menuitem
+            id="menu_hr_deshboard"
+            name="Human Resources"
+            parent="base.dashboard"/>
+
+        <record id="action_my_expense" model="ir.actions.act_window">
+            <field name="name">My Expenses</field>
+            <field name="res_model">hr.expense.expense</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('state','=','draft'),('user_id','=',uid)]</field>
+            <field name="view_id" ref="hr_expense.view_editable_expenses_tree"/>
+        </record>
+
+        <record id="act_hr_current_timesheet_sheet_form" model="ir.actions.act_window">
+            <field name="name">Timesheets</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr_timesheet_sheet.sheet</field>
+            <field name="view_type">form</field>
+            <field name="view_id" eval="False"/>
+            <field name="domain">[('date_to','&gt;=',time.strftime('%Y-%m-01')),('date_from','&lt;=',time.strftime('%Y-%m-01'))]</field>
+            <field name="search_view_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_tree"/>
+        </record>
+
+        <record id="action_view_holiday_status_board" model="ir.actions.act_window">
+            <field name="name">My Leaves</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr.holidays.per.user</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="hr_holidays.view_my_leave_board_tree"/>
+        </record>
+
+        <record id="board_hr_form" model="ir.ui.view">
+            <field name="name">board.hr.form</field>
+            <field name="model">board.board</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="My Board">
+                    <hpaned>
+                        <child1>
+                              <action colspan="4" height="220" name="%(act_hr_current_timesheet_sheet_form)d" string="My current timesheet"  width="510"/>
+                        </child1>
+                        <child2>
+                            <action colspan="4" height="220" name="%(action_view_holiday_status_board)d" string="My Leaves"/>
+                            <action colspan="4" height="220" name="%(action_my_expense)d" string="My Expenses" />
+                        </child2>
+                    </hpaned>
+                </form>
+            </field>
+        </record>
+
+       <record id="open_board_hr" model="ir.actions.act_window">
+            <field name="name">Human Resources Dashboard</field>
+            <field name="res_model">board.board</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="usage">menu</field>
+            <field name="view_id" ref="board_hr_form"/>
+        </record>
+
+        <menuitem
+            action="open_board_hr"
+            icon="terp-graph"
+            id="menu_hr_project"
+            parent="menu_hr_deshboard"
+            sequence="4"/>
+    </data>
+</openerp>

From 2044339a0ded9ff64357abd258b3d10a408dc603 Mon Sep 17 00:00:00 2001
From: "RCH(Open ERP)" <>
Date: Mon, 1 Feb 2010 16:39:48 +0530
Subject: [PATCH 11/68] [MOD] hr_expense,hr_timesheet_sheet,hr_holiday :
 Modificatin realted to board_hr module

bzr revid: vir@tinyerp.com-20100201110948-p6xl1x6tvma8mcld
---
 addons/hr_expense/hr_expense_view.xml         | 15 ++++++++++++
 addons/hr_holidays/hr_view.xml                | 15 +++++++++++-
 .../hr_timesheet_sheet_view.xml               | 23 +++++++++++++++++--
 3 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 59452ff7cc8..580a0d371a5 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -37,6 +37,21 @@
             </field>
         </record>
 
+        <record id="view_editable_expenses_tree" model="ir.ui.view">
+            <field name="name">hr.expense.expense.tree</field>
+            <field name="model">hr.expense.expense</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Expenses" editable="top">
+                    <field name="date"/>
+                    <field name="employee_id"/>
+                    <field name="name"/>
+                    <field name="ref"/>
+                    <field name="amount"/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
 
         <record id="view_expenses_form" model="ir.ui.view">
             <field name="name">hr.expense.form</field>
diff --git a/addons/hr_holidays/hr_view.xml b/addons/hr_holidays/hr_view.xml
index b8e6c2af47e..68138977d96 100644
--- a/addons/hr_holidays/hr_view.xml
+++ b/addons/hr_holidays/hr_view.xml
@@ -148,7 +148,20 @@
             </field>
         </record>
 
-
+        <!-- My leave dashboard -->
+        <record model="ir.ui.view" id="view_my_leave_board_tree">
+            <field name="name">hr.holidays.per.user.form</field>
+            <field name="model">hr.holidays.per.user</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="My Leaves" editable="top">
+                    <field name="holiday_status"/>
+                    <field name="max_leaves"/>
+                    <field name="leaves_taken" />
+                    <field name="remaining_leaves"/>
+                </tree>
+            </field>
+        </record>
 
        <!-- <menuitem
           name="Holidays Management"
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 6e3c8c39004..79650ce2a59 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -19,6 +19,25 @@
             </field>
         </record>
 
+        <!-- Editable current timesheet used  in dashboard-->
+        <record id="hr_timesheet_sheet_tree" model="ir.ui.view">
+            <field name="name">hr.timesheet.sheet.tree</field>
+            <field name="model">hr_timesheet_sheet.sheet</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Timesheets" editable="top">
+                    <field name="user_id"/>
+                    <field name="date_from"/>
+                    <field name="date_to"/>
+                    <field name="name"/>
+                    <field name="total_attendance" groups="hr_attendance.group_hr_attendance"/>
+                    <field name="total_timesheet"/>
+                    <field name="total_difference" groups="hr_attendance.group_hr_attendance"/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
+
         <record id="hr_timesheet_account_form" model="ir.ui.view">
             <field name="name">hr.timesheet.account.form</field>
             <field name="model">hr_timesheet_sheet.sheet.account</field>
@@ -46,7 +65,7 @@
                 </tree>
             </field>
         </record>
-<!-- 
+<!--
         <record id="hr_timesheet_day_form" model="ir.ui.view">
             <field name="name">hr.timesheet.day.form</field>
             <field name="model">hr_timesheet_sheet.sheet.day</field>
@@ -61,7 +80,7 @@
                 </form>
             </field>
         </record>
- 
+
         <record id="hr_timesheet_day_tree" model="ir.ui.view">
             <field name="name">hr.timesheet.day.tree</field>
             <field name="model">hr_timesheet_sheet.sheet.day</field>

From c5662acf2a6226a04081368e94e4fa7e567ae79e Mon Sep 17 00:00:00 2001
From: "RCH(OpenERP)" <>
Date: Mon, 1 Feb 2010 16:59:29 +0530
Subject: [PATCH 12/68] [MOD,IMP] board_project : Improvement in project
 dashboard

bzr revid: vir@tinyerp.com-20100201112929-y1crg6bj048ugdtf
---
 addons/board_project/__terp__.py              |  8 ++--
 .../board_project_manager_view.xml            | 36 +++++++--------
 addons/board_project/board_project_view.xml   | 45 ++++++++++++++++---
 addons/project/project_view.xml               | 27 ++++++++---
 addons/report_task/report_task.py             |  5 +--
 addons/resource/resource_view.xml             | 16 ++++++-
 6 files changed, 100 insertions(+), 37 deletions(-)

diff --git a/addons/board_project/__terp__.py b/addons/board_project/__terp__.py
index e32ae9a789b..3b9b919c18b 100644
--- a/addons/board_project/__terp__.py
+++ b/addons/board_project/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -40,7 +40,9 @@ This module implements a dashboard for project member that includes:
         'report_analytic_planning',
         'report_analytic_line',
         'report_task',
-        'hr_timesheet_sheet'
+        'hr_timesheet_sheet',
+        'crm_project',
+        'resource'
     ],
     'update_xml': ['board_project_view.xml', 'board_project_manager_view.xml'],
     'demo_xml': ['board_project_demo.xml'],
diff --git a/addons/board_project/board_project_manager_view.xml b/addons/board_project/board_project_manager_view.xml
index a45857af033..3f805115fd4 100644
--- a/addons/board_project/board_project_manager_view.xml
+++ b/addons/board_project/board_project_manager_view.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        
+
         <record id="note_project_type" model="board.note.type">
             <field name="name">Project managers</field>
         </record>
-        
+
         <!--
 		 Board for project managers
 		 -->
         <act_window domain="[('manager', '=', uid)]" id="act_my_project" name="My projects" res_model="project.project" view_mode="tree,form" view_type="form"/>
-        
+
         <act_window domain="[('user_id','=',uid),('state','&lt;&gt;','close')]" id="act_my_account" name="My accounts to invoice" res_model="account.analytic.account" view_id="view_account_analytic_simplified" view_mode="tree,form" view_type="form"/>
-        
+
         <record id="action_project_pipeline_user" model="ir.actions.act_window">
             <field name="name">Pipeline of tasks</field>
             <field name="res_model">report.task.user.pipeline.open</field>
@@ -20,7 +20,7 @@
             <field name="view_mode">graph,tree</field>
             <field name="domain">[('user_id','in',department_users_get())]</field>
         </record>
-        
+
         <record id="hr_timesheet_sheet_tree" model="ir.ui.view">
             <field name="name">hr.timesheet.sheet.tree.simplified.board</field>
             <field name="model">hr_timesheet_sheet.sheet</field>
@@ -43,8 +43,8 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="hr_timesheet_sheet_tree"/>
         </record>
-        
-        
+
+
         <record id="board_project_manager_form" model="ir.ui.view">
             <field name="name">board.project.manager.form</field>
             <field name="model">board.board</field>
@@ -53,27 +53,27 @@
                 <form string="Project manager board">
                     <hpaned>
                         <child1>
-                            <action colspan="4" height="220" name="%(act_my_project)d" string="My projects" width="510"/>
-                            
+                          <!--  <action colspan="4" height="220" name="%(act_my_project)d" string="My projects" width="510"/>-->
+
                             <action colspan="4" height="150" name="%(act_my_account)d" string="My accounts to invoice"/>
-                            
+
                             <action colspan="4" height="150" name="%(act_hr_timesheet_sheet)d" string="User's timesheets"/>
-                            
+
                         </child1>
                         <child2>
-                            <button colspan="4" icon="terp-partner" name="%(open_board_project)d" string="My tasks board" type="action"/>
-                            
-                            
+                           <button colspan="4" icon="terp-partner" name="%(open_board_project)d" string="My tasks board" type="action"/>
+
+
                             <action colspan="4" name="%(report_analytic_planning.action_account_analytic_planning_stat_form)d" string="My Project's planning" domain="[('manager_id','=',uid),('planning_id.state','&lt;&gt;','cancel')]"/>
-                            
+
                             <action colspan="4" name="%(action_project_pipeline_user)d" string="My user's pipeline"/>
-                            
+
                         </child2>
                     </hpaned>
                 </form>
             </field>
         </record>
-        
+
         <record id="open_board_project_manager" model="ir.actions.act_window">
             <field name="name">Project Manager Dashboard</field>
             <field name="res_model">board.board</field>
@@ -82,7 +82,7 @@
             <field name="usage">menu</field>
             <field name="view_id" ref="board_project_manager_form"/>
         </record>
-        
+
         <menuitem action="open_board_project_manager" icon="terp-graph" id="menu_board_project_manager" parent="board_project.next_id_86" sequence="1" groups="project.group_project_user"/>
 
     </data>
diff --git a/addons/board_project/board_project_view.xml b/addons/board_project/board_project_view.xml
index ebb5f6c86b7..3cadd1ed8b6 100644
--- a/addons/board_project/board_project_view.xml
+++ b/addons/board_project/board_project_view.xml
@@ -22,6 +22,23 @@
                 </tree>
             </field>
         </record>
+        <!-- Editable My task -->
+        <record id="view_task_tree" model="ir.ui.view">
+            <field name="name">project.task.tree</field>
+            <field name="model">project.task</field>
+            <field name="type">tree</field>
+            <field eval="99" name="priority"/>
+            <field name="arch" type="xml">
+                  <tree editable="top" colors="red:date_deadline&lt;current_date;blue:date_deadline==current_date;black:date_deadline&gt;current_date" string="My Tasks">
+                    <field name="name"/>
+                    <field name="project_id"/>
+                    <field name="date_deadline"/>
+                    <field name="planned_hours"/>
+                    <field name="effective_hours"/>
+                    <field name="priority"/>
+                </tree>
+            </field>
+        </record>
         <record id="action_view_task_tree" model="ir.actions.act_window">
             <field name="name">My Open Tasks</field>
             <field name="res_model">project.task</field>
@@ -47,6 +64,25 @@
             <field name="domain">[('type','=','Project')]</field>
         </record>
 
+		<!--Actions for deshboard -->
+
+        <record id="action_view_project_editable_messages_tree" model="ir.actions.act_window">
+            <field name="name">Messages</field>
+            <field name="res_model">project.message</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="project.view_project_editable_message_tree"/>
+       </record>
+
+        <record id="action_view_project_member_tree" model="ir.actions.act_window">
+            <field name="name">Project's Members</field>
+            <field name="res_model">resource.resource</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('resource_type','=','user')]</field>
+            <field name="view_id" ref="resource.view_project_member_tree"/>
+        </record>
+
         <record id="board_project_form" model="ir.ui.view">
             <field name="name">board.project.form</field>
             <field name="model">board.board</field>
@@ -56,12 +92,11 @@
                     <hpaned>
                         <child1>
                             <action colspan="4" height="220" name="%(action_view_task_tree)d" string="My Open Tasks" width="510"/>
-                            <action colspan="4" height="150" name="%(action_view_task_tree_deadline)d" string="My Deadlines"/>
-                            <action colspan="4" height="150" name="%(action_view_board_note_tree)d" string="Public Notes"/>
-                        </child1>
+                            <action colspan="4" height="150" name="%(action_view_project_member_tree)d" string="Members list of project"/>
+                         </child1>
                         <child2>
-                            <action colspan="4" name="%(report_analytic_planning.action_account_analytic_planning_stat_form)d" string="My Planning" domain="[('user_id','=',uid),('planning_id.state','&lt;&gt;','cancel')]"/>
-                            <action colspan="4" name="%(report_timesheet.action_timesheet_user_stat_all)d" string="Timesheets"/>
+                             <action colspan="4" name="%(action_view_project_editable_messages_tree)d" string="Messages"/>
+                             <action colspan="4" name="%(crm_project.crm_case_categ_act0)d" string="Issues"/>
                         </child2>
                     </hpaned>
                 </form>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 9181b6dfd88..cc5f93e2608 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -57,9 +57,9 @@
                                 <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
                                 <button name="set_done" string="Done" type="object" states="open,pending" icon="gtk-jump-to"/>
                                 <button name="reset_project" string="Reset as Project" type="object" states="template" icon="gtk-convert"/>
-                                <button 
+                                <button
                                     string="New Project Based on Template"
-                                    name="%(wizard_duplicate_template)d"  type="action" 
+                                    name="%(wizard_duplicate_template)d"  type="action"
                                     states="template" icon="gtk-new"/>
                             </group>
                         </page>
@@ -365,10 +365,10 @@
                     <field name="remaining_hours" widget="float_time" sum="Remaining Hours"/>
                     <field name="date_deadline"/>
                     <field name="type" groups="base.group_extended"/>
-                    <button name="next_type" 
-                        states="draft,open,pending" 
-                        string="Change Stage" 
-                        type="object" 
+                    <button name="next_type"
+                        states="draft,open,pending"
+                        string="Change Stage"
+                        type="object"
                         icon="gtk-go-forward"
                         groups="base.group_extended"
                         help="Change Type"/>
@@ -684,5 +684,20 @@
 
         <act_window domain="[('user_id', '=', active_id),('date', '&gt;=', time.strftime('%Y-%m-01'))]" id="act_res_users_2_project_task_work_month" name="Month works" res_model="project.task.work" src_model="res.users" view_mode="tree,form" view_type="form"/>
 
+		<!-- Editable list of messages -->
+	    <record id="view_project_editable_message_tree" model="ir.ui.view">
+            <field name="name">project.message.form</field>
+            <field name="model">project.message</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Messages" editable="top">
+                        <field name="subject" select="1"/>
+                        <field name="description" select="1"/>
+                        <field name="project_id" select="1"/>
+                        <field name="date" select="1"/>
+                        <field name="user_id" select="1"/>
+                </tree>
+            </field>
+       </record>
     </data>
 </openerp>
diff --git a/addons/report_task/report_task.py b/addons/report_task/report_task.py
index dd2772b970e..2c13b570b86 100644
--- a/addons/report_task/report_task.py
+++ b/addons/report_task/report_task.py
@@ -91,11 +91,10 @@ class  report_closed_task(osv.osv):
                    tsk.date_deadline as date_deadline, tsk.planned_hours as planned_hours,
                    tsk.delay_hours as delay_hours, tsk.progress as progress,
                    tsk.priority as priority, tsk.state as state,
-                   tsk.remaining_hours as remaining_hours, tsk.date_end as date_close
+                   tsk.remaining_hours as remaining_hours
                 from
                     project_task tsk
-                where
-                    (tsk.date_end <= CURRENT_DATE AND tsk.date_end > (CURRENT_DATE-15))
+
             )
         ''')
 report_closed_task()
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 7bb8358b104..5892b78fe5b 100755
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -3,7 +3,7 @@
     <data>
         <menuitem icon="terp-project" id="base.menu_main" name="Project Management"/>
         <menuitem id="base.menu_pm_resources" name="Resources" parent="base.menu_main" sequence="2"/>
-        
+
         <record id="resource_calendar_form" model="ir.ui.view">
             <field name="name">resource.calendar.form</field>
             <field name="model">resource.calendar</field>
@@ -160,7 +160,19 @@
             <field name="view_mode">tree,form,calendar</field>
         </record>
 
-        <menuitem action="action_resource_calendar_leave_tree" id="menu_resource_calendar_leave_tree" parent="base.menu_pm_resources"/>        
+        <menuitem action="action_resource_calendar_leave_tree" id="menu_resource_calendar_leave_tree" parent="base.menu_pm_resources"/>
 
+		<!-- project member -->
+        <record id="view_project_member_tree" model="ir.ui.view">
+            <field name="name">project.member.tree</field>
+            <field name="model">resource.resource</field>
+            <field name="type">tree</field>
+            <field eval="99" name="priority"/>
+            <field name="arch" type="xml">
+                <tree string="Project's Members">
+                    <field name="name"/>
+                </tree>
+            </field>
+        </record>
     </data>
 </openerp>

From 81096a5571340938480b8617f7dc5661184d0fdc Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 1 Feb 2010 17:05:07 +0530
Subject: [PATCH 13/68] [IMP] board_sale : Improvements in dashboard

bzr revid: vir@tinyerp.com-20100201113507-23cvv9873muevx14
---
 addons/board_sale/board_sale_view.xml | 29 +++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/addons/board_sale/board_sale_view.xml b/addons/board_sale/board_sale_view.xml
index e5e469322c4..496f189bf89 100644
--- a/addons/board_sale/board_sale_view.xml
+++ b/addons/board_sale/board_sale_view.xml
@@ -5,6 +5,24 @@
             <field name="name">Sales</field>
         </record>
 
+		<record model="ir.actions.act_window" id="board_crm_case_categ_phone_incoming0">
+	        <field name="res_model">crm.phonecall</field>
+	        <field name="view_type">form</field>
+	        <field name="view_mode">tree,calendar</field>
+	        <field name="view_id" ref="crm.crm_case_phone_tree_view"/>
+	        <field name="domain">[('user_id','=',uid)]</field>
+	        <field name="context" eval="{'default_state':'open'}"/>
+	        <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
+	    </record>
+
+		<record model="ir.actions.act_window" id="board_crm_case_categ_meet">
+	        <field name="res_model">crm.meeting</field>
+	        <field name="view_mode">tree,form,gantt</field>
+	        <field name="view_id" ref="crm.crm_case_tree_view_meet"/>
+	        <field name="domain">[('user_id','=',uid)]</field>
+	        <field name="domain">[('date','&gt;=',time.strftime('%Y-%m-%d')),('date','&lt;=',(datetime.datetime.today() + datetime.timedelta(days=2)).strftime('%Y-%m-%d'))]</field>
+	        <field name="context" eval="{'default_state':'open'}"/>
+	    </record>
         <record id="board_sales_manager_form" model="ir.ui.view">
             <field name="name">board.sales.manager.form</field>
             <field name="model">board.board</field>
@@ -14,13 +32,16 @@
                     <hpaned position="100">
                         <child1>
                             <action colspan="4" height="200" name="%(sale.action_order_tree5)d" string="My quotations" width="510" domain="[('state','=','draft'),('user_id','=',uid)]"/>
-                            <action colspan="4" name="%(report_sale.action_order_sale_list)d" string="Top ten sales of the month"/>
-                            <action colspan="4" name="%(report_crm.action_report_crm_case_user_tree)d" string="Cases statistics"/>
+                            <action colspan="4" name="%(board_crm_case_categ_phone_incoming0)d" string="My planned calling calls (IN / OUT)" width="510"/>
+<!--                            <action colspan="4" name="%(report_sale.action_order_sale_list)d" string="Top ten sales of the month"/>-->
+<!--                            <action colspan="4" name="%(report_crm.action_report_crm_case_user_tree)d" string="Cases statistics"/>-->
                         </child1>
 
                         <child2>
-                            <action colspan="4" name="%(report_sale.action_order_category_tree_all)d" string="Average Sales by Category of Products(this month)" view_mode="graph,tree"/>
-                            <action colspan="4" name="%(report_crm.action_report_crm_case_user_tree)d" string="Cases of the month" view_mode="graph,tree"/>
+							<action colspan="4" name="%(crm.crm_case_category_act_oppor11)d" string="My Opportunities" width="510" domain="[('user_id','=',uid)]"/>
+							<action colspan="4" name="%(board_crm_case_categ_meet)d" String="My Meetings" domain="[('state','=','open')]" width="510"/>
+<!--                            <action colspan="4" name="%(report_sale.action_order_category_tree_all)d" string="Average Sales by Category of Products(this month)" view_mode="graph,tree"/>-->
+<!--                            <action colspan="4" name="%(report_crm.action_report_crm_case_user_tree)d" string="Cases of the month" view_mode="graph,tree"/>-->
                         </child2>
                     </hpaned>
                 </form>

From 36ee3bb0c947e30f77cd67085061e4970fde6893 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Mon, 1 Feb 2010 18:07:46 +0530
Subject: [PATCH 14/68] [IMP] crm: Removed unused import statements. Improved
 spacing.

bzr revid: uco@tinyerp.co.in-20100201123746-c5mlbizvane0eo8f
---
 addons/crm/crm_claim.py             |  8 +-------
 addons/crm/crm_fundraising.py       | 16 +---------------
 addons/crm/crm_helpdesk.py          | 15 +--------------
 addons/crm/crm_lead.py              | 15 +--------------
 addons/crm/crm_opportunity.py       | 14 +-------------
 addons/crm/crm_opportunity_view.xml |  2 +-
 addons/crm/crm_phonecall.py         | 11 +----------
 7 files changed, 7 insertions(+), 74 deletions(-)

diff --git a/addons/crm/crm_claim.py b/addons/crm/crm_claim.py
index 5e83ce1c367..14921372fad 100644
--- a/addons/crm/crm_claim.py
+++ b/addons/crm/crm_claim.py
@@ -19,16 +19,9 @@
 #
 ##############################################################################
 
-import tools
 from osv import fields, osv
-import os
-import pooler
-import netsvc
-from tools.translate import _
 import crm
 
-
-
 class crm_claim(osv.osv):
     _name = "crm.claim"
     _description = "Claim Cases"
@@ -59,6 +52,7 @@ class crm_claim(osv.osv):
     _defaults = {
                  'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
     }
+    
     def onchange_categ_id(self, cr, uid, ids, categ, context={}):
         if not categ:
             return {'value':{}}
diff --git a/addons/crm/crm_fundraising.py b/addons/crm/crm_fundraising.py
index 046065e61f2..5085f01333f 100644
--- a/addons/crm/crm_fundraising.py
+++ b/addons/crm/crm_fundraising.py
@@ -19,23 +19,9 @@
 #
 ##############################################################################
 
-import time
-import re
-import os
-
-import mx.DateTime
-import base64
-
-from tools.translate import _
-
-import tools
 from osv import fields,osv,orm
-from osv.orm import except_orm
-
 import crm
 
-
-
 class crm_fundraising(osv.osv):
     _name = "crm.fundraising"
     _description = "Fund Raising Cases"
@@ -67,11 +53,11 @@ class crm_fundraising(osv.osv):
     _defaults = {
                  'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
     }
+    
     def onchange_categ_id(self, cr, uid, ids, categ, context={}):
         if not categ:
             return {'value':{}}
         cat = self.pool.get('crm.case.categ').browse(cr, uid, categ, context).probability
         return {'value':{'probability':cat}}    
     
-
 crm_fundraising()    
diff --git a/addons/crm/crm_helpdesk.py b/addons/crm/crm_helpdesk.py
index ca4bf47006b..13bc13d214c 100644
--- a/addons/crm/crm_helpdesk.py
+++ b/addons/crm/crm_helpdesk.py
@@ -19,23 +19,9 @@
 #
 ##############################################################################
 
-import time
-import re
-import os
-
-import mx.DateTime
-import base64
-
-from tools.translate import _
-
-import tools
 from osv import fields,osv,orm
-from osv.orm import except_orm
-
 import crm
 
-
-
 class crm_helpdesk(osv.osv):
     _name = "crm.helpdesk"
     _description = "Helpdesk Cases"
@@ -57,6 +43,7 @@ class crm_helpdesk(osv.osv):
             'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.helpdesk')]"),
             'duration': fields.float('Duration'),
     }
+    
     def onchange_categ_id(self, cr, uid, ids, categ, context={}):
         if not categ:
             return {'value':{}}
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 9c6ae7bffa7..f346bcf88f7 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -19,22 +19,9 @@
 #
 ##############################################################################
 
-import time
-import re
-import os
-
-import mx.DateTime
-import base64
-
-from tools.translate import _
-
-import tools
 from osv import fields,osv,orm
-from osv.orm import except_orm
-
 import crm
 
-
 class crm_opportunity(osv.osv):
     _name = "crm.opportunity"
     _description = "Opportunity Cases"
@@ -65,9 +52,9 @@ class crm_lead(osv.osv):
             'som': fields.many2one('res.partner.som', 'State of Mind', help="The minds states allow to define a value scale which represents" \
                                                                        "the partner mentality in relation to our services.The scale has" \
                                                                        "to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."),
-                                                                       
              'opportunity_id': fields.many2one ('crm.opportunity', 'Opportunity'),
     }
+    
     def onchange_categ_id(self, cr, uid, ids, categ, context={}):
         if not categ:
             return {'value':{}}
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 35a85cad6ee..529bdbf7eb0 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -19,22 +19,9 @@
 #
 ##############################################################################
 
-import time
-import re
-import os
-
-import mx.DateTime
-import base64
-
-from tools.translate import _
-
-import tools
 from osv import fields,osv,orm
-from osv.orm import except_orm
-
 import crm
 
-
 class crm_opportunity(osv.osv):
     _name = "crm.opportunity"
     _description = "Opportunity Cases"
@@ -58,6 +45,7 @@ class crm_opportunity(osv.osv):
         'date_closed': fields.datetime('Closed', readonly=True),
         'phonecall_id':fields.many2one ('crm.phonecall', 'Phonecall'),
     }
+    
     def onchange_categ_id(self, cr, uid, ids, categ, context={}):
         if not categ:
             return {'value':{}}
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 526accf3732..e3f60eebbe9 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -24,7 +24,7 @@
 	        <field name="view_type">form</field>
  			<field name="view_id" ref="crm.crm_case_stage_tree"/>
 			<field name="domain">[('object_id.model', '=', 'crm.opportunity')]</field>
-			 <field name="context">{'object_id':'crm.opportunity'}</field>
+			<field name="context">{'object_id':'crm.opportunity'}</field>
 	    </record>
 	  <menuitem action="crm_opportunity_stage_act" id="menu_crm_opportunity_stage_act" parent="crm.menu_crm_case_stage"/>
     # ------------------------------------------------------
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 4c548af86e1..5f610860407 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -19,19 +19,9 @@
 #
 ##############################################################################
 
-from dateutil.rrule import *
 from osv import fields, osv
-import  datetime
-import base64
-import re
-import time
-import tools
-
-from tools.translate import _
-
 import crm
 
-
 class crm_phonecall(osv.osv):
     _name = "crm.phonecall"
     _description = "Phonecall Cases"
@@ -53,6 +43,7 @@ class crm_phonecall(osv.osv):
         'date_closed': fields.datetime('Closed', readonly=True),
         'opportunity_id':fields.many2one ('crm.opportunity', 'Opportunity'),        
     }
+ 
     def onchange_categ_id(self, cr, uid, ids, categ, context={}):
         if not categ:
             return {'value':{}}

From 1f407aacf4a0edd5b30d7dc99531231a1aebd6e2 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 1 Feb 2010 18:18:35 +0530
Subject: [PATCH 15/68] [Add] : New module added for board warehouse

bzr revid: vir@tinyerp.com-20100201124835-afhyoinbbb68rxag
---
 addons/board_warehouse/__init__.py            | 24 +++++++++++
 addons/board_warehouse/__terp__.py            | 42 +++++++++++++++++++
 .../board_warehouse/board_warehouse_view.xml  | 42 +++++++++++++++++++
 3 files changed, 108 insertions(+)
 create mode 100644 addons/board_warehouse/__init__.py
 create mode 100644 addons/board_warehouse/__terp__.py
 create mode 100644 addons/board_warehouse/board_warehouse_view.xml

diff --git a/addons/board_warehouse/__init__.py b/addons/board_warehouse/__init__.py
new file mode 100644
index 00000000000..3c3121d954a
--- /dev/null
+++ b/addons/board_warehouse/__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/>.
+#
+##############################################################################
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/board_warehouse/__terp__.py b/addons/board_warehouse/__terp__.py
new file mode 100644
index 00000000000..b61c9432b0b
--- /dev/null
+++ b/addons/board_warehouse/__terp__.py
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+    'name': 'Dashboard for Warehouse',
+    'version': '1.0',
+    'category': 'Board/Warehouse',
+    'description': """
+This module implements a dashboard for warehouse that includes:
+    * Products to receive in delay (date < = today)
+    * Procurement in exception
+    * Graph : Number of Receive products vs planned (bar graph on week par day)
+    * Graph : Number of Delivery products vs planned (bar graph on week par day)
+    """,
+    'author': 'Tiny',
+    'depends': ['board','mrp','stock' ],
+    'update_xml': ['board_warehouse_view.xml'],
+    'demo_xml': [],
+    'installable': True,
+    'active': False,
+
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/board_warehouse/board_warehouse_view.xml b/addons/board_warehouse/board_warehouse_view.xml
new file mode 100644
index 00000000000..0ea7fb48297
--- /dev/null
+++ b/addons/board_warehouse/board_warehouse_view.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="note_warehouse_type" model="board.note.type">
+            <field name="name">Warehouse</field>
+        </record>
+
+
+		<record id="board_warehouse_form" model="ir.ui.view">
+            <field name="name">board.warehouse.form</field>
+            <field name="model">board.board</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Warehouse board">
+                    <hpaned position="100">
+                        <child1>
+					    	<action colspan="4" name="%(mrp.mrp_procurement_action5)d" string="Procurement Exceptions" width="510" />
+					    	<action colspan="4" name="%(stock.action_reception_picking_move)d" string="Products To Receive" />
+                        </child1>
+
+                        <child2>
+					    	<action colspan="4" name="%(stock.action_move_graph_reception_picking)d" string="Products To Receive" width="510"/>
+					    	<action colspan="4" name="%(stock.action_move_delivery_products_planned)d" string="Delivery Products Vs Planned" width="510"/>
+                        </child2>
+                    </hpaned>
+                </form>
+            </field>
+        </record>
+
+        <record id="open_board_warehouse" model="ir.actions.act_window">
+            <field name="name">Warehouse Dashboard</field>
+            <field name="res_model">board.board</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="board_warehouse_form"/>
+        </record>
+
+		<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
+        <menuitem id="menu_board_warehouse_main" name="Warehouse" parent="base.dashboard"/>
+        <menuitem action="open_board_warehouse" icon="terp-graph" id="menu_board_warehouse" parent="menu_board_warehouse_main" sequence="1"/>
+    </data>
+</openerp>
\ No newline at end of file

From 44b5c3cdd86007cbcd4bddb59b154e808fe99e3a Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 1 Feb 2010 18:20:00 +0530
Subject: [PATCH 16/68] [ADD] Stock : New two graph view added for
 board_warehouse module

bzr revid: vir@tinyerp.com-20100201125000-pawq65wc8m2erxy0
---
 addons/stock/stock.py       | 85 +++++++++++++++++++++++++++++--------
 addons/stock/stock_view.xml | 83 +++++++++++++++++++++++++++++++++---
 2 files changed, 145 insertions(+), 23 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 8e8fed554fc..1e91f182568 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -474,7 +474,7 @@ class stock_picking(osv.osv):
             ("2binvoiced", "To Be Invoiced"),
             ("none", "Not from Picking")], "Invoice Status",
             select=True, required=True, readonly=True, states={'draft': [('readonly', False)]}),
-        'company_id': fields.many2one('res.company', 'Company', required=True,select=1), 
+        'company_id': fields.many2one('res.company', 'Company', required=True,select=1),
     }
     _defaults = {
         'name': lambda self, cr, uid, context: '/',
@@ -908,12 +908,12 @@ stock_production_lot()
 class stock_split_production_lots(osv.osv_memory):
     _name = "stock.split.production.lots"
     _description = "Split Production Lots"
-    
+
     def _quantity_default_get(self, cr, uid, object=False, field=False, context=None):
         cr.execute("select %s from %s where id=%s" %(field,object,context.get('active_id')))
         res = cr.fetchone()[0]
         return res
-    
+
     _columns = {
         'name': fields.char('Lot Number/Prefix', size=64, required=True),
         'qty': fields.float('Total Quantity'),
@@ -922,13 +922,13 @@ class stock_split_production_lots(osv.osv_memory):
     _defaults = {
                  'qty': lambda self,cr,uid,c: self.pool.get('stock.split.production.lots')._quantity_default_get(cr, uid, 'stock_move', 'product_qty',context=c) or 1,
     }
-    
+
     def split_lines(self, cr, uid, ids, context={}):
         data = self.read(cr, uid, ids[0])
         prodlot_obj = self.pool.get('stock.production.lot')
         move_obj = self.pool.get('stock.move')
         move_browse = move_obj.browse(cr, uid, context['active_id'])
-        
+
         quantity = data['qty']
         if quantity <= 0 or move_browse.product_qty == 0:
             return {}
@@ -936,12 +936,12 @@ class stock_split_production_lots(osv.osv_memory):
 
         quantity_rest = move_browse.product_qty%quantity
         uos_qty_rest = quantity_rest/move_browse.product_qty*move_browse.product_uos_qty
-    
+
         update_val = {
             'product_qty': quantity,
             'product_uos_qty': uos_qty,
         }
-        
+
         new_move = []
         for idx in range(int(move_browse.product_qty//quantity)):
             if idx:
@@ -952,7 +952,7 @@ class stock_split_production_lots(osv.osv_memory):
             new_prodlot = prodlot_obj.create(cr, uid, {'name': data['name'], 'ref': '%d'%idx}, {'product_id': move_browse.product_id.id})
             update_val['prodlot_id'] = new_prodlot
             move_obj.write(cr, uid, [current_move], update_val)
-        
+
         if quantity_rest > 0:
             idx = int(move_browse.product_qty//quantity)
             update_val['product_qty'] = quantity_rest
@@ -965,7 +965,7 @@ class stock_split_production_lots(osv.osv_memory):
             new_prodlot = prodlot_obj.create(cr, uid, {'name': data['name'], 'ref': '%d'%idx}, {'product_id': move_browse.product_id.id})
             update_val['prodlot_id'] = new_prodlot
             move_obj.write(cr, uid, [current_move], update_val)
-        
+
         return {}
 
 stock_split_production_lots()
@@ -1071,9 +1071,9 @@ class stock_move(osv.osv):
             digits=(16, int(config['price_accuracy']))),
         'company_id': fields.many2one('res.company', 'Company', required=True,select=1),
         'partner_id': fields.related('picking_id','address_id','partner_id',type='many2one', relation="res.partner", string="Partner"),
-        'backorder_id': fields.related('picking_id','backorder_id',type='many2one', relation="stock.picking", string="Back Orders"), 
+        'backorder_id': fields.related('picking_id','backorder_id',type='many2one', relation="stock.picking", string="Back Orders"),
         'origin': fields.related('picking_id','origin',type='char', size=64, relation="stock.picking", string="Origin"),
-        'move_stock_return_history': fields.many2many('stock.move', 'stock_move_return_history', 'move_id', 'return_move_id', 'Move Return History',readonly=True),           
+        'move_stock_return_history': fields.many2many('stock.move', 'stock_move_return_history', 'move_id', 'return_move_id', 'Move Return History',readonly=True),
     }
     _constraints = [
         (_check_tracking,
@@ -1115,19 +1115,19 @@ class stock_move(osv.osv):
         'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.move', context=c)
     }
-    
+
     def copy(self, cr, uid, id, default=None, context={}):
         if default is None:
             default = {}
         default = default.copy()
         default['move_stock_return_history'] = []
         return super(stock_move, self).copy(cr, uid, id, default, context)
-    
+
     def create(self, cr, user, vals, context=None):
         if vals.get('move_stock_return_history',False):
             vals['move_stock_return_history'] = []
         return super(stock_move, self).create(cr, user, vals, context)
-    
+
     def _auto_init(self, cursor, context):
         res = super(stock_move, self)._auto_init(cursor, context)
         cursor.execute('SELECT indexname \
@@ -1444,11 +1444,11 @@ class stock_move(osv.osv):
                         'line_id': lines,
                         'ref': ref,
                     })
-        self.write(cr, uid, ids, {'state': 'done', 'date_planned': time.strftime('%Y-%m-%d %H:%M:%S')})        
+        self.write(cr, uid, ids, {'state': 'done', 'date_planned': time.strftime('%Y-%m-%d %H:%M:%S')})
         for pick in self.pool.get('stock.picking').browse(cr, uid, picking_ids):
             if all(move.state == 'done' for move in pick.move_lines):
                 self.pool.get('stock.picking').action_done(cr, uid, [pick.id])
-        
+
         wf_service = netsvc.LocalService("workflow")
         for id in ids:
             wf_service.trg_trigger(uid, 'stock.move', id, cr)
@@ -1502,7 +1502,7 @@ class stock_inventory(osv.osv):
                         'name': 'INV:' + str(line.inventory_id.id) + ':' + line.inventory_id.name,
                         'product_id': line.product_id.id,
                         'product_uom': line.product_uom.id,
-                        'prodlot_id': lot_id, 
+                        'prodlot_id': lot_id,
                         'date': inv.date,
                         'date_planned': inv.date,
                         'state': 'assigned'
@@ -1522,7 +1522,7 @@ class stock_inventory(osv.osv):
                     if lot_id:
                         value.update({
                             'prodlot_id': lot_id,
-                            'product_qty': line.product_qty 
+                            'product_qty': line.product_qty
                         })
                     move_ids.append(self.pool.get('stock.move').create(cr, uid, value))
             if len(move_ids):
@@ -1641,4 +1641,53 @@ class stock_picking_move_wizard(osv.osv_memory):
 
 stock_picking_move_wizard()
 
+class report_products_to_received_planned(osv.osv):
+    _name = "report.products.to.received.planned"
+    _description = "Product to Received Vs Planned"
+    _auto = False
+    _columns = {
+        'date':fields.date('Date'),
+        'qty': fields.integer('Actual Qty'),
+        'planned_qty': fields.integer('Planned Qty'),
+
+    }
+
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_products_to_received_planned')
+        cr.execute("""
+            create or replace view report_products_to_received_planned as (
+               select
+                     distinct current_date as date,
+                     min(id) as id,
+                     (select sum(product_qty)  from  stock_move where to_char(date,'YYYY-MM-DD')::date = current_date ) as qty,
+                     (select sum(product_qty)  from  stock_move where to_char(date_planned,'YYYY-MM-DD')::date = current_date) as planned_qty
+                from  stock_move
+                )
+        """)
+report_products_to_received_planned()
+
+class report_delivery_products_planned(osv.osv):
+    _name = "report.delivery.products.planned"
+    _description = "Number of Delivery products vs planned"
+    _auto = False
+    _columns = {
+        'date':fields.date('Date'),
+        'qty': fields.integer('Actual Qty'),
+        'planned_qty': fields.integer('Planned Qty'),
+
+    }
+
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_delivery_products_planned')
+        cr.execute("""
+            create or replace view report_delivery_products_planned as (
+                select
+                     distinct current_date as date,
+                     min(sm.id) as id,
+                     (select sum(product_qty)  from  stock_move join stock_picking sp on (sm.picking_id = sp.id ) where to_char(sm.date,'YYYY-MM-DD')::date = current_date ) as qty,
+                     (select sum(product_qty)  from  stock_move join stock_picking sp on (sm.picking_id = sp.id ) where to_char(sm.date_planned,'YYYY-MM-DD')::date = current_date) as planned_qty
+                from  stock_move sm join stock_picking sp on (sm.picking_id = sp.id ) where sp.type = 'out' group by sm.picking_id, sm.date, sm.date_planned
+                )
+        """)
+report_delivery_products_planned()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 66c7af2aa59..9adf0bbecba 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -72,7 +72,7 @@
                                 <field context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" select="1" domain="[('type','&lt;&gt;','service')]"/>
                                 <field name="product_qty"/>
                                 <field name="product_uom"/>
-                                <field name="prod_lot_id"/>                                
+                                <field name="prod_lot_id"/>
                                 <field colspan="4" domain="[('usage','=','internal')]" name="location_id" select="1"/>
                             </tree>
                             <form string="Inventory Lines">
@@ -84,7 +84,7 @@
 	                                <field name="prod_lot_id"/>
 	                                <button name="%(split_inventory_lots)d" string="Split in Production Lots" type="action" icon="gtk-justify-fill"/>
                                 </group>
-                                
+
                             </form>
                         </field>
                     </page><page string="Posted Inventory">
@@ -532,7 +532,7 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
-        
+
         <record model="ir.ui.view" id="stock_picking_calendar">
             <field name="name">stock.picking.calendar</field>
             <field name="model">stock.picking</field>
@@ -1299,7 +1299,7 @@
                     <field name="prodlot_id" string="Lot"/>
                     <field name="date_planned"/>
                     <field name="backorder_id"/>
-                    <field name="state"/>                    
+                    <field name="state"/>
                     <button name="%(partial_move)d" string="Partial" type="action" states="assigned" icon="gtk-justify-fill"/>
                     <button name="action_cancel" states="assigned,confirmed" string="Cancel" type="object" icon="gtk-cancel"/>
                 </tree>
@@ -1375,7 +1375,7 @@
                     </group>
             	</search>
             </field>
-        </record>        
+        </record>
 
     	<record id="action_reception_picking_move" model="ir.actions.act_window">
             <field name="name">Reception Picking Stock Move</field>
@@ -1486,5 +1486,78 @@
             <field eval="True" name="object"/>
         </record>  
 
+		<!-- Graph Views -->
+		<!--  Products To Received Vs Planned -->
+		<record model="ir.ui.view" id="view_move_graph_reception_picking_tree">
+	        <field name="name">Products To Received</field>
+	        <field name="model">report.products.to.received.planned</field>
+	        <field name="type">tree</field>
+	        <field name="arch" type="xml">
+		        <tree string="Products To Received" >
+		            <field name="qty" />
+		            <field name="planned_qty" />
+		            <field name="date"/>
+		        </tree>
+	        </field>
+	    </record>
+
+		<record model="ir.ui.view" id="view_move_graph_reception_picking">
+	        <field name="name">Products To Received</field>
+	        <field name="model">report.products.to.received.planned</field>
+	        <field name="type">graph</field>
+	        <field name="arch" type="xml">
+	        <graph string="Products To Received" type="bar" orientation="vertical">
+				<field name="date"/>
+	            <field name="qty" operator="+"/>
+	            <field name="planned_qty" operator="+"/>
+	        </graph>
+	        </field>
+	    </record>
+
+	    <record id="action_move_graph_reception_picking" model="ir.actions.act_window">
+	        <field name="name">Reception Picking Stock Move</field>
+	        <field name="res_model">report.products.to.received.planned</field>
+	        <field name="type">ir.actions.act_window</field>
+	        <field name="view_type">form</field>
+	        <field name="view_mode">graph,tree</field>
+	        <field name="view_id" ref="view_move_graph_reception_picking"/>
+	    </record>
+
+		<!--  Delivery Product Vs Planned -->
+		<record model="ir.ui.view" id="view_move_delivery_products_planned_tree">
+	        <field name="name">Delivery Products</field>
+	        <field name="model">report.delivery.products.planned</field>
+	        <field name="type">tree</field>
+	        <field name="arch" type="xml">
+		        <tree string="Products To Received" >
+		            <field name="qty" />
+		            <field name="planned_qty" />
+		            <field name="date"/>
+		        </tree>
+	        </field>
+	    </record>
+
+		<record model="ir.ui.view" id="view_move_delivery_products_planned_graph">
+	        <field name="name">Delivery Products</field>
+	        <field name="model">report.delivery.products.planned</field>
+	        <field name="type">graph</field>
+	        <field name="arch" type="xml">
+	        <graph string="Products To Received" type="bar" orientation="vertical">
+	        	<field name="date"/>
+	            <field name="qty" operator="+"/>
+	            <field name="planned_qty" operator="+"/>
+	        </graph>
+	        </field>
+	    </record>
+
+	    <record id="action_move_delivery_products_planned" model="ir.actions.act_window">
+	        <field name="name">Delivery Products Vs Planned</field>
+	        <field name="res_model">report.delivery.products.planned</field>
+	        <field name="type">ir.actions.act_window</field>
+	        <field name="view_type">form</field>
+	        <field name="view_mode">graph,tree</field>
+	        <field name="view_id" ref="view_move_delivery_products_planned_graph"/>
+	    </record>
+
     </data>
 </openerp>

From 4337af6389f9e39d39fd785fc8031ed190482d22 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 1 Feb 2010 18:28:36 +0530
Subject: [PATCH 17/68] [MOD] Description of module changed

bzr revid: vir@tinyerp.com-20100201125836-w4ecz3joie6udutp
---
 addons/board_project/__terp__.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/board_project/__terp__.py b/addons/board_project/__terp__.py
index 3b9b919c18b..558b633d36e 100644
--- a/addons/board_project/__terp__.py
+++ b/addons/board_project/__terp__.py
@@ -27,10 +27,9 @@
     'description': """
 This module implements a dashboard for project member that includes:
     * List of my open tasks
-    * List of my next deadlines
-    * List of public notes
-    * Graph of my timesheet
-    * Graph of my work analysis
+    * List of messages
+    * Members list of project
+    * Issues
     """,
     'author': 'Tiny',
     'depends': [

From 855d0fc82fda483ab6433fc25f3b05ed2f78f682 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= <rvalyi@gmail.com>
Date: Mon, 1 Feb 2010 10:59:01 -0200
Subject: [PATCH 18/68] [FIX] replaced last mx package reference in setup.py by
 dateutil reference

bzr revid: rvalyi@gmail.com-20100201125901-1xgcilmb3rrildeo
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 18899806fcd..553cfd126ce 100755
--- a/setup.py
+++ b/setup.py
@@ -53,7 +53,7 @@ py_short_version = '%s.%s' % sys.version_info[:2]
 required_modules = [
     ('lxml', 'lxml module: pythonic libxml2 and libxslt bindings'),
     ('mako', 'Mako template engine'),
-    ('mx', "egenix's mx library for its extended DateTime module"),
+    ('dateutil', "Labix powerful extensions to the standard datetime module"),
     ('psycopg2', 'PostgreSQL module'),
     ('pychart', 'pychart module'),
     ('pydot', 'pydot module'),

From fe3562a57bd6b2379d4f4cdb48d72535432a2039 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= <rvalyi@gmail.com>
Date: Mon, 1 Feb 2010 10:59:44 -0200
Subject: [PATCH 19/68] [REF] use datetime.utcnow() rather than having to
 import: from dateutil.tz import tzutc

bzr revid: rvalyi@gmail.com-20100201125944-lpr1ijeg2zmkadmv
---
 bin/tools/translate.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bin/tools/translate.py b/bin/tools/translate.py
index b62dc61f1c6..da718f0d9d1 100644
--- a/bin/tools/translate.py
+++ b/bin/tools/translate.py
@@ -21,7 +21,6 @@
 
 import os
 from datetime import datetime
-from dateutil.tz import tzutc
 
 from os.path import join
 import fnmatch
@@ -281,7 +280,7 @@ class TinyPoFile(object):
                               'version': release.version,
                               'modules': reduce(lambda s, m: s + "#\t* %s\n" % m, modules, ""),
                               'bugmail': release.support_email,
-                              'now': datetime.now(tzutc()).strftime('%Y-%m-%d %H:%M:%S%z'),
+                              'now': datetime.utcnow().strftime('%Y-%m-%d %H:%M:%S%z')+"+0000",
                             }
                           )
 

From facd84394b7d541ce595e56f7b9a26f54aa982bd Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Tue, 2 Feb 2010 04:47:54 +0000
Subject: [PATCH 20/68] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100202044754-n3k3sfhvjt0dfcex
---
 bin/addons/base/i18n/hr.po | 115 ++++++-----
 bin/addons/base/i18n/ja.po |   6 +-
 bin/addons/base/i18n/tr.po | 384 +++++++++++++++++++------------------
 debian/po/hr.po            |  42 ++++
 4 files changed, 300 insertions(+), 247 deletions(-)
 create mode 100644 debian/po/hr.po

diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po
index a4802ee3b98..97f71727395 100644
--- a/bin/addons/base/i18n/hr.po
+++ b/bin/addons/base/i18n/hr.po
@@ -7,24 +7,24 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2009-12-29 05:47+0000\n"
-"Last-Translator: Damir <damir.tusek@gmail.com>\n"
+"PO-Revision-Date: 2010-02-01 10:37+0000\n"
+"Last-Translator: goranc <goranc@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: 2010-01-14 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-02-02 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
 msgid "Saint Helena"
-msgstr ""
+msgstr "Sveta Helena"
 
 #. module: base
 #: wizard_view:res.partner.sms_send,init:0
 msgid "SMS - Gateway: clickatell"
-msgstr ""
+msgstr "SMS - Gateway: clickatell"
 
 #. module: base
 #: view:res.lang:0
@@ -40,18 +40,18 @@ msgstr "Meta podaci"
 #: field:ir.ui.view,arch:0
 #: field:ir.ui.view.custom,arch:0
 msgid "View Architecture"
-msgstr ""
+msgstr "Arhitektura pogleda"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "You can not create this kind of document! (%s)"
-msgstr ""
+msgstr "Ne možete izraditi ovu vrstu dokumenta (%s)"
 
 #. module: base
 #: wizard_field:module.lang.import,init,code:0
 msgid "Code (eg:en__US)"
-msgstr ""
+msgstr "Šifra (npr: hr__HR)"
 
 #. module: base
 #: view:workflow:0
@@ -63,7 +63,7 @@ msgstr ""
 #. module: base
 #: view:wizard.module.lang.export:0
 msgid "To browse official translations, you can visit this link: "
-msgstr ""
+msgstr "Za pregledavanje službenih prijevoda, možete posjetiti ovaj link: "
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -73,12 +73,12 @@ msgstr "Mađarski / Magyar"
 #. module: base
 #: field:ir.actions.server,wkf_model_id:0
 msgid "Workflow On"
-msgstr ""
+msgstr "Tijek procesa aktivan"
 
 #. module: base
 #: view:ir.module.module:0
 msgid "Created Views"
-msgstr ""
+msgstr "Stvoreni pogledi"
 
 #. module: base
 #: view:workflow.activity:0
@@ -88,12 +88,12 @@ msgstr ""
 #. module: base
 #: selection:ir.report.custom,frequency:0
 msgid "Yearly"
-msgstr ""
+msgstr "Godišnje"
 
 #. module: base
 #: field:ir.actions.act_window,target:0
 msgid "Target Window"
-msgstr ""
+msgstr "Ciljni prozor"
 
 #. module: base
 #: model:ir.actions.todo,note:base.config_wizard_simple_view
@@ -106,65 +106,71 @@ msgid ""
 "understand. You will be able to switch to the extended view later.\n"
 "            "
 msgstr ""
+"Odaberite između \"Pojednostavljenog sučelja\" ili proširenog.\n"
+"Ako testirate ili koristite OpenERP prvi put, preporučamo vam korištenje\n"
+"pojednostavljenog sučelja, koje ima manje opcija i polja, ali je "
+"jednostavnije za \n"
+"razumijevanje. Bit ćete u mogućnosti prebaciti u prošireni prikaz kasnije.\n"
+"            "
 
 #. module: base
 #: field:ir.rule,operand:0
 msgid "Operand"
-msgstr ""
+msgstr "Operator"
 
 #. module: base
 #: model:res.country,name:base.kr
 msgid "South Korea"
-msgstr ""
+msgstr "Republika Korea"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_workflow_transition_form
 #: model:ir.ui.menu,name:base.menu_workflow_transition
 #: view:workflow.activity:0
 msgid "Transitions"
-msgstr ""
+msgstr "Prijelazi"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_view_custom
 msgid "ir.ui.view.custom"
-msgstr ""
+msgstr "ir.ui.view.custom"
 
 #. module: base
 #: model:res.country,name:base.sz
 msgid "Swaziland"
-msgstr ""
+msgstr "Swaziland"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_report_custom
 #: selection:ir.ui.menu,action:0
 msgid "ir.actions.report.custom"
-msgstr ""
+msgstr "ir.actions.report.custom"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CANCEL"
-msgstr ""
+msgstr "STOCK_CANCEL"
 
 #. module: base
 #: field:ir.report.custom,sortby:0
 msgid "Sorted By"
-msgstr ""
+msgstr "Poredano prema"
 
 #. module: base
 #: field:ir.sequence,number_increment:0
 msgid "Increment Number"
-msgstr ""
+msgstr "Povećati za broj"
 
 #. 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 ""
+msgstr "Struktura tvrtke"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_report_custom_fields
 msgid "ir.report.custom.fields"
-msgstr ""
+msgstr "ir.report.custom.fields"
 
 #. module: base
 #: view:res.partner:0
@@ -175,33 +181,33 @@ msgstr ""
 #: code:addons/base/module/wizard/wizard_export_lang.py:0
 #, python-format
 msgid "new"
-msgstr ""
+msgstr "novi"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_GOTO_TOP"
-msgstr ""
+msgstr "STOCK_GOTO_TOP"
 
 #. module: base
 #: field:ir.actions.report.custom,multi:0
 #: field:ir.actions.report.xml,multi:0
 msgid "On multiple doc."
-msgstr ""
+msgstr "Na više dokum."
 
 #. module: base
 #: field:ir.module.category,module_nr:0
 msgid "Number of Modules"
-msgstr ""
+msgstr "Broj modula"
 
 #. module: base
 #: field:res.partner.bank.type.field,size:0
 msgid "Max. Size"
-msgstr ""
+msgstr "Max. veličina"
 
 #. module: base
 #: field:res.partner.address,name:0
 msgid "Contact Name"
-msgstr ""
+msgstr "Naziv kontakta"
 
 #. module: base
 #: code:addons/base/module/wizard/wizard_export_lang.py:0
@@ -210,126 +216,129 @@ msgid ""
 "Save this document to a %s file and edit it with a specific software or a "
 "text editor. The file encoding is UTF-8."
 msgstr ""
+"Spremite ovaj dokument u %s datoteku i uredite ga sa specifičnim softverom "
+"ili tekst editorom. Standard kodiranja znakova datoteke je UTF-8."
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_DELETE"
-msgstr ""
+msgstr "STOCK_DELETE"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "Password mismatch !"
-msgstr ""
+msgstr "Nepodudarnost lozinke !"
 
 #. module: base
 #: code:addons/base/module/module.py:0
 #, python-format
 msgid "This url '%s' must provide an html file with links to zip modules"
 msgstr ""
+"Ovaj url '%s' mora sadržavati html datoteku sa linkovima na zip modula"
 
 #. module: base
 #: selection:res.request,state:0
 msgid "active"
-msgstr ""
+msgstr "aktivno"
 
 #. module: base
 #: field:ir.actions.wizard,wiz_name:0
 msgid "Wizard Name"
-msgstr ""
+msgstr "Naziv čarobnjaka"
 
 #. module: base
 #: view:res.lang:0
 msgid "%y - Year without century as a decimal number [00,99]."
-msgstr ""
+msgstr "%y - Godina bez stoljeća kao decimalni broj [00,99]"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_GOTO_FIRST"
-msgstr ""
+msgstr "STOCK_GOTO_FIRST"
 
 #. module: base
 #: help:ir.rule.group,rules:0
 msgid "The rule is satisfied if at least one test is True"
-msgstr ""
+msgstr "Pravilo je zadovoljeno ako je barem jedan test točan"
 
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
-msgstr ""
+msgstr "Dobiti maksimum"
 
 #. module: base
 #: help:ir.actions.act_window,limit:0
 msgid "Default limit for the list view"
-msgstr ""
+msgstr "Zadano ograničenje broja stavki u prikazu popisa"
 
 #. module: base
 #: field:ir.model.data,date_update:0
 msgid "Update Date"
-msgstr ""
+msgstr "Datum ažuriranja"
 
 #. module: base
 #: field:ir.actions.act_window,src_model:0
 msgid "Source Object"
-msgstr ""
+msgstr "Izvorni objekt"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: view:ir.actions.todo:0
 #: model:ir.ui.menu,name:base.menu_ir_actions_todo_form
 msgid "Config Wizard Steps"
-msgstr ""
+msgstr "Koraci konfiguracijskog čarobnjaka"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_view_sc
 msgid "ir.ui.view_sc"
-msgstr ""
+msgstr "ir.ui.view_sc"
 
 #. module: base
 #: field:ir.model.access,group_id:0
 #: field:ir.rule,rule_group:0
 msgid "Group"
-msgstr ""
+msgstr "Grupa"
 
 #. module: base
 #: field:ir.exports.line,name:0
 #: field:ir.translation,name:0
 #: field:res.partner.bank.type.field,name:0
 msgid "Field Name"
-msgstr ""
+msgstr "Naziv polja"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_uninstall
 #: model:ir.ui.menu,name:base.menu_module_tree_uninstall
 msgid "Uninstalled modules"
-msgstr ""
+msgstr "Deinstalirani moduli"
 
 #. module: base
 #: selection:ir.actions.report.xml,report_type:0
 msgid "txt"
-msgstr ""
+msgstr "txt"
 
 #. module: base
 #: wizard_view:server.action.create,init:0
 #: wizard_field:server.action.create,init,type:0
 msgid "Select Action Type"
-msgstr ""
+msgstr "Odaberite tip akcije"
 
 #. module: base
 #: selection:ir.actions.todo,type:0
 msgid "Configure"
-msgstr ""
+msgstr "Podesi"
 
 #. module: base
 #: model:res.country,name:base.tv
 msgid "Tuvalu"
-msgstr ""
+msgstr "Tuvalu"
 
 #. module: base
 #: selection:ir.model,state:0
 #: selection:ir.model.grid,state:0
 msgid "Custom Object"
-msgstr ""
+msgstr "Posebni objekt"
 
 #. module: base
 #: field:res.lang,date_format:0
@@ -340,12 +349,12 @@ msgstr ""
 #: field:res.bank,email:0
 #: field:res.partner.address,email:0
 msgid "E-Mail"
-msgstr ""
+msgstr "Email"
 
 #. module: base
 #: model:res.country,name:base.an
 msgid "Netherlands Antilles"
-msgstr ""
+msgstr "Nizozemski Antili"
 
 #. module: base
 #: code:addons/base/res/res_user.py:0
diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po
index 54984a2faab..3688ec5e3b2 100644
--- a/bin/addons/base/i18n/ja.po
+++ b/bin/addons/base/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-01-31 06:40+0000\n"
-"Last-Translator: Teru <Unknown>\n"
+"PO-Revision-Date: 2010-02-01 05:36+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-01 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-02-02 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/tr.po b/bin/addons/base/i18n/tr.po
index fc5d6b8918c..4eacd20c693 100644
--- a/bin/addons/base/i18n/tr.po
+++ b/bin/addons/base/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-01-29 05:27+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-02-01 19:22+0000\n"
+"Last-Translator: Oktay Altunergil <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: 2010-01-30 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-02-02 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -270,7 +270,7 @@ msgstr "En Fazlayı Getir"
 #. module: base
 #: help:ir.actions.act_window,limit:0
 msgid "Default limit for the list view"
-msgstr "Listeleme görünümü için varsayılan sınır"
+msgstr "Listeleme görünümü için öntanımlı sınır"
 
 #. module: base
 #: field:ir.model.data,date_update:0
@@ -1502,7 +1502,7 @@ msgstr "Başlatılacak Eylem"
 #: selection:ir.report.custom.fields,fc3_op:0
 #: selection:ir.rule,operator:0
 msgid "in"
-msgstr ""
+msgstr "içinde"
 
 #. module: base
 #: field:ir.actions.url,target:0
@@ -2457,7 +2457,7 @@ msgstr "Kısıtlama"
 #: selection:ir.values,key:0
 #: selection:res.partner.address,type:0
 msgid "Default"
-msgstr "Varsayılan"
+msgstr "Öntanımlı"
 
 #. module: base
 #: field:ir.model.fields,required:0
@@ -3389,12 +3389,12 @@ msgstr ""
 #. module: base
 #: field:ir.ui.view_sc,resource:0
 msgid "Resource Name"
-msgstr ""
+msgstr "Kaynak Adı"
 
 #. module: base
 #: selection:ir.cron,interval_type:0
 msgid "Hours"
-msgstr ""
+msgstr "Saat"
 
 #. module: base
 #: model:res.country,name:base.gp
@@ -3415,7 +3415,7 @@ msgstr ""
 #. module: base
 #: rml:ir.module.reference:0
 msgid "Directory"
-msgstr ""
+msgstr "Dizin"
 
 #. module: base
 #: field:wizard.ir.model.menu.create,name:0
@@ -3425,12 +3425,12 @@ msgstr ""
 #. module: base
 #: field:ir.report.custom,title:0
 msgid "Report Title"
-msgstr ""
+msgstr "Rapor Başlığı"
 
 #. module: base
 #: field:ir.report.custom.fields,fontcolor:0
 msgid "Font color"
-msgstr ""
+msgstr "Yazıtipi rengi"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -3440,7 +3440,7 @@ msgstr "STOCK_SORT_DESCENDING"
 #. module: base
 #: model:res.country,name:base.my
 msgid "Malaysia"
-msgstr ""
+msgstr "Malezya"
 
 #. module: base
 #: model:ir.model,name:base.model_res_request_history
@@ -3468,7 +3468,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.cv
 msgid "Cape Verde"
-msgstr ""
+msgstr "Yeşil Burun Adaları"
 
 #. module: base
 #: code:addons/base/module/module.py:0
@@ -3483,7 +3483,7 @@ msgstr ""
 #: field:res.partner,events:0
 #: field:res.partner.event,name:0
 msgid "Events"
-msgstr ""
+msgstr "Etkinlikler"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_roles
@@ -3521,12 +3521,12 @@ msgstr ""
 #. module: base
 #: field:workflow.transition,role_id:0
 msgid "Role Required"
-msgstr ""
+msgstr "Gerekli Rol"
 
 #. module: base
 #: view:ir.module.module:0
 msgid "Created Menus"
-msgstr ""
+msgstr "Menüler Oluşturuldu"
 
 #. module: base
 #: field:workflow.triggers,workitem_id:0
@@ -3551,7 +3551,7 @@ msgstr "STOCK_ZOOM_OUT"
 #: field:ir.values,action_id:0
 #: selection:ir.values,key:0
 msgid "Action"
-msgstr ""
+msgstr "Eylem"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -3576,22 +3576,22 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.fj
 msgid "Fiji"
-msgstr ""
+msgstr "Fiji"
 
 #. module: base
 #: field:ir.model.fields,size:0
 msgid "Size"
-msgstr ""
+msgstr "Boyut"
 
 #. module: base
 #: model:res.country,name:base.sd
 msgid "Sudan"
-msgstr ""
+msgstr "Sudan"
 
 #. module: base
 #: view:res.lang:0
 msgid "%m - Month as a decimal number [01,12]."
-msgstr ""
+msgstr "%m - Ay ondalık sayı olarak [01,12]."
 
 #. module: base
 #: view:wizard.module.lang.export:0
@@ -3601,7 +3601,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.fm
 msgid "Micronesia"
-msgstr ""
+msgstr "Mikronezya"
 
 #. module: base
 #: view:res.request.history:0
@@ -3613,17 +3613,17 @@ msgstr ""
 #: field:ir.module.module,menus_by_module:0
 #: view:res.groups:0
 msgid "Menus"
-msgstr ""
+msgstr "Menüler"
 
 #. module: base
 #: model:res.country,name:base.il
 msgid "Israel"
-msgstr ""
+msgstr "İsrail"
 
 #. module: base
 #: model:ir.actions.wizard,name:base.wizard_server_action_create
 msgid "Create Action"
-msgstr ""
+msgstr "Eylem Oluştur"
 
 #. module: base
 #: selection:ir.actions.report.xml,report_type:0
@@ -3633,12 +3633,12 @@ msgstr ""
 #. module: base
 #: selection:ir.actions.report.xml,report_type:0
 msgid "html"
-msgstr ""
+msgstr "html"
 
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
-msgstr ""
+msgstr "Zaman Biçimi"
 
 #. module: base
 #: wizard_view:module.upgrade,next:0
@@ -3648,7 +3648,7 @@ msgstr ""
 #. module: base
 #: view:ir.module.module:0
 msgid "Defined Reports"
-msgstr ""
+msgstr "Tanımlı Raporlar"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -3658,7 +3658,7 @@ msgstr ""
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "Report xml"
-msgstr ""
+msgstr "Rapor xml"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
@@ -3667,7 +3667,7 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_module_tree
 #: field:wizard.module.lang.export,modules:0
 msgid "Modules"
-msgstr ""
+msgstr "Modüller"
 
 #. module: base
 #: selection:workflow.activity,kind:0
@@ -3684,13 +3684,13 @@ msgstr "STOCK_UNDO"
 #. module: base
 #: field:workflow.transition,signal:0
 msgid "Signal (button Name)"
-msgstr ""
+msgstr "Sinyal (Düğme adı)"
 
 #. module: base
 #: view:res.bank:0
 #: field:res.partner,bank_ids:0
 msgid "Banks"
-msgstr ""
+msgstr "Bankalar"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -3741,12 +3741,12 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.uk
 msgid "United Kingdom"
-msgstr ""
+msgstr "Birleşik Krallık (İngiltere)"
 
 #. module: base
 #: view:ir.actions.server:0
 msgid "Create / Write"
-msgstr ""
+msgstr "Oluştur / Yaz"
 
 #. module: base
 #: help:res.partner.category,active:0
@@ -3756,12 +3756,12 @@ msgstr ""
 #. module: base
 #: rml:ir.module.reference:0
 msgid "Object:"
-msgstr ""
+msgstr "Nesne:"
 
 #. module: base
 #: model:res.country,name:base.bw
 msgid "Botswana"
-msgstr ""
+msgstr "Botsvana"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_title_partner
@@ -3773,7 +3773,7 @@ msgstr "Ortak Ünvanları"
 #. module: base
 #: selection:ir.actions.todo,type:0
 msgid "Service"
-msgstr ""
+msgstr "Hizmet"
 
 #. module: base
 #: help:ir.actions.act_window,auto_refresh:0
@@ -3828,7 +3828,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
 msgid "Installed modules"
-msgstr ""
+msgstr "Yüklü modüller"
 
 #. module: base
 #: model:res.country,name:base.lc
@@ -3839,7 +3839,7 @@ msgstr ""
 #: model:ir.model,name:base.model_maintenance_contract
 #: view:maintenance.contract:0
 msgid "Maintenance Contract"
-msgstr ""
+msgstr "Bakım Sözleşmesi"
 
 #. module: base
 #: help:ir.actions.server,trigger_obj_id:0
@@ -3871,7 +3871,7 @@ msgstr "Federal Eyalet"
 #. module: base
 #: model:res.country,name:base.io
 msgid "British Indian Ocean Territory"
-msgstr ""
+msgstr "Hint Okyanusu İngiliz Bölgesi"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -3881,13 +3881,13 @@ msgstr ""
 #. module: base
 #: field:maintenance.contract,date_start:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Başlangıç Tarihi"
 
 #. module: base
 #: view:ir.model:0
 #: field:ir.model.fields,ttype:0
 msgid "Field Type"
-msgstr ""
+msgstr "Alan Türü"
 
 #. module: base
 #: field:res.country.state,code:0
@@ -3902,32 +3902,32 @@ msgstr ""
 #. module: base
 #: selection:res.lang,direction:0
 msgid "Left-to-Right"
-msgstr ""
+msgstr "Soldan sağa"
 
 #. module: base
 #: field:res.lang,translatable:0
 msgid "Translatable"
-msgstr ""
+msgstr "Tercüme edilebilir"
 
 #. module: base
 #: model:res.country,name:base.vn
 msgid "Vietnam"
-msgstr ""
+msgstr "Vietnam"
 
 #. module: base
 #: field:res.users,signature:0
 msgid "Signature"
-msgstr ""
+msgstr "İmza"
 
 #. module: base
 #: field:res.partner.category,complete_name:0
 msgid "Full Name"
-msgstr ""
+msgstr "Tam Ad"
 
 #. module: base
 #: model:res.country,name:base.mz
 msgid "Mozambique"
-msgstr ""
+msgstr "Mozambik"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.grant_menu_access
@@ -3939,7 +3939,7 @@ msgstr ""
 #: field:ir.actions.server,message:0
 #: wizard_field:res.partner.spam_send,init,text:0
 msgid "Message"
-msgstr ""
+msgstr "İleti"
 
 #. module: base
 #: field:ir.actions.act_window.view,multi:0
@@ -3956,7 +3956,7 @@ msgstr "Kişiler"
 #. module: base
 #: model:res.country,name:base.fo
 msgid "Faroe Islands"
-msgstr ""
+msgstr "Faroe Adaları"
 
 #. module: base
 #: model:ir.actions.wizard,name:base.wizard_upgrade
@@ -3967,12 +3967,12 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.maintenance
 msgid "Maintenance"
-msgstr ""
+msgstr "Bakım"
 
 #. module: base
 #: model:res.country,name:base.mp
 msgid "Northern Mariana Islands"
-msgstr ""
+msgstr "Kuzey Mariana Adaları"
 
 #. module: base
 #: wizard_view:module.lang.import,init:0
@@ -3988,7 +3988,7 @@ msgstr ""
 #: rml:ir.module.reference:0
 #: field:maintenance.contract.module,version:0
 msgid "Version"
-msgstr ""
+msgstr "Sürüm"
 
 #. module: base
 #: model:ir.model,name:base.model_wizard_ir_model_menu_create
@@ -3998,7 +3998,7 @@ msgstr ""
 #. module: base
 #: view:workflow.transition:0
 msgid "Transition"
-msgstr ""
+msgstr "Geçiş"
 
 #. module: base
 #: field:ir.actions.todo,active:0
@@ -4016,17 +4016,17 @@ msgstr ""
 #: field:res.request,active:0
 #: field:res.users,active:0
 msgid "Active"
-msgstr ""
+msgstr "Etkin"
 
 #. module: base
 #: model:res.country,name:base.na
 msgid "Namibia"
-msgstr ""
+msgstr "Namibya"
 
 #. module: base
 #: model:res.country,name:base.mn
 msgid "Mongolia"
-msgstr ""
+msgstr "Moğolistan"
 
 #. module: base
 #: code:addons/base/ir/ir_actions.py:0
@@ -4037,7 +4037,7 @@ msgstr ""
 #: code:addons/base/res/res_user.py:0
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Hata"
 
 #. module: base
 #: view:res.partner.som:0
@@ -4052,7 +4052,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.bi
 msgid "Burundi"
-msgstr ""
+msgstr "Burundi"
 
 #. module: base
 #: wizard_button:base.module.import,import,open_window:0
@@ -4062,12 +4062,12 @@ msgstr ""
 #: wizard_button:server.action.create,step_1,end:0
 #: view:wizard.module.lang.export:0
 msgid "Close"
-msgstr ""
+msgstr "Kapat"
 
 #. module: base
 #: model:res.country,name:base.bt
 msgid "Bhutan"
-msgstr ""
+msgstr "Bütan"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_11
@@ -4077,12 +4077,12 @@ msgstr ""
 #. module: base
 #: selection:ir.actions.url,target:0
 msgid "This Window"
-msgstr ""
+msgstr "Bu Pencere"
 
 #. module: base
 #: field:wizard.module.lang.export,format:0
 msgid "File Format"
-msgstr ""
+msgstr "Dosya Biçimi"
 
 #. module: base
 #: field:res.lang,iso_code:0
@@ -4116,7 +4116,7 @@ msgstr ""
 #: wizard_field:res.partner.sms_send,init,password:0
 #: field:res.users,password:0
 msgid "Password"
-msgstr ""
+msgstr "Parola"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_model_fields
@@ -4129,12 +4129,12 @@ msgstr ""
 #: field:ir.report.custom,fields_child0:0
 #: model:ir.ui.menu,name:base.ir_model_model_fields
 msgid "Fields"
-msgstr ""
+msgstr "Alanlar"
 
 #. module: base
 #: wizard_view:base.module.import,import:0
 msgid "Module successfully imported !"
-msgstr ""
+msgstr "Modül başarıyla içeriye aktarıldı !"
 
 #. module: base
 #: field:res.company,rml_header2:0
@@ -4144,7 +4144,7 @@ msgstr ""
 #. module: base
 #: selection:ir.report.custom,print_format:0
 msgid "a4"
-msgstr ""
+msgstr "a4"
 
 #. module: base
 #: field:ir.actions.act_window,search_view_id:0
@@ -4164,7 +4164,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
-msgstr ""
+msgstr "Myanmar"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -4181,17 +4181,17 @@ msgstr "STOCK_MEDIA_NEXT"
 #: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
-msgstr ""
+msgstr "Cadde"
 
 #. module: base
 #: model:res.country,name:base.yu
 msgid "Yugoslavia"
-msgstr ""
+msgstr "Yugoslavya"
 
 #. module: base
 #: wizard_view:module.upgrade,next:0
 msgid "Note that this operation my take a few minutes."
-msgstr ""
+msgstr "Bu işlem birkaç dakika sürebilir."
 
 #. module: base
 #: field:ir.model.data,name:0
@@ -4201,7 +4201,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.ca
 msgid "Canada"
-msgstr ""
+msgstr "Kanada"
 
 #. module: base
 #: field:ir.actions.report.xml,report_name:0
@@ -4221,7 +4221,7 @@ msgstr "Ayarlarımı değiştir"
 #. module: base
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Eylem tanımlamasında geçersiz model adı."
 
 #. module: base
 #: wizard_field:res.partner.sms_send,init,text:0
@@ -4236,12 +4236,12 @@ msgstr "STOCK_EDIT"
 #. module: base
 #: model:res.country,name:base.cm
 msgid "Cameroon"
-msgstr ""
+msgstr "Kamerun"
 
 #. module: base
 #: model:res.country,name:base.bf
 msgid "Burkina Faso"
-msgstr ""
+msgstr "Burkina Faso"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -4256,12 +4256,12 @@ msgstr "Atlandı"
 #. module: base
 #: selection:ir.model.fields,state:0
 msgid "Custom Field"
-msgstr ""
+msgstr "Özel Alan"
 
 #. module: base
 #: model:res.country,name:base.cc
 msgid "Cocos (Keeling) Islands"
-msgstr ""
+msgstr "Kokos (Keeling) Adaları"
 
 #. module: base
 #: field:workflow.instance,uid:0
@@ -4278,7 +4278,7 @@ msgstr ""
 #. module: base
 #: view:res.lang:0
 msgid "11. %U or %W       ==> 48 (49th week)"
-msgstr ""
+msgstr "11. %U or %W ==> 48 (49. hafta)"
 
 #. module: base
 #: model:ir.model,name:base.model_res_partner_bank_type_field
@@ -4299,7 +4299,7 @@ msgstr ""
 #: wizard_view:server.action.create,step_1:0
 #: wizard_field:server.action.create,step_1,report:0
 msgid "Select Report"
-msgstr ""
+msgstr "Raporu Seçin"
 
 #. module: base
 #: field:ir.report.custom.fields,fc1_condition:0
@@ -4311,7 +4311,7 @@ msgstr "durum"
 #. module: base
 #: rml:ir.module.reference:0
 msgid "1cm 28cm 20cm 28cm"
-msgstr ""
+msgstr "1cm 28cm 20cm 28cm"
 
 #. module: base
 #: field:ir.sequence,suffix:0
@@ -4321,7 +4321,7 @@ msgstr "SonEk"
 #. module: base
 #: model:res.country,name:base.mo
 msgid "Macau"
-msgstr ""
+msgstr "Makau"
 
 #. module: base
 #: model:ir.actions.report.xml,name:base.res_partner_address_report
@@ -4351,7 +4351,7 @@ msgstr "STOCK_NEW"
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "None"
-msgstr ""
+msgstr "Hiçbiri"
 
 #. module: base
 #: view:ir.report.custom.fields:0
@@ -4387,12 +4387,12 @@ msgstr "STOCK_ABOUT"
 #: field:ir.module.category,parent_id:0
 #: field:res.partner.category,parent_id:0
 msgid "Parent Category"
-msgstr ""
+msgstr "Ana Kategori"
 
 #. module: base
 #: model:res.country,name:base.fi
 msgid "Finland"
-msgstr ""
+msgstr "Finlandiya"
 
 #. module: base
 #: selection:res.partner.address,type:0
@@ -4408,14 +4408,14 @@ msgstr ""
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Uninstall"
-msgstr ""
+msgstr "Kaldırmayı İptal et"
 
 #. module: base
 #: view:res.bank:0
 #: view:res.partner:0
 #: view:res.partner.address:0
 msgid "Communication"
-msgstr ""
+msgstr "İletişim"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_server_object_lines
@@ -4426,17 +4426,17 @@ msgstr ""
 #: code:addons/base/module/module.py:0
 #, python-format
 msgid "Module %s: Invalid Quality Certificate"
-msgstr ""
+msgstr "Modül %s: Geçersiz Kalite Belgesi"
 
 #. module: base
 #: model:res.country,name:base.kw
 msgid "Kuwait"
-msgstr ""
+msgstr "Kuveyt"
 
 #. module: base
 #: field:workflow.workitem,inst_id:0
 msgid "Instance"
-msgstr ""
+msgstr "Örnek"
 
 #. module: base
 #: help:ir.actions.report.xml,attachment:0
@@ -4449,7 +4449,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.ng
 msgid "Nigeria"
-msgstr ""
+msgstr "Nijerya"
 
 #. module: base
 #: model:ir.model,name:base.model_res_partner_event
@@ -4484,7 +4484,7 @@ msgstr "STOCK_CLOSE"
 #. module: base
 #: model:res.country,name:base.hk
 msgid "Hong Kong"
-msgstr ""
+msgstr "Hong Kong"
 
 #. module: base
 #: help:ir.actions.server,name:0
@@ -4504,12 +4504,12 @@ msgstr "STOCK_BOLD"
 #. module: base
 #: model:res.country,name:base.ph
 msgid "Philippines"
-msgstr ""
+msgstr "Filipinler"
 
 #. module: base
 #: model:res.country,name:base.ma
 msgid "Morocco"
-msgstr ""
+msgstr "Fas"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -4519,7 +4519,7 @@ msgstr ""
 #. module: base
 #: view:res.lang:0
 msgid "2.  %a ,%A         ==> Fri, Friday"
-msgstr ""
+msgstr "2. %a ,%A ==> Cum, Cuma"
 
 #. module: base
 #: wizard_view:module.lang.install,start:0
@@ -4527,6 +4527,8 @@ msgid ""
 "The selected language has been successfully installed. You must change the "
 "preferences of the user and open a new menu to view changes."
 msgstr ""
+"Seçilen dil başarıyla kuruldu. Bu kullanıcının tercihlerini değiştirmek ve "
+"değişiklikleri görmek için yeni bir menü açmak gerekir."
 
 #. module: base
 #: model:ir.model,name:base.model_ir_sequence
@@ -4563,17 +4565,17 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.dm
 msgid "Dominica"
-msgstr ""
+msgstr "Dominika"
 
 #. module: base
 #: model:ir.model,name:base.model_res_currency_rate
 msgid "Currency Rate"
-msgstr ""
+msgstr "Doviz Dönüşüm Oranı"
 
 #. module: base
 #: model:res.country,name:base.np
 msgid "Nepal"
-msgstr ""
+msgstr "Nepal"
 
 #. module: base
 #: field:res.partner.event,event_ical_id:0
@@ -4583,12 +4585,12 @@ msgstr ""
 #. module: base
 #: wizard_view:res.partner.sms_send,init:0
 msgid "Bulk SMS send"
-msgstr ""
+msgstr "Toplu SMS gönder"
 
 #. module: base
 #: view:res.lang:0
 msgid "%Y - Year with century as a decimal number."
-msgstr ""
+msgstr "%Y - Ondalık sayı olarak yüzyıl ile yıl. (1993)"
 
 #. module: base
 #: selection:ir.report.custom,type:0
@@ -4608,7 +4610,7 @@ msgstr ""
 #: field:res.partner.bank.type,code:0
 #: field:res.partner.function,code:0
 msgid "Code"
-msgstr ""
+msgstr "Kod"
 
 #. module: base
 #: code:addons/base/module/module.py:0
@@ -4627,7 +4629,7 @@ msgstr ""
 #. module: base
 #: view:ir.actions.configuration.wizard:0
 msgid "Continue"
-msgstr ""
+msgstr "Devam Et"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -4638,7 +4640,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.ir_property_form
 #: model:ir.ui.menu,name:base.menu_ir_property_form
 msgid "Default Properties"
-msgstr ""
+msgstr "Öntanımlı Özellikler"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -4653,34 +4655,34 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.bv
 msgid "Bouvet Island"
-msgstr ""
+msgstr "Bouvet Adası"
 
 #. module: base
 #: field:ir.report.custom,print_orientation:0
 msgid "Print orientation"
-msgstr ""
+msgstr "Baskı yönü"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_wizard_lang_export
 #: model:ir.ui.menu,name:base.menu_wizard_lang_export
 msgid "Export a Translation File"
-msgstr ""
+msgstr "Çeviri Dosyasını Dışarı Aktar"
 
 #. module: base
 #: field:ir.attachment,name:0
 msgid "Attachment Name"
-msgstr ""
+msgstr "Ek Adı"
 
 #. module: base
 #: wizard_field:module.lang.import,init,data:0
 #: field:wizard.module.lang.export,data:0
 msgid "File"
-msgstr ""
+msgstr "Dosya"
 
 #. module: base
 #: view:res.users:0
 msgid "Add User"
-msgstr ""
+msgstr "Kullanıcı Ekle"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_configuration_wizard
@@ -4690,13 +4692,13 @@ msgstr ""
 #. module: base
 #: view:res.lang:0
 msgid "%b - Abbreviated month name."
-msgstr ""
+msgstr "%b - Kısaltılmış ay adı."
 
 #. module: base
 #: field:res.partner,supplier:0
 #: model:res.partner.category,name:base.res_partner_category_8
 msgid "Supplier"
-msgstr ""
+msgstr "Tedarikçi"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -4707,29 +4709,29 @@ msgstr ""
 #. module: base
 #: view:maintenance.contract.wizard:0
 msgid "_Close"
-msgstr ""
+msgstr "_Close"
 
 #. module: base
 #: selection:maintenance.contract,kind:0
 msgid "Full"
-msgstr ""
+msgstr "Tüm"
 
 #. module: base
 #: model:res.country,name:base.as
 msgid "American Samoa"
-msgstr ""
+msgstr "Amerikan Samoası"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_model_model
 #: model:ir.model,name:base.model_ir_model
 #: model:ir.ui.menu,name:base.ir_model_model_menu
 msgid "Objects"
-msgstr ""
+msgstr "Nesneler"
 
 #. module: base
 #: field:ir.model.fields,selectable:0
 msgid "Selectable"
-msgstr ""
+msgstr "Seçilebilir"
 
 #. module: base
 #: view:res.request.link:0
@@ -4740,12 +4742,12 @@ msgstr ""
 #: field:ir.module.module,url:0
 #: field:ir.module.repository,url:0
 msgid "URL"
-msgstr ""
+msgstr "URL"
 
 #. module: base
 #: help:res.country,name:0
 msgid "The full name of the country."
-msgstr ""
+msgstr "Ülkenin tam adı."
 
 #. module: base
 #: selection:ir.actions.server,state:0
@@ -4760,7 +4762,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.ae
 msgid "United Arab Emirates"
-msgstr ""
+msgstr "Birleşik Arap Emirlikleri"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -4775,34 +4777,34 @@ msgstr ""
 #. module: base
 #: field:ir.rule.group,global:0
 msgid "Global"
-msgstr ""
+msgstr "Evrensel"
 
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
-msgstr ""
+msgstr "Çek Cumhuriyeti"
 
 #. module: base
 #: model:res.country,name:base.sb
 msgid "Solomon Islands"
-msgstr ""
+msgstr "Solomon Adaları"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "AccessError"
-msgstr ""
+msgstr "AccessError"
 
 #. module: base
 #: view:res.lang:0
 msgid "8.  %I:%M:%S %p  ==> 06:25:20 PM"
-msgstr ""
+msgstr "8. %I:%M:%S %p ==> 06:25:20 PM"
 
 #. module: base
 #: view:ir.translation:0
 #: model:ir.ui.menu,name:base.menu_translation
 msgid "Translations"
-msgstr ""
+msgstr "Çeviriler"
 
 #. module: base
 #: field:ir.sequence,padding:0
@@ -4812,18 +4814,18 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.ua
 msgid "Ukraine"
-msgstr ""
+msgstr "Ukrayna"
 
 #. module: base
 #: model:res.country,name:base.to
 msgid "Tonga"
-msgstr ""
+msgstr "Tonga"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_module_category
 #: view:ir.module.category:0
 msgid "Module Category"
-msgstr ""
+msgstr "Modül Kategorisi"
 
 #. module: base
 #: model:res.country,name:base.us
@@ -4838,7 +4840,7 @@ msgstr "Referans Rehberi"
 #. module: base
 #: model:res.country,name:base.ml
 msgid "Mali"
-msgstr ""
+msgstr "Mali"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -4848,27 +4850,27 @@ msgstr "STOCK_UNINDENT"
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
-msgstr ""
+msgstr "Aralık Numarası"
 
 #. module: base
 #: selection:maintenance.contract,kind:0
 msgid "Partial"
-msgstr ""
+msgstr "Kısmi"
 
 #. module: base
 #: model:res.country,name:base.tk
 msgid "Tokelau"
-msgstr ""
+msgstr "Tokelau"
 
 #. module: base
 #: field:ir.actions.report.xml,report_xsl:0
 msgid "XSL path"
-msgstr ""
+msgstr "XSL yolu"
 
 #. module: base
 #: model:res.country,name:base.bn
 msgid "Brunei Darussalam"
-msgstr ""
+msgstr "Brunei Sultanlığı"
 
 #. module: base
 #: field:ir.actions.act_window,view_type:0
@@ -4876,12 +4878,12 @@ msgstr ""
 #: field:ir.ui.view,type:0
 #: field:wizard.ir.model.menu.create.line,view_type:0
 msgid "View Type"
-msgstr ""
+msgstr "Görünüm Türü"
 
 #. module: base
 #: model:ir.ui.menu,name:base.next_id_2
 msgid "User Interface"
-msgstr ""
+msgstr "Kullanıcı Arayüzü"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -4891,7 +4893,7 @@ msgstr "STOCK_DIALOG_INFO"
 #. module: base
 #: field:ir.attachment,create_date:0
 msgid "Date Created"
-msgstr ""
+msgstr "Oluşturma Tarihi"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_todo
@@ -4901,7 +4903,7 @@ msgstr ""
 #. module: base
 #: view:wizard.module.lang.export:0
 msgid "Get file"
-msgstr ""
+msgstr "Dosya al"
 
 #. module: base
 #: wizard_view:module.module.update,init:0
@@ -4918,22 +4920,22 @@ msgstr "STOCK_GO_BACK"
 #. module: base
 #: view:ir.actions.act_window:0
 msgid "General Settings"
-msgstr ""
+msgstr "Genel Ayarlar"
 
 #. module: base
 #: model:ir.ui.menu,name:base.custom_shortcuts
 msgid "Custom Shortcuts"
-msgstr ""
+msgstr "Özel Kısayollar"
 
 #. module: base
 #: model:res.country,name:base.dz
 msgid "Algeria"
-msgstr ""
+msgstr "Cezayir"
 
 #. module: base
 #: model:res.country,name:base.be
 msgid "Belgium"
-msgstr ""
+msgstr "Belçika"
 
 #. module: base
 #: field:ir.translation,lang:0
@@ -4943,12 +4945,12 @@ msgstr ""
 #: field:wizard.module.lang.export,lang:0
 #: field:wizard.module.update_translations,lang:0
 msgid "Language"
-msgstr ""
+msgstr "Dil"
 
 #. module: base
 #: model:res.country,name:base.gm
 msgid "Gambia"
-msgstr ""
+msgstr "Gambiya"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_company_form
@@ -4956,14 +4958,14 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_res_company_global
 #: view:res.company:0
 msgid "Companies"
-msgstr ""
+msgstr "Şirketler"
 
 #. module: base
 #: view:ir.actions.server:0
 #: field:ir.actions.server,code:0
 #: selection:ir.actions.server,state:0
 msgid "Python Code"
-msgstr ""
+msgstr "Python Kodu"
 
 #. module: base
 #: code:addons/base/module/wizard/wizard_module_import.py:0
@@ -4989,18 +4991,18 @@ msgstr ""
 #: view:wizard.module.lang.export:0
 #: view:wizard.module.update_translations:0
 msgid "Cancel"
-msgstr ""
+msgstr "Vazgeç"
 
 #. module: base
 #: code:addons/base/ir/ir_actions.py:0
 #, python-format
 msgid "Please specify server option --smtp-from !"
-msgstr ""
+msgstr "Lütfen sunucu seçeneği belirtin  --smtp-from !"
 
 #. module: base
 #: selection:wizard.module.lang.export,format:0
 msgid "PO File"
-msgstr ""
+msgstr "PO Dosyası"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -5031,17 +5033,17 @@ msgstr ""
 #: field:res.roles,users:0
 #: view:res.users:0
 msgid "Users"
-msgstr ""
+msgstr "Kullanıcılar"
 
 #. module: base
 #: field:ir.module.module,published_version:0
 msgid "Published Version"
-msgstr ""
+msgstr "Yayınlanmış Sürüm"
 
 #. module: base
 #: model:res.country,name:base.is
 msgid "Iceland"
-msgstr ""
+msgstr "İzlanda"
 
 #. module: base
 #: view:res.users:0
@@ -5051,17 +5053,17 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
-msgstr ""
+msgstr "Almanya"
 
 #. module: base
 #: view:ir.sequence:0
 msgid "Week of the year: %(woy)s"
-msgstr ""
+msgstr "Yılın Haftası: %(woy)s"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_14
 msgid "Bad customers"
-msgstr ""
+msgstr "Kötü müşteriler"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -5071,7 +5073,7 @@ msgstr "STOCK_HARDDISK"
 #. module: base
 #: rml:ir.module.reference:0
 msgid "Reports :"
-msgstr ""
+msgstr "Raporlar :"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -5094,17 +5096,17 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.gy
 msgid "Guyana"
-msgstr ""
+msgstr "Guyana"
 
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3"
-msgstr ""
+msgstr "GPL-3"
 
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-2"
-msgstr ""
+msgstr "GPL-2"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -5119,12 +5121,12 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.hn
 msgid "Honduras"
-msgstr ""
+msgstr "Honduras"
 
 #. module: base
 #: model:res.country,name:base.eg
 msgid "Egypt"
-msgstr ""
+msgstr "Mısır"
 
 #. module: base
 #: help:ir.actions.server,model_id:0
@@ -5146,7 +5148,7 @@ msgstr "STOCK_CDROM"
 #: field:ir.model.fields,readonly:0
 #: field:res.partner.bank.type.field,readonly:0
 msgid "Readonly"
-msgstr ""
+msgstr "Salt Okunur"
 
 #. module: base
 #: field:res.partner.event,type:0
@@ -5163,7 +5165,7 @@ msgstr ""
 #: selection:ir.module.module,state:0
 #: selection:ir.module.module.dependency,state:0
 msgid "To be installed"
-msgstr ""
+msgstr "Yüklenecek"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_meta_information
@@ -5174,7 +5176,7 @@ msgstr "Taban"
 #. module: base
 #: model:res.country,name:base.lr
 msgid "Liberia"
-msgstr ""
+msgstr "Liberya"
 
 #. module: base
 #: view:ir.attachment:0
@@ -5193,39 +5195,39 @@ msgstr "Notlar"
 #: field:ir.values,value:0
 #: field:ir.values,value_unpickle:0
 msgid "Value"
-msgstr ""
+msgstr "Değer"
 
 #. module: base
 #: view:wizard.module.update_translations:0
 msgid "Update Translations"
-msgstr ""
+msgstr "Çevirileri Güncelle"
 
 #. module: base
 #: view:res.config.view:0
 msgid "Set"
-msgstr ""
+msgstr "Belirle"
 
 #. module: base
 #: model:res.country,name:base.mc
 msgid "Monaco"
-msgstr ""
+msgstr "Monako"
 
 #. module: base
 #: selection:ir.cron,interval_type:0
 msgid "Minutes"
-msgstr ""
+msgstr "Dakika"
 
 #. module: base
 #: wizard_view:module.upgrade,end:0
 #: wizard_view:module.upgrade,start:0
 msgid "The modules have been upgraded / installed !"
-msgstr ""
+msgstr "Modüller yükseltildi / yüklendi !"
 
 #. module: base
 #: selection:ir.translation,type:0
 #: view:wizard.module.lang.export:0
 msgid "Help"
-msgstr ""
+msgstr "Yardım"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_view
@@ -5235,7 +5237,7 @@ msgstr ""
 #. module: base
 #: wizard_button:server.action.create,step_1,create:0
 msgid "Create"
-msgstr ""
+msgstr "Oluştur"
 
 #. module: base
 #: field:ir.exports,export_fields:0
@@ -5245,7 +5247,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.fr
 msgid "France"
-msgstr ""
+msgstr "Fransa"
 
 #. module: base
 #: field:workflow.activity,flow_stop:0
@@ -5255,7 +5257,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.ar
 msgid "Argentina"
-msgstr ""
+msgstr "Arjantin"
 
 #. module: base
 #: model:res.country,name:base.af
@@ -5266,7 +5268,7 @@ msgstr "Afganistan"
 #: code:addons/base/module/wizard/wizard_module_import.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Hata !"
 
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field_contry
@@ -5276,13 +5278,13 @@ msgstr ""
 #. module: base
 #: field:ir.cron,interval_type:0
 msgid "Interval Unit"
-msgstr ""
+msgstr "Aralık Birimi"
 
 #. module: base
 #: field:maintenance.contract,kind:0
 #: field:workflow.activity,kind:0
 msgid "Kind"
-msgstr ""
+msgstr "Tür"
 
 #. module: base
 #: selection:ir.actions.todo,start_on:0
@@ -5293,17 +5295,17 @@ msgstr ""
 #: field:res.bank,fax:0
 #: field:res.partner.address,fax:0
 msgid "Fax"
-msgstr ""
+msgstr "Faks"
 
 #. module: base
 #: field:res.lang,thousands_sep:0
 msgid "Thousands Separator"
-msgstr ""
+msgstr "Binler Ayracı"
 
 #. module: base
 #: field:res.request,create_date:0
 msgid "Created Date"
-msgstr ""
+msgstr "Oluşturulma Tarihi"
 
 #. module: base
 #: selection:ir.report.custom,type:0
@@ -5335,7 +5337,7 @@ msgstr ""
 #. module: base
 #: selection:ir.actions.report.xml,report_type:0
 msgid "pdf"
-msgstr ""
+msgstr "pdf"
 
 #. module: base
 #: field:ir.default,company_id:0
@@ -5350,12 +5352,12 @@ msgstr ""
 #: field:res.users,company:0
 #: field:res.users,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Şirket"
 
 #. module: base
 #: model:res.country,name:base.pa
 msgid "Panama"
-msgstr ""
+msgstr "Panama"
 
 #. module: base
 #: selection:ir.report.custom,state:0
@@ -5365,17 +5367,17 @@ msgstr ""
 #. module: base
 #: view:ir.attachment:0
 msgid "Preview"
-msgstr ""
+msgstr "Ön İzleme"
 
 #. module: base
 #: view:ir.actions.configuration.wizard:0
 msgid "Skip Step"
-msgstr ""
+msgstr "Adımı Atla"
 
 #. module: base
 #: model:res.country,name:base.pn
 msgid "Pitcairn Island"
-msgstr ""
+msgstr "Pitcairn Adası"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.res_partner_event_type-act
@@ -5403,7 +5405,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
-msgstr ""
+msgstr "Tarafsız Bölge"
 
 #. module: base
 #: view:ir.model:0
@@ -5416,22 +5418,22 @@ msgstr "Özellikler"
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
-msgstr ""
+msgstr "%A - Kısaltmasız Gün Adı (Salı)"
 
 #. module: base
 #: selection:ir.cron,interval_type:0
 msgid "Months"
-msgstr ""
+msgstr "Ay"
 
 #. module: base
 #: selection:ir.translation,type:0
 msgid "Selection"
-msgstr ""
+msgstr "Seçim"
 
 #. module: base
 #: field:ir.actions.act_window,search_view:0
 msgid "Search View"
-msgstr ""
+msgstr "Arama Görünümü"
 
 #. module: base
 #: field:ir.rule,domain_force:0
@@ -5453,7 +5455,7 @@ msgstr "Eklentiler"
 #. module: base
 #: view:maintenance.contract.wizard:0
 msgid "_Validate"
-msgstr ""
+msgstr "_Validate"
 
 #. module: base
 #: model:ir.model,name:base.model_maintenance_contract_wizard
diff --git a/debian/po/hr.po b/debian/po/hr.po
new file mode 100644
index 00000000000..2f496fec9fd
--- /dev/null
+++ b/debian/po/hr.po
@@ -0,0 +1,42 @@
+# Croatian translation for openobject-server
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-server package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-server\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-24 22:41+0300\n"
+"PO-Revision-Date: 2010-02-01 09:48+0000\n"
+"Last-Translator: goranc <goranc@gmail.com>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-02-02 04:47+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. Type: string
+#. Description
+#: ../openerp-server.templates:1001
+msgid "Dedicated system account for the Open ERP server:"
+msgstr ""
+"Namjenski račun sistemskog korisnika za sustav poslužitelja Open ERP:"
+
+#. Type: string
+#. Description
+#: ../openerp-server.templates:1001
+msgid ""
+"The Open ERP server must use a dedicated account for its operation so that "
+"the system's security is not compromised by running it with superuser "
+"privileges."
+msgstr ""
+"Server Open ERP mora koristiti namjenski korisnički račun za svoj rad, tako "
+"da sigurnost sustava nije ugrožena korištenjem privilegija superkorisnika."
+
+#. Type: string
+#. Description
+#: ../openerp-server.templates:1001
+msgid "Please choose that account's username."
+msgstr "Molimo odaberite korisnički račun."

From 89a7c0de3de8079b28663e3561ab61e11c876077 Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Tue, 2 Feb 2010 04:48:18 +0000
Subject: [PATCH 21/68] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100202044818-vf8e2xkdpbf7maxw
---
 addons/account_analytic_analysis/i18n/nl.po |  10 +-
 addons/account_followup/i18n/nl.po          |  12 +-
 addons/auction/i18n/pt_BR.po                | 231 ++++++++++----------
 addons/base_contact/i18n/nl.po              |   8 +-
 addons/base_report_creator/i18n/zh_CN.po    |  10 +-
 addons/crm/i18n/es.po                       |  92 ++++----
 addons/document/i18n/nl.po                  |  10 +-
 addons/document/i18n/zh_CN.po               |  12 +-
 addons/google_map/i18n/hi.po                |  48 ++++
 addons/hr/i18n/nl.po                        |  24 +-
 addons/hr_expense/i18n/nl.po                |   8 +-
 addons/report_project/i18n/nl.po            |   8 +-
 12 files changed, 268 insertions(+), 205 deletions(-)
 create mode 100644 addons/google_map/i18n/hi.po

diff --git a/addons/account_analytic_analysis/i18n/nl.po b/addons/account_analytic_analysis/i18n/nl.po
index bfff9f3ec71..c3f12aef08c 100644
--- a/addons/account_analytic_analysis/i18n/nl.po
+++ b/addons/account_analytic_analysis/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-11 12:37+0000\n"
-"Last-Translator: Pieter J. Kersten (EduSense BV) <Unknown>\n"
+"PO-Revision-Date: 2010-02-01 15:46+0000\n"
+"Last-Translator: Jan Verlaan (Veritos) <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: 2009-12-16 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-02-02 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
@@ -191,7 +191,7 @@ msgstr "Berekend met de formule: gefactureerd bedrag - totale kosten."
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_managed
 msgid "My Accounts"
-msgstr "Mijn rekeningen"
+msgstr "Mijn kostenplaatsen"
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
@@ -335,7 +335,7 @@ msgstr "Kostenplaats"
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_overpassed
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_managed_overpassed
 msgid "Overpassed Accounts"
-msgstr "Overbrugde Kostenplaatsen"
+msgstr "Overgehevelde kostenplaatsen"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
diff --git a/addons/account_followup/i18n/nl.po b/addons/account_followup/i18n/nl.po
index 13782599c02..d756121ab3b 100644
--- a/addons/account_followup/i18n/nl.po
+++ b/addons/account_followup/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-11 13:00+0000\n"
-"Last-Translator: Pieter J. Kersten (EduSense BV) <Unknown>\n"
+"PO-Revision-Date: 2010-02-01 15:48+0000\n"
+"Last-Translator: Jan Verlaan (Veritos) <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: 2009-12-16 05:10+0000\n"
+"X-Launchpad-Export-Date: 2010-02-02 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -55,7 +55,7 @@ msgstr "Bedrag in valuta"
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Due"
-msgstr "Tot"
+msgstr "Bedrag"
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -97,7 +97,7 @@ msgstr "Soort rekening"
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Ref"
-msgstr "Ref"
+msgstr "Factuur"
 
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,next:0
@@ -253,7 +253,7 @@ msgstr ""
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
-"De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
+"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten !"
 
 #. module: account_followup
 #: wizard_button:account_followup.followup.print.all,summary,end:0
diff --git a/addons/auction/i18n/pt_BR.po b/addons/auction/i18n/pt_BR.po
index 9cd95c4bc2e..c6a12f8f1aa 100644
--- a/addons/auction/i18n/pt_BR.po
+++ b/addons/auction/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-23 02:16+0000\n"
+"PO-Revision-Date: 2010-02-01 18:21+0000\n"
 "Last-Translator: Holverat Bortolossi <holverat@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: 2010-01-24 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-02-02 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -150,74 +150,74 @@ msgstr "Antigo/pequeno produto de cobre ou estanho"
 #. module: auction
 #: field:auction.lots,paid_ach:0
 msgid "Buyer invoice reconciled"
-msgstr ""
+msgstr "Fatura do comprador foi reconciliada"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.auction_wizard_able_taken
 msgid "Mark as taken away"
-msgstr ""
+msgstr "Marcar como retirado"
 
 #. module: auction
 #: xsl:report.auction.seller.list:0
 msgid "Inv."
-msgstr ""
+msgstr "Inv."
 
 #. module: auction
 #: field:auction.deposit.cost,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "Valor"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_deposit_border
 #: model:ir.ui.menu,name:auction.menu_auction_deposit_border
 msgid "Deposit border"
-msgstr ""
+msgstr "Limite de Depósito"
 
 #. module: auction
 #: xsl:report.auction.deposit:0
 msgid "VAT"
-msgstr ""
+msgstr "Imposto sobre Valor Agregado"
 
 #. module: auction
 #: view:auction.lots:0
 msgid "Statements"
-msgstr ""
+msgstr "Demonstrações"
 
 #. module: auction
 #: xsl:flagey.huissier:0
 msgid "Adjudication"
-msgstr ""
+msgstr "Conceder"
 
 #. module: auction
 #: field:auction.dates,account_analytic_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Conta analítica"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Unclassifieds"
-msgstr ""
+msgstr "Não classificados"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_auction_dates_next_by_auction
 msgid "Objects by Auction"
-msgstr ""
+msgstr "Objetos em leilão"
 
 #. module: auction
 #: field:auction.lots,lot_num:0
 #: field:report.unclassified.objects,lot_num:0
 msgid "List Number"
-msgstr ""
+msgstr "Número de lista"
 
 #. module: auction
 #: field:auction.deposit.cost,name:0
 msgid "Cost Name"
-msgstr ""
+msgstr "Nome do custo"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antiques"
-msgstr ""
+msgstr "Antiguidades"
 
 #. module: auction
 #: view:auction.dates:0
@@ -227,17 +227,17 @@ msgstr ""
 #. module: auction
 #: field:report.auction.estimation.adj.category,lot_type:0
 msgid "Object Type"
-msgstr ""
+msgstr "Tipo de objeto"
 
 #. module: auction
 #: wizard_field:auction.lots.sms_send,init,text:0
 msgid "SMS Message"
-msgstr ""
+msgstr "Mensagem SMS"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Contemporary Art"
-msgstr ""
+msgstr "Arte contemporânea"
 
 #. module: auction
 #: view:auction.lots:0
@@ -248,7 +248,7 @@ msgstr ""
 #. module: auction
 #: field:report.auction.view,nseller:0
 msgid "No of sellers"
-msgstr ""
+msgstr "Nenhum vendedor"
 
 #. module: auction
 #: selection:auction.lots.send.aie,date_ask,lang:0
@@ -269,7 +269,7 @@ msgstr ""
 #. module: auction
 #: field:report.auction.view2,obj_margin_procent:0
 msgid "Net margin (%)"
-msgstr ""
+msgstr "Margem líquida (%)"
 
 #. module: auction
 #: selection:auction.lots,state:0
@@ -277,12 +277,12 @@ msgstr ""
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Unsold"
-msgstr ""
+msgstr "Não vendidos"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "Dates"
-msgstr ""
+msgstr "Datas"
 
 #. module: auction
 #: constraint:product.template:0
@@ -294,13 +294,13 @@ msgstr ""
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "Items"
-msgstr ""
+msgstr "Itens"
 
 #. module: auction
 #: model:account.tax,name:auction.auction_tax5
 #: field:auction.dates,seller_costs:0
 msgid "Seller Costs"
-msgstr ""
+msgstr "Custos do Vendedor"
 
 #. module: auction
 #: view:auction.bid:0
@@ -310,22 +310,22 @@ msgstr ""
 #: model:ir.actions.report.xml,name:auction.bid_auction
 #: model:ir.ui.menu,name:auction.menu_action_bid_open
 msgid "Bids"
-msgstr ""
+msgstr "Lances"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_all_objects_menu
 msgid "All objects"
-msgstr ""
+msgstr "Todos Objetos"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_auction_buyer_reporting_all2
 msgid "Buyer's auction for all months"
-msgstr ""
+msgstr "Leilão do comprador para todos os meses"
 
 #. module: auction
 #: field:auction.bid,contact_tel:0
 msgid "Contact"
-msgstr ""
+msgstr "Contato"
 
 #. module: auction
 #: field:report.auction.view,obj_ret:0
@@ -337,7 +337,7 @@ msgstr ""
 #. module: auction
 #: wizard_button:auction.lots.sms_send,init,send:0
 msgid "Send SMS"
-msgstr ""
+msgstr "Enviar SMS"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
@@ -347,38 +347,38 @@ msgstr ""
 #. module: auction
 #: field:auction.lots,sel_inv_id:0
 msgid "Seller Invoice"
-msgstr ""
+msgstr "Fatura do Vendedor"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "Commissions"
-msgstr ""
+msgstr "Comissões"
 
 #. module: auction
 #: wizard_button:auction.lots.numerotate,search,init:0
 msgid "Back"
-msgstr ""
+msgstr "Voltar"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_all_objects_unsold
 msgid "Unsold objects"
-msgstr ""
+msgstr "Objetos não vendidos"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_all_objects_sold1
 msgid "Sold Objects"
-msgstr ""
+msgstr "Objetos vendidos"
 
 #. module: auction
 #: view:report.buyer.auction2:0
 #: view:report.seller.auction2:0
 msgid "Sum net margin"
-msgstr ""
+msgstr "Somar margem líquida"
 
 #. module: auction
 #: view:auction.deposit:0
 msgid "Deposit Border Form"
-msgstr ""
+msgstr "Formuálio de Limite de Depósito"
 
 #. module: auction
 #: field:auction.bid,bid_lines:0
@@ -386,12 +386,12 @@ msgstr ""
 #: rml:bids.lots:0
 #: model:ir.model,name:auction.model_auction_bid_line
 msgid "Bid"
-msgstr ""
+msgstr "Lance"
 
 #. module: auction
 #: wizard_field:auction.lots.send.aie,date_ask,lang:0
 msgid "Langage"
-msgstr ""
+msgstr "Idioma"
 
 #. module: auction
 #: field:auction.bid_line,lot_id:0
@@ -399,7 +399,7 @@ msgstr ""
 #: view:auction.lots:0
 #: model:ir.model,name:auction.model_auction_lots
 msgid "Object"
-msgstr ""
+msgstr "Objeto"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.wizard_map_user
@@ -409,7 +409,7 @@ msgstr ""
 #. module: auction
 #: wizard_field:auction.lots.numerotate,search,lot_num:0
 msgid "Inventory Number"
-msgstr ""
+msgstr "Número de inventário"
 
 #. module: auction
 #: wizard_button:auction.lots.buyer_map,check,end:0
@@ -417,12 +417,12 @@ msgstr ""
 #: wizard_button:auction.lots.numerotate,search,end:0
 #: wizard_button:auction.lots.numerotate_cont,init,end:0
 msgid "Exit"
-msgstr ""
+msgstr "Sair"
 
 #. module: auction
 #: field:report.buyer.auction2,net_revenue:0
 msgid "Net Revenue"
-msgstr ""
+msgstr "Receita Líquida"
 
 #. module: auction
 #: view:report.buyer.auction:0
@@ -437,17 +437,17 @@ msgstr ""
 #: field:report.seller.auction,state:0
 #: field:report.unclassified.objects,state:0
 msgid "Status"
-msgstr ""
+msgstr "Situação"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.wizard_sms
 msgid "SMS Send"
-msgstr ""
+msgstr "Enviar SMS"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Cartoons"
-msgstr ""
+msgstr "Antigo/Desenhos"
 
 #. module: auction
 #: view:auction.lots:0
@@ -455,42 +455,42 @@ msgstr ""
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Sold"
-msgstr ""
+msgstr "Vendido"
 
 #. module: auction
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Erro! Você não pode criar hierarquia recursiva de funcionários."
 
 #. module: auction
 #: field:auction.bid_line,name:0
 msgid "Bid date"
-msgstr ""
+msgstr "Data do lance"
 
 #. module: auction
 #: field:auction.dates,acc_expense:0
 msgid "Expense Account"
-msgstr ""
+msgstr "Conta de despesas"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_wizard_emporte
 msgid "Deliveries Management"
-msgstr ""
+msgstr "Gerenciamento de entregas"
 
 #. module: auction
 #: field:auction.lots,obj_desc:0
 msgid "Object Description"
-msgstr ""
+msgstr "Descrição do objeto"
 
 #. module: auction
 #: selection:auction.deposit,method:0
 msgid "Contact the Seller"
-msgstr ""
+msgstr "Entre em contato com o vendedor"
 
 #. module: auction
 #: view:auction.lots:0
 msgid "Auction Objects"
-msgstr ""
+msgstr "Leilão de Objetos"
 
 #. module: auction
 #: field:auction.lots,gross_revenue:0
@@ -498,12 +498,12 @@ msgstr ""
 #: field:report.object.encoded.manager,gross_revenue:0
 #: field:report.seller.auction2,gross_revenue:0
 msgid "Gross revenue"
-msgstr ""
+msgstr "Receita bruta"
 
 #. module: auction
 #: view:report.seller.auction2:0
 msgid "Auction reporting2 form view"
-msgstr ""
+msgstr "Relatório2 de formulário de Leilão"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.wizard_pay
@@ -513,45 +513,45 @@ msgstr ""
 #. module: auction
 #: view:report.deposit.border:0
 msgid "Depositer's statistics"
-msgstr ""
+msgstr "Estatísticas dos Depositantes"
 
 #. module: auction
 #: view:auction.lots:0
 msgid "Buyer information"
-msgstr ""
+msgstr "Informações do Comprador"
 
 #. module: auction
 #: model:ir.model,name:auction.model_report_seller_auction
 msgid "Auction Reporting on seller view"
-msgstr ""
+msgstr "Relatório Leilão na visão do Vendedor"
 
 #. module: auction
 #: field:auction.lots,name2:0
 msgid "Short Description (2)"
-msgstr ""
+msgstr "Descrição resumida (2)"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_dates
 msgid "auction.dates"
-msgstr ""
+msgstr "leilão.datas"
 
 #. module: auction
 #: rml:auction.total.rml:0
 #: model:ir.ui.menu,name:auction.auction_buyers_menu
 msgid "Buyers"
-msgstr ""
+msgstr "Vendedores"
 
 #. module: auction
 #: wizard_field:auction.pay.buy,init,amount:0
 #: wizard_field:auction.pay.buy,init,amount2:0
 #: wizard_field:auction.pay.buy,init,amount3:0
 msgid "Amount paid"
-msgstr ""
+msgstr "Valor pago"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_report_latest_doposit_tree
 msgid "My Latest Deposits"
-msgstr ""
+msgstr "Meus Últimos Depósitos"
 
 #. module: auction
 #: field:auction.lots,lot_est1:0
@@ -560,32 +560,32 @@ msgstr ""
 #: field:report.auction.view,min_est:0
 #: field:report.unclassified.objects,lot_est1:0
 msgid "Minimum Estimation"
-msgstr ""
+msgstr "Estimativa mínima"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "Accounting"
-msgstr ""
+msgstr "Contabilidade"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_buyer_allmonth_view2
 msgid "Buyer's Revenues"
-msgstr ""
+msgstr "Receitas do comprador"
 
 #. module: auction
 #: model:ir.model,name:auction.model_report_auction_adjudication
 msgid "report_auction_adjudication"
-msgstr ""
+msgstr "relatório_leilão_concedido"
 
 #. module: auction
 #: field:auction.bid_line,price:0
 msgid "Maximum Price"
-msgstr ""
+msgstr "Preço máximo"
 
 #. module: auction
 #: selection:auction.lots.send.aie,date_ask,lang:0
 msgid "eng"
-msgstr ""
+msgstr "Inglês"
 
 #. module: auction
 #: view:report.buyer.auction2:0
@@ -595,17 +595,17 @@ msgstr ""
 #. module: auction
 #: wizard_view:auction.lots.sms_send,init:0
 msgid "Bulk SMS send"
-msgstr ""
+msgstr "Enviar SMS em massa"
 
 #. module: auction
 #: wizard_view:auction.taken,init:0
 msgid "Select lots which are Sold"
-msgstr ""
+msgstr "Selecione lotes que são vendidos"
 
 #. module: auction
 #: field:auction.lots,statement_id:0
 msgid "Payment"
-msgstr ""
+msgstr "Pagamento"
 
 #. module: auction
 #: selection:auction.lots.send.aie,date_ask,lang:0
@@ -615,50 +615,50 @@ msgstr ""
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Old weapons and militaria"
-msgstr ""
+msgstr "Antiguidade/Armas antigas e militares"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Oriental Arts/Chineese furnitures"
-msgstr ""
+msgstr "Antiguidade/Arte Orientas/Mobiliário Chinês"
 
 #. module: auction
 #: selection:auction.deposit,method:0
 msgid "Keep until sold"
-msgstr ""
+msgstr "Manter até vender"
 
 #. module: auction
 #: wizard_button:auction.lots.numerotate,init,choice:0
 #: wizard_button:auction.lots.send.aie,init,date_ask:0
 #: wizard_button:auction.lots.send.aie.results,init,date_ask:0
 msgid "Continue"
-msgstr ""
+msgstr "Continuar"
 
 #. module: auction
 #: field:report.object.encoded,obj_num:0
 #: field:report.object.encoded.manager,obj_num:0
 msgid "# of Encoded obj."
-msgstr ""
+msgstr "# do Objeto Codificado"
 
 #. module: auction
 #: xsl:report.auction.vnd_bordereau:0
 msgid "List N."
-msgstr ""
+msgstr "Lista N."
 
 #. module: auction
 #: field:report.deposit.border,moy_est:0
 msgid "Avg. Est"
-msgstr ""
+msgstr "Média Estimada"
 
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "# of sellers:"
-msgstr ""
+msgstr "# dos vendedores:"
 
 #. module: auction
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr "Error: código EAN invalido"
+msgstr "Erro: Código EAN inválido"
 
 #. module: auction
 #: model:ir.module.module,description:auction.module_meta_information
@@ -669,26 +669,31 @@ msgid ""
 "     Delivery Management. \n"
 "    "
 msgstr ""
+"Este módulo fornece funcionalidade para \n"
+"     gerenciar artistas, artigos, vendedores, compradores e leilão.\n"
+"     Gerenciar ofertas, registro de objetos vendidos, pagos e não pagos.\n"
+"     A administração das entregas. \n"
+"    "
 
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "# of items taken away:"
-msgstr ""
+msgstr "# de itens retirados:"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_auction_allmonth_view1
 msgid "Auction's Summary"
-msgstr ""
+msgstr "Resumo do Leilão"
 
 #. module: auction
 #: rml:buyer.list:0
 msgid "%)"
-msgstr ""
+msgstr "%)"
 
 #. module: auction
 #: wizard_view:auction.lots.able,init:0
 msgid "Confirmation set taken away"
-msgstr ""
+msgstr "Confirmação marcada como retirada"
 
 #. module: auction
 #: wizard_field:auction.lots.make_invoice,init,objects:0
@@ -697,7 +702,7 @@ msgstr ""
 #: wizard_field:auction.lots.send.aie.results,date_ask,objects:0
 #: field:report.deposit.border,nb_obj:0
 msgid "# of objects"
-msgstr ""
+msgstr "# dos Objetos"
 
 #. module: auction
 #: field:auction.lots,lot_est2:0
@@ -706,12 +711,12 @@ msgstr ""
 #: field:report.auction.view,max_est:0
 #: field:report.unclassified.objects,lot_est2:0
 msgid "Maximum Estimation"
-msgstr ""
+msgstr "Estimativa Máxima"
 
 #. module: auction
 #: field:auction.lots,buyer_price:0
 msgid "Buyer price"
-msgstr ""
+msgstr "Preço Comprador"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.auction_wizard_payer_sel
@@ -721,17 +726,17 @@ msgstr ""
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.seller_form_id
 msgid "Seller List"
-msgstr ""
+msgstr "Lista de Vendedor"
 
 #. module: auction
 #: field:auction.lots,is_ok:0
 msgid "Buyer's payment"
-msgstr ""
+msgstr "Pagamento do Comprador"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "Close + Create all invoices"
-msgstr ""
+msgstr "Fechar + Criar todas as Faturas"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.auction_catalog_flagy
@@ -741,48 +746,48 @@ msgstr ""
 #. module: auction
 #: field:auction.lot.history,price:0
 msgid "Withdrawn price"
-msgstr ""
+msgstr "Preço de retirada"
 
 #. module: auction
 #: model:account.tax,name:auction.auction_tax4
 msgid "Seller Costs1"
-msgstr ""
+msgstr "Custo1 do Venderor"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Verreries"
-msgstr ""
+msgstr "Antiguidade/Cristais"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Toys"
-msgstr ""
+msgstr "Antiguidade/Briquedos"
 
 #. module: auction
 #: field:auction.deposit,create_uid:0
 #: field:auction.lots,create_uid:0
 msgid "Created by"
-msgstr ""
+msgstr "Criado por"
 
 #. module: auction
 #: xsl:report.auction.ach_bordereau:0
 msgid "Buyer form"
-msgstr ""
+msgstr "Formulário do comprador"
 
 #. module: auction
 #: xsl:report.auction.deposit:0
 msgid "Estimate"
-msgstr ""
+msgstr "Estimativa"
 
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "# of buyers:"
-msgstr ""
+msgstr "# dos compradores:"
 
 #. module: auction
 #: field:auction.lots,costs:0
 msgid "Indirect costs"
-msgstr ""
+msgstr "Custos indiretos"
 
 #. module: auction
 #: xsl:report.auction.ach_bordereau:0
@@ -792,12 +797,12 @@ msgstr ""
 #. module: auction
 #: constraint:account.tax.code:0
 msgid "Error ! You can not create recursive accounts."
-msgstr ""
+msgstr "Erro ! Você não pode criar contas repetidas."
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_menu_root
 msgid "Auction Management"
-msgstr ""
+msgstr "Gerenciamento de leilão"
 
 #. module: auction
 #: field:auction.dates,journal_seller_id:0
@@ -807,23 +812,23 @@ msgstr ""
 #. module: auction
 #: view:report.buyer.auction:0
 msgid "Auction buyer reporting tree view"
-msgstr ""
+msgstr "Relatório de compra do leilão exibição em árvore"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_auction_artist
 msgid "Define Artists"
-msgstr ""
+msgstr "Definir artistas"
 
 #. module: auction
 #: field:auction.lot.category,name:0
 msgid "Category Name"
-msgstr ""
+msgstr "Nome da Categoria"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_report_auction_estimation_adj_category_manager
 #: model:ir.ui.menu,name:auction.menu_report_auction_estimation_adj_category_member
 msgid "Comparison of estimations"
-msgstr ""
+msgstr "Comparação das estimativas"
 
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.v_report_barcode_lot
@@ -833,34 +838,34 @@ msgstr ""
 #. module: auction
 #: wizard_button:auction.lots.numerotate,not_exist,init:0
 msgid "Retry"
-msgstr ""
+msgstr "Repetir"
 
 #. module: auction
 #: field:auction.artists,birth_death_dates:0
 msgid "Birth / Death dates"
-msgstr ""
+msgstr "Datas de Nascimento / Morte"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Jewelry"
-msgstr ""
+msgstr "Antiguidade/Jóias"
 
 #. module: auction
 #: model:ir.model,name:auction.model_report_unclassified_objects
 msgid "Unclassified objects "
-msgstr ""
+msgstr "objetos não classificados "
 
 #. module: auction
 #: wizard_button:auction.lots.numerotate_cont,init,set_number:0
 #: wizard_field:auction.lots.send.aie,date_ask,numerotation:0
 #: wizard_field:auction.lots.send.aie,init,numerotation:0
 msgid "Numerotation"
-msgstr ""
+msgstr "Numerotation"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.act_auction_lot_open_deposit
 msgid "Bordereau de dépôt"
-msgstr ""
+msgstr "Comprovante de depósito"
 
 #. module: auction
 #: xsl:report.auction.deposit:0
diff --git a/addons/base_contact/i18n/nl.po b/addons/base_contact/i18n/nl.po
index 31eb515e773..21dacd2804b 100644
--- a/addons/base_contact/i18n/nl.po
+++ b/addons/base_contact/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-11 22:28+0000\n"
-"Last-Translator: Pieter J. Kersten (EduSense BV) <Unknown>\n"
+"PO-Revision-Date: 2010-02-01 15:47+0000\n"
+"Last-Translator: Jan Verlaan (Veritos) <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: 2009-12-16 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-02-02 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
@@ -36,7 +36,7 @@ msgstr "res.partner.contact"
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
-"De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
+"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten !"
 
 #. module: base_contact
 #: field:res.partner.job,function_id:0
diff --git a/addons/base_report_creator/i18n/zh_CN.po b/addons/base_report_creator/i18n/zh_CN.po
index 69e7da8c2f5..cfd7bb92238 100644
--- a/addons/base_report_creator/i18n/zh_CN.po
+++ b/addons/base_report_creator/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-01 15:37+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-02-01 23:39+0000\n"
+"Last-Translator: mrshelly <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: 2009-12-16 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-02-02 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -22,7 +22,7 @@ msgid ""
 "Provide an expression for the field based on which you want to filter the "
 "records.\n"
 " e.g. res_partner.id=3"
-msgstr ""
+msgstr "可以使用基于字段的Python条件表达式做为过滤条件.(如 res_partner.id=3)"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,view_graph_type:0
@@ -406,6 +406,8 @@ msgid ""
 "After installing the module, it adds a menu to define custom report in\n"
 "the \"Dashboard\" menu.\n"
 msgstr ""
+"本模块可以让您使用SQL查询器新建很灵活的对象统计报表.\n"
+"安装此模块后, \"Dashboard(系统面板)\" 上会添加对应的菜单入口.\n"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,calendar_mode:0
diff --git a/addons/crm/i18n/es.po b/addons/crm/i18n/es.po
index 2440d434cc2..b03bf59f360 100644
--- a/addons/crm/i18n/es.po
+++ b/addons/crm/i18n/es.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-01-17 17:11+0000\n"
-"Last-Translator: Jaerhigo <Unknown>\n"
+"PO-Revision-Date: 2010-02-02 02:48+0000\n"
+"Last-Translator: Carlos Alberto Ospina <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: 2010-01-18 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-02-02 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
 #: field:crm.email.add.cc,name:0
 msgid "Send to"
-msgstr ""
+msgstr "Enviar a"
 
 #. module: crm
 #: help:crm.meeting,exdate:0
@@ -33,16 +33,18 @@ msgstr ""
 msgid ""
 "Check this if you want the rule to send an email to the responsible person."
 msgstr ""
+"Revise esto si quiere la regla para enviar un correo a la persona "
+"responsable."
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Title"
-msgstr ""
+msgstr "Título"
 
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_categ2
 msgid "Cases by section and category2"
-msgstr "Casos segmentados por sección y categoría 2"
+msgstr "Casos por sección y categoria2"
 
 #. module: crm
 #: wizard_field:crm.lead.partner_create,init,close:0
@@ -55,22 +57,22 @@ msgstr ""
 #: view:crm.opportunity:0
 #: view:crm.phonecall:0
 msgid "    7 Days    "
-msgstr ""
+msgstr "    7 días    "
 
 #. module: crm
 #: help:crm.menu.config_wizard,helpdesk:0
 msgid "Manages an Helpdesk service."
-msgstr ""
+msgstr "Gestiona un servicio de mesa de ayuda"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Pending Jobs"
-msgstr ""
+msgstr "Trabajos pendientes"
 
 #. module: crm
 #: field:crm.case.rule,trg_state_to:0
 msgid "Button Pressed"
-msgstr "Botón presionado"
+msgstr "Botón oprimido"
 
 #. module: crm
 #: view:crm.case:0
@@ -85,7 +87,7 @@ msgstr "Requerimiento de trabajo a finalizar"
 #. module: crm
 #: field:crm.case.stage,name:0
 msgid "Stage Name"
-msgstr ""
+msgstr "Nombre de etapa"
 
 #. module: crm
 #: view:crm.case:0
@@ -109,12 +111,12 @@ msgstr ""
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_hr
 msgid "Human Resources"
-msgstr ""
+msgstr "Recursos humanos"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ_categ2
 msgid "Cases by Opportunities, Category and Type"
-msgstr ""
+msgstr "Casos por oportunidades, categoria y tipo"
 
 #. module: crm
 #: help:crm.menu.config_wizard,claims:0
@@ -122,22 +124,24 @@ msgid ""
 "Manages the supplier and customers claims, including your corrective or "
 "preventive actions."
 msgstr ""
+"Gestiona los reclamos de proveedores y clientes, incluyendon sus acciones "
+"prevenivas ó correctivas."
 
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Amount"
-msgstr ""
+msgstr "Cantidad"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
 msgid "Normal or phone meeting for opportunity"
-msgstr ""
+msgstr "Oportunidad de reunion normal ó telefonico."
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_claim2
 #: model:crm.case.stage,name:crm.stage_meet1
 msgid "Fixed"
-msgstr ""
+msgstr "Reparado"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -146,35 +150,35 @@ msgstr ""
 #: code:addons/crm/wizard/crm_phonecall_wizard.py:0
 #, python-format
 msgid "Warning !"
-msgstr "¡Atención!"
+msgstr "Advertencia !"
 
 #. module: crm
 #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
 #, python-format
 msgid "Please specify user's email address !"
-msgstr ""
+msgstr "Por favor especiificar el nombre de usuario de correo"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Campaign"
-msgstr ""
+msgstr "Campaña"
 
 #. module: crm
 #: view:crm.opportunity:0
 msgid "Search Opportunities"
-msgstr ""
+msgstr "Busqueda de oportunidades"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_stage_tree
 #: view:report.crm.case.section.stage:0
 msgid "Cases by Section and Stage"
-msgstr ""
+msgstr "Casos por sección y estados"
 
 #. module: crm
 #: wizard_field:crm.job.meeting_set,init,duration:0
 #: wizard_field:crm.phonecall.meeting_set,init,duration:0
 msgid "Duration (Hours)"
-msgstr ""
+msgstr "Duración (Horas)"
 
 #. module: crm
 #: selection:crm.meeting,transparent:0
@@ -194,6 +198,8 @@ msgid ""
 "Section to which Case belongs to. Define Responsible user and Email account "
 "for mail gateway."
 msgstr ""
+"Sección a la cual pertenece el caso. Definir usuario responsable y cuenta de "
+"correo para correo de salida."
 
 #. module: crm
 #: view:crm.case:0
@@ -212,7 +218,7 @@ msgstr ""
 #: wizard_field:crm.phonecall.opportunity_set,opportunity,partner_id:0
 #: model:process.node,name:crm.process_node_partner0
 msgid "Partner"
-msgstr "Empresa"
+msgstr "Compañero"
 
 #. module: crm
 #: field:crm.case.categ,section_id:0
@@ -227,12 +233,13 @@ msgstr "Sección del caso"
 #. module: crm
 #: view:crm.job:0
 msgid "Proposed Salary"
-msgstr ""
+msgstr "Salario sugerido"
 
 #. module: crm
 #: help:crm.case.section,sequence:0
 msgid "Gives the sequence order when displaying a list of case sections."
 msgstr ""
+"Dar orden de la secuencia cuando se muestre la lista de casos de sección."
 
 #. module: crm
 #: code:addons/crm/wizard/crm_job_wizard.py:0
@@ -240,17 +247,17 @@ msgstr ""
 #: model:crm.case.categ,name:crm.categ_meet3
 #, python-format
 msgid "Phone Call"
-msgstr ""
+msgstr "Llamada de telefono"
 
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_stage
 msgid "Cases by section and stage"
-msgstr ""
+msgstr "Casos por secciòn  y estado"
 
 #. module: crm
 #: field:crm.case.rule,act_mail_to_email:0
 msgid "Mail to these emails"
-msgstr "Enviar correo a estos emails"
+msgstr "Correo a estos correos electronicos"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_type:0
@@ -260,7 +267,7 @@ msgstr "Ninguno"
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Special Keywords to Be Used in The Body"
-msgstr "Palabras clave especiales para ser usadas en el mensaje"
+msgstr "Palabras claves especiales para ser usadas en el cuerpo del mensaje."
 
 #. module: crm
 #: view:crm.case:0
@@ -270,12 +277,12 @@ msgstr "Palabras clave especiales para ser usadas en el mensaje"
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Send New Email"
-msgstr ""
+msgstr "Enviar nuevo correo eléctronico"
 
 #. module: crm
 #: view:crm.case.history:0
 msgid "My Histories"
-msgstr "Mis historiales"
+msgstr "Mis historias"
 
 #. module: crm
 #: field:crm.segmentation,segmentation_line:0
@@ -286,12 +293,13 @@ msgstr "Criterios"
 #: model:ir.actions.act_window,name:crm.crm_case_section_act
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_act
 msgid "Sections"
-msgstr "Secciones"
+msgstr "Secciónes"
 
 #. module: crm
 #: help:crm.menu.config_wizard,opportunity:0
 msgid "Tracks identified business opportunities for your sales pipeline."
 msgstr ""
+"Temas de oportunidades de negocio identificadas para su canal de ventas."
 
 #. module: crm
 #: view:crm.meeting:0
@@ -301,12 +309,12 @@ msgstr ""
 #. module: crm
 #: selection:crm.case.rule,trg_date_type:0
 msgid "Last Action Date"
-msgstr "Fecha última acción"
+msgstr "Fechas de ultima acción"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Appreciation"
-msgstr ""
+msgstr "Reconocimiento"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job3
@@ -316,7 +324,7 @@ msgstr ""
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_cal_subscribe
 msgid "Subscribe to a Remote calendar"
-msgstr ""
+msgstr "Suscribirse a un calendario remoto"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ-act
@@ -328,7 +336,7 @@ msgstr "Categorías"
 #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Advertencia!"
 
 #. module: crm
 #: view:crm.case:0
@@ -348,29 +356,29 @@ msgstr "Prueba de segmentación"
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadpartner0
 msgid "Prospect Partner"
-msgstr ""
+msgstr "Socio prospecto"
 
 #. module: crm
 #: view:crm.fundraising:0
 #: view:crm.opportunity:0
 msgid "Description Information"
-msgstr ""
+msgstr "Información de descripción"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Contact Name"
-msgstr ""
+msgstr "Nombre de contacto"
 
 #. module: crm
 #: selection:crm.lead.opportunity_set,create_partner,action:0
 #: selection:crm.phonecall.opportunity_set,create_partner,action:0
 msgid "Link to an existing partner"
-msgstr ""
+msgstr "Enlace al socio existente"
 
 #. module: crm
 #: field:crm.case.rule,trg_date_range_type:0
 msgid "Delay type"
-msgstr "Tipo de demora"
+msgstr "Tipo de retraso"
 
 #. module: crm
 #: view:crm.claim:0
@@ -380,12 +388,12 @@ msgstr "Tipo de demora"
 #: view:crm.opportunity:0
 #: view:crm.phonecall:0
 msgid "Contact"
-msgstr ""
+msgstr "Contacto"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Next Interview"
-msgstr ""
+msgstr "Próxima entrevista"
 
 #. module: crm
 #: field:crm.case.rule,regex_history:0
diff --git a/addons/document/i18n/nl.po b/addons/document/i18n/nl.po
index 9f209e78421..5197edaa718 100644
--- a/addons/document/i18n/nl.po
+++ b/addons/document/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-11 13:36+0000\n"
-"Last-Translator: Pieter J. Kersten (EduSense BV) <Unknown>\n"
+"PO-Revision-Date: 2010-02-01 15:45+0000\n"
+"Last-Translator: Jan Verlaan (Veritos) <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: 2009-12-16 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-02-02 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
@@ -29,14 +29,14 @@ msgstr "Bron ID"
 #. module: document
 #: field:document.directory.content,include_name:0
 msgid "Include Record Name"
-msgstr ""
+msgstr "Inclusief naam record"
 
 #. module: document
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
-"De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
+"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten !"
 
 #. module: document
 #: field:ir.actions.report.xml,model_id:0
diff --git a/addons/document/i18n/zh_CN.po b/addons/document/i18n/zh_CN.po
index ec7a89be34a..e7c646b4847 100644
--- a/addons/document/i18n/zh_CN.po
+++ b/addons/document/i18n/zh_CN.po
@@ -7,24 +7,24 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-28 08:46+0000\n"
-"Last-Translator: Jeroen Vet <Unknown>\n"
+"PO-Revision-Date: 2010-02-01 23:45+0000\n"
+"Last-Translator: mrshelly <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: 2009-12-29 04:35+0000\n"
+"X-Launchpad-Export-Date: 2010-02-02 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
 #: field:document.directory,create_date:0
 msgid "Date Created"
-msgstr "已建立日期"
+msgstr "创建时间"
 
 #. module: document
 #: field:document.directory,ressource_id:0
 msgid "Resource ID"
-msgstr "资源编码"
+msgstr "资源ID"
 
 #. module: document
 #: field:document.directory.content,include_name:0
@@ -40,7 +40,7 @@ msgstr "对象名必须以“x_”开始且不能包含任何特殊字符！"
 #. module: document
 #: field:ir.actions.report.xml,model_id:0
 msgid "Model Id"
-msgstr "模式标识符（ID）"
+msgstr "模块ID"
 
 #. module: document
 #: constraint:document.directory:0
diff --git a/addons/google_map/i18n/hi.po b/addons/google_map/i18n/hi.po
new file mode 100644
index 00000000000..c7c53978b40
--- /dev/null
+++ b/addons/google_map/i18n/hi.po
@@ -0,0 +1,48 @@
+# Hindi translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-02-01 07:18+0000\n"
+"Last-Translator: vir (Open ERP) <vir@tinyerp.com>\n"
+"Language-Team: Hindi <hi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-02-02 04:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: google_map
+#: model:ir.actions.wizard,name:google_map.wizard_google_map
+msgid "Launch Google Map"
+msgstr "आरम्भ करना Google Map"
+
+#. module: google_map
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: google_map
+#: view:res.partner:0
+#: view:res.partner.address:0
+msgid "Street2 : "
+msgstr "स्ट्रीट 2 "
+
+#. module: google_map
+#: model:ir.module.module,description:google_map.module_meta_information
+msgid ""
+"The module adds google map field in partner address\n"
+"so that we can directly open google map from the\n"
+"url widget."
+msgstr ""
+
+#. module: google_map
+#: view:res.partner:0
+#: view:res.partner.address:0
+msgid "Map"
+msgstr "नक़्शा"
diff --git a/addons/hr/i18n/nl.po b/addons/hr/i18n/nl.po
index 2fce7513ed7..62faff002b0 100644
--- a/addons/hr/i18n/nl.po
+++ b/addons/hr/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-11 13:55+0000\n"
-"Last-Translator: Pieter J. Kersten (EduSense BV) <Unknown>\n"
+"PO-Revision-Date: 2010-02-01 16:11+0000\n"
+"Last-Translator: Jan Verlaan (Veritos) <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: 2009-12-16 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-02-02 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -110,7 +110,7 @@ msgstr "Werkt van"
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action2
 msgid "Employee Hierarchy"
-msgstr "Medewerkershiërarchie"
+msgstr "Werknemershiërarchie"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_configuration
@@ -130,7 +130,7 @@ msgstr "Vrouw"
 #. module: hr
 #: view:hr.timesheet.group:0
 msgid "Working Time Category"
-msgstr "Werktijdcategorie"
+msgstr "Werktijd categorie"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_employee_tree
@@ -232,7 +232,7 @@ msgstr "Gehuwd"
 #. module: hr
 #: field:hr.timesheet,tgroup_id:0
 msgid "Employee's timesheet group"
-msgstr "Medewerkers urenstaatgroep"
+msgstr "Werknemers urenstaatgroep"
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -305,7 +305,7 @@ msgstr "Dag van de week"
 #. module: hr
 #: field:hr.employee,birthday:0
 msgid "Birthday"
-msgstr "Verjaardag"
+msgstr "Geboortedatum"
 
 #. module: hr
 #: field:hr.employee,active:0
@@ -325,12 +325,12 @@ msgstr "Contractproces werknemer"
 #. module: hr
 #: model:process.node,note:hr.process_node_openerpuser0
 msgid "Create OpenERP User"
-msgstr "Maak een OpenERP gebruiker"
+msgstr "Maak een OpenERP gebruiker aan"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_employee0
 msgid "Employee Complete Form"
-msgstr "Maak formulier compleet"
+msgstr "Maak werknemersformulier compleet"
 
 #. module: hr
 #: view:hr.department:0
@@ -356,7 +356,7 @@ msgstr "Startdatum"
 #. module: hr
 #: field:res.users,parent_id:0
 msgid "Parent Users"
-msgstr "Hoofdgebruikers"
+msgstr "Bovenliggende gebruikers"
 
 #. module: hr
 #: field:hr.employee,address_id:0
@@ -383,7 +383,7 @@ msgstr "Persoonlijke gegevens"
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
-"De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
+"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten !"
 
 #. module: hr
 #: view:hr.timesheet:0
@@ -420,7 +420,7 @@ msgstr "Privé-adres"
 #. module: hr
 #: view:hr.department:0
 msgid "department"
-msgstr "Afdeling"
+msgstr "afdeling"
 
 #. module: hr
 #: field:hr.employee,country_id:0
diff --git a/addons/hr_expense/i18n/nl.po b/addons/hr_expense/i18n/nl.po
index e3d4b1ef2d4..98deba3e919 100644
--- a/addons/hr_expense/i18n/nl.po
+++ b/addons/hr_expense/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-11 14:19+0000\n"
-"Last-Translator: Pieter J. Kersten (EduSense BV) <Unknown>\n"
+"PO-Revision-Date: 2010-02-01 16:15+0000\n"
+"Last-Translator: Jan Verlaan (Veritos) <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: 2009-12-16 05:19+0000\n"
+"X-Launchpad-Export-Date: 2010-02-02 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
@@ -326,7 +326,7 @@ msgstr "Declaraties"
 #. module: hr_expense
 #: field:hr.expense.expense,date_valid:0
 msgid "Date Validated"
-msgstr "Datum akkoord:"
+msgstr "Controledatum"
 
 #. module: hr_expense
 #: field:hr.expense.expense,account_move_id:0
diff --git a/addons/report_project/i18n/nl.po b/addons/report_project/i18n/nl.po
index 285489152ac..4e1ac9ed0ff 100644
--- a/addons/report_project/i18n/nl.po
+++ b/addons/report_project/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-15 13:57+0000\n"
-"Last-Translator: Pieter J. Kersten (EduSense BV) <Unknown>\n"
+"PO-Revision-Date: 2010-02-01 16:13+0000\n"
+"Last-Translator: Jan Verlaan (Veritos) <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: 2009-12-16 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-02-02 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
@@ -120,7 +120,7 @@ msgstr "Taken per project"
 #: field:report.project.task,hours_delay:0
 #: field:report.project.task.user,hours_delay:0
 msgid "Avg. Plan.-Eff."
-msgstr ""
+msgstr "Gem. Plan.-Eff."
 
 #. module: report_project
 #: field:report.project.task,name:0

From a5ea44ec505de42a70b417eff039c795c5f36b25 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Tue, 2 Feb 2010 11:04:56 +0530
Subject: [PATCH 22/68] [RM] document_caldav: base_calendar has webdav stuff
 now. so no need this module

bzr revid: hmo@tinyerp.com-20100202053456-d26l4lkonhtkhi0i
---
 addons/document_caldav/__init__.py        | 23 ---------
 addons/document_caldav/__terp__.py        | 37 --------------
 addons/document_caldav/document_caldav.py | 60 -----------------------
 addons/document_caldav/document_data.xml  | 12 -----
 addons/document_caldav/document_demo.xml  | 19 -------
 addons/document_caldav/document_view.xml  | 18 -------
 6 files changed, 169 deletions(-)
 delete mode 100644 addons/document_caldav/__init__.py
 delete mode 100644 addons/document_caldav/__terp__.py
 delete mode 100644 addons/document_caldav/document_caldav.py
 delete mode 100644 addons/document_caldav/document_data.xml
 delete mode 100644 addons/document_caldav/document_demo.xml
 delete mode 100644 addons/document_caldav/document_view.xml

diff --git a/addons/document_caldav/__init__.py b/addons/document_caldav/__init__.py
deleted file mode 100644
index d764dfca72d..00000000000
--- a/addons/document_caldav/__init__.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import document_caldav
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_caldav/__terp__.py b/addons/document_caldav/__terp__.py
deleted file mode 100644
index d7480c734bd..00000000000
--- a/addons/document_caldav/__terp__.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-
-{
-    'name': 'Support for caldav based on Document Management System',
-    'version': '1.0',
-    'category': 'Generic Modules/Others',
-    'description': """Allows to synchronise calendars with others applications.""",
-    'author': 'Tiny',
-    'website': 'http://www.openerp.com',
-    'depends': ['caldav','document_webdav', 'crm'],
-    'init_xml': ['document_data.xml'],
-    'update_xml': ['document_view.xml'],
-    'demo_xml': ['document_demo.xml'],
-    'installable': True,
-    'active': False,
-}
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_caldav/document_caldav.py b/addons/document_caldav/document_caldav.py
deleted file mode 100644
index 01af5d0d345..00000000000
--- a/addons/document_caldav/document_caldav.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-from document.nodes import node_content
-from osv import osv, fields
-from osv.orm import except_orm
-import base64
-import os
-
-class document_directory_content(osv.osv):
-    _inherit = 'document.directory.content'    
-    _columns = {
-        'object_id': fields.many2one('ir.model', 'Object', required=True),        
-    }
-
-    def process_write(self, cr, uid, node, data, context=None):
-        if node.extension != '.ics':
-            return super(document_directory_content, self).process_write(cr, uid, node, data, context)
-        content = self.browse(cr, uid, node.cnt_id, context)
-        fobj = self.pool.get(content.object_id.model)
-        if not context:
-            context = {}
-        fobj.import_cal(cr, uid, base64.encodestring(data), context=context)
-        return True
-
-    def process_read(self, cr, uid, node, context=None):
-        ctx = (context or {})
-        ctx.update(node.context.context.copy())
-        ctx.update(node.dctx)
-        content = self.browse(cr, uid, node.cnt_id, ctx)
-        obj_class = self.pool.get(content.object_id.model)
-        domain = []
-        if node.act_id:
-            domain.append(('id','=',node.act_id))
-        # print "process read clause:",domain
-        ids = obj_class.search(cr, uid, domain, context=ctx)
-        ctx.update({'model': content.object_id.model})
-        s = obj_class.export_cal(cr, uid, ids, context=ctx)
-        return s
-document_directory_content()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/document_caldav/document_data.xml b/addons/document_caldav/document_data.xml
deleted file mode 100644
index aa9009aadb1..00000000000
--- a/addons/document_caldav/document_data.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-<data>
-
-    <record model="document.directory.content.type" id="ics">
-        <field name="code">.ics</field>
-        <field name="name">ICS Calendar</field>
-        <field name="mimetype">text/calendar</field>
-    </record>
-</data> 
-    
-</openerp>
diff --git a/addons/document_caldav/document_demo.xml b/addons/document_caldav/document_demo.xml
deleted file mode 100644
index 6a0e4d10d7b..00000000000
--- a/addons/document_caldav/document_demo.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-<data noupdate="1">    
-
-    <record model="document.directory" id="dir_calendars">
-        <field name="name">Meeting Calendars</field>
-    </record>
-
-    <record model="document.directory.content" id="dir_content_calendar">
-        <field name="name">Meeting Calendars</field>
-        <field name="suffix">meetings</field>
-        <field name="directory_id" ref="dir_calendars"/>
-        <field name="extension">.ics</field>
-        <field name="include_name" eval="False"/>
-        <field name="object_id" ref="crm.model_crm_meeting"/>        
-    </record> 
-
-</data>
-</openerp>
diff --git a/addons/document_caldav/document_view.xml b/addons/document_caldav/document_view.xml
deleted file mode 100644
index ce937d1e286..00000000000
--- a/addons/document_caldav/document_view.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-<data>
-
-    <record model="ir.ui.view" id="view_document_directory_form_1">
-        <field name="name">document.directory</field>
-        <field name="model">document.directory</field>
-        <field name="type">form</field>
-        <field name="inherit_id" ref="document.view_document_directory_form"/>
-        <field name="arch" type="xml">
-            <field name="include_name" position="after">
-                <field name="object_id"/>                
-            </field>
-        </field>
-    </record> 
-    
-</data>
-</openerp>

From 624ccd2782ea2172d32bcd5c168f227049268dca Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Tue, 2 Feb 2010 11:32:20 +0530
Subject: [PATCH 23/68] [IMP]: base_calendar, caldav: Minor improvement for
 proper attribute mapping, Moved alarm menu in calendar

bzr revid: rpa@openerp.co.in-20100202060220-lzr6tlnlo3z9otkn
---
 addons/base_calendar/base_calendar.py | 13 ++++++++++---
 addons/caldav/caldav_view.xml         |  7 +++++++
 addons/crm/crm_meeting_menu.xml       |  6 ------
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 3fb557a86b6..70395eecb10 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -71,7 +71,10 @@ def get_attribute_mapping(cr, uid, calname, context={}):
         pool = pooler.get_pool(cr.dbname)
         field_obj = pool.get('basic.calendar.fields')
         type_obj = pool.get('basic.calendar.lines')
-        type_id = type_obj.search(cr, uid, [('object_id.model', '=', context.get('model'))])
+        domain = [('object_id.model', '=', context.get('model'))]
+        if context.get('calendar_id'):
+            domain.append(('calendar_id', '=', context.get('calendar_id')))
+        type_id = type_obj.search(cr, uid, domain)
         fids = field_obj.search(cr, uid, [('type_id', '=', type_id[0])])
         res = {}
         for field in field_obj.browse(cr, uid, fids):
@@ -361,7 +364,9 @@ class Calendar(CalDAV, osv.osv):
             mod_obj = self.pool.get(line.object_id.model)
             data_ids = mod_obj.search(cr, uid, eval(line.domain), context=context)
             datas = mod_obj.read(cr, uid, data_ids, context=context)
-            context.update({'model': line.object_id.model})
+            context.update({'model': line.object_id.model, 
+                                    'calendar_id': cal.id
+                                    })
             self.__attribute__ = get_attribute_mapping(cr, uid, line.name, context)
             self.create_ics(cr, uid, datas, line.name, ical, context=context)
         return ical.serialize()
@@ -380,7 +385,9 @@ class Calendar(CalDAV, osv.osv):
             cal_children[line.name] = line.object_id.model
         for child in parsedCal.getChildren():
             if child.name.lower() in cal_children:
-                context.update({'model': cal_children[child.name.lower()]})
+                context.update({'model': cal_children[child.name.lower()], 
+                                'calendar_id': cal.id
+                                })
                 self.__attribute__ = get_attribute_mapping(cr, uid, child.name.lower(), context=context)
                 val = self.parse_ics(cr, uid, child, cal_children=cal_children, context=context)
                 obj = self.pool.get(cal_children[child.name.lower()])
diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index 559c45485cc..54aaea8c5f4 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -264,5 +264,12 @@
 			name="My Invitations" parent="base_calendar.menu_calendar_configuration"
 			sequence="10" action="action_view_attendee_form" />
         
+        <!--	Available alarms-->
+
+	<menuitem name="Available alarms" id="menu_crm_meeting_avail_alarm"
+		action="caldav.action_res_alarm_view"
+		parent="base_calendar.menu_calendar_configuration" />
+		
+		
     </data>
 </openerp>
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index 678bc72a27d..c18a6e4554d 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -42,12 +42,6 @@
         <field name="act_window_id" ref="crm_case_categ_meet_create_partner"/>
     </record>
 
-<!--	Available alarms-->
-
-	<menuitem name="Available alarms" id="menu_crm_meeting_avail_alarm"
-		action="caldav.action_res_alarm_view"
-		parent="menu_crm_configuration" />
-		
 	<act_window
         id="crm_case_categ_meet_case"
         name="Schedule a Meeting"

From a431ed03913d6417edd6739d218e0fa3fd006266 Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Tue, 2 Feb 2010 11:35:18 +0530
Subject: [PATCH 24/68] [IMP] project: add default value of project on tasks
 search view

bzr revid: mra@tinyerp.com-20100202060518-n30p5nmgyxtzb42s
---
 addons/project/project_view.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 0cb466478be..51b699b4163 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -57,9 +57,9 @@
                                 <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
                                 <button name="set_done" string="Done" type="object" states="open,pending" icon="gtk-jump-to"/>
                                 <button name="reset_project" string="Reset as Project" type="object" states="template" icon="gtk-convert"/>
-                                <button 
+                                <button
                                     string="New Project Based on Template"
-                                    name="%(wizard_duplicate_template)d"  type="action" 
+                                    name="%(wizard_duplicate_template)d"  type="action"
                                     states="template" icon="gtk-new"/>
                             </group>
                         </page>
@@ -366,10 +366,10 @@
                     <field name="remaining_hours" widget="float_time" sum="Remaining Hours"/>
                     <field name="date_deadline"/>
                     <field name="type" groups="base.group_extended"/>
-                    <button name="next_type" 
-                        states="draft,open,pending" 
-                        string="Change Stage" 
-                        type="object" 
+                    <button name="next_type"
+                        states="draft,open,pending"
+                        string="Change Stage"
+                        type="object"
                         icon="gtk-go-forward"
                         groups="base.group_extended"
                         help="Change Type"/>
@@ -478,7 +478,7 @@
                         <filter string="Pending" domain="[('state','=','pending')]" help="Pending Tasks" icon="terp-project"/>
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
-                        <field name="project_id" select="1" widget="selection">
+                        <field name="project_id" select="1" widget="selection" default="context.get('project_id', False)">
                              <filter domain="[('manager_id','=',False)]" help="Unassigned Project" icon="terp-project"/>
                         </field>
                         <field name="user_id" select="1" widget="selection">

From 887ab90afb5a0f9dc1a8388aa8459f82c908550f Mon Sep 17 00:00:00 2001
From: "HDA (OpenERP)" <hda@tinyerp.com>
Date: Tue, 2 Feb 2010 11:40:46 +0530
Subject: [PATCH 25/68] Added account_anglo_saxon module from extra addons

bzr revid: hda@tinyerp.com-20100202061046-oxp8cwjmy0ggtra4
---
 addons/account_anglo_saxon/__init__.py        |  25 +++
 addons/account_anglo_saxon/__terp__.py        |  39 +++++
 .../i18n/account_anglo_saxon.pot              |  54 ++++++
 addons/account_anglo_saxon/i18n/fr_BE.po      |  54 ++++++
 addons/account_anglo_saxon/i18n/pl.po         |  66 ++++++++
 addons/account_anglo_saxon/invoice.py         | 158 ++++++++++++++++++
 addons/account_anglo_saxon/product.py         |  55 ++++++
 addons/account_anglo_saxon/product_view.xml   |  53 ++++++
 addons/account_anglo_saxon/purchase.py        |  41 +++++
 addons/account_anglo_saxon/sale.py            |  43 +++++
 addons/account_anglo_saxon/stock.py           |  51 ++++++
 11 files changed, 639 insertions(+)
 create mode 100644 addons/account_anglo_saxon/__init__.py
 create mode 100644 addons/account_anglo_saxon/__terp__.py
 create mode 100644 addons/account_anglo_saxon/i18n/account_anglo_saxon.pot
 create mode 100644 addons/account_anglo_saxon/i18n/fr_BE.po
 create mode 100644 addons/account_anglo_saxon/i18n/pl.po
 create mode 100644 addons/account_anglo_saxon/invoice.py
 create mode 100644 addons/account_anglo_saxon/product.py
 create mode 100644 addons/account_anglo_saxon/product_view.xml
 create mode 100644 addons/account_anglo_saxon/purchase.py
 create mode 100644 addons/account_anglo_saxon/sale.py
 create mode 100644 addons/account_anglo_saxon/stock.py

diff --git a/addons/account_anglo_saxon/__init__.py b/addons/account_anglo_saxon/__init__.py
new file mode 100644
index 00000000000..dd9a9262710
--- /dev/null
+++ b/addons/account_anglo_saxon/__init__.py
@@ -0,0 +1,25 @@
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 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 product
+import stock
+import purchase
+import invoice
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_anglo_saxon/__terp__.py b/addons/account_anglo_saxon/__terp__.py
new file mode 100644
index 00000000000..31818e213ef
--- /dev/null
+++ b/addons/account_anglo_saxon/__terp__.py
@@ -0,0 +1,39 @@
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+{
+    "name" : "Stock Account",
+    "version" : "1.1",
+    "author" : "Tiny",
+    "website" : "http://tinyerp.com",
+    "description" : """This module will support the Anglo-Saxons accounting methodology by 
+    changing the accounting logic with stock transactions. The difference between the Anglo-Saxon accounting countries 
+    and the Rhine or also called Continental accounting countries is the moment of taking the Cost of Goods Sold versus Cost of Sales. 
+    Anglo-Saxons accounting does take the cost when sales invoice is created, Continental accounting will take the cost at he moment the goods are shipped.
+    This module will add this functionality by using a interim account, to store the value of shipped goods and will contra book this interim account 
+    when the invoice is created to transfer this amount to the debtor or creditor account.""",
+    "depends" : ["product", "account", "sale", "purchase"],
+    "category" : "Generic Modules/Inventory Control",
+    "init_xml" : [],
+    "demo_xml" : [],
+    "update_xml" : ["product_view.xml",],
+    "active": False,
+    "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_anglo_saxon/i18n/account_anglo_saxon.pot b/addons/account_anglo_saxon/i18n/account_anglo_saxon.pot
new file mode 100644
index 00000000000..a2d316633a4
--- /dev/null
+++ b/addons/account_anglo_saxon/i18n/account_anglo_saxon.pot
@@ -0,0 +1,54 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_anglo_saxon
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-24 12:50:50+0000\n"
+"PO-Revision-Date: 2009-11-24 12:50:50+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_anglo_saxon
+#: view:product.category:0
+msgid " Accounting Property"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
+msgid "This module will support the Anglo-Saxons accounting methodology by \n"
+"    changing the accounting logic with stock transactions. The difference between the Anglo-Saxon accounting countries \n"
+"    and the Rhine or also called Continental accounting countries is the moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
+"    Anglo-Saxons accounting does take the cost when sales invoice is created, Continental accounting will take the cost at he moment the goods are shipped.\n"
+"    This module will add this functionality by using a interim account, to store the value of shipped goods and will contra book this interim account \n"
+"    when the invoice is created to transfer this amount to the debtor or creditor account."
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
+msgid "Stock Account"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: field:product.category,property_account_creditor_price_difference_categ:0
+#: field:product.template,property_account_creditor_price_difference:0
+msgid "Price Difference Account"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: help:product.category,property_account_creditor_price_difference_categ:0
+#: help:product.template,property_account_creditor_price_difference:0
+msgid "This account will be used to value price difference between purchase price and cost price."
+msgstr ""
+
diff --git a/addons/account_anglo_saxon/i18n/fr_BE.po b/addons/account_anglo_saxon/i18n/fr_BE.po
new file mode 100644
index 00000000000..a2d316633a4
--- /dev/null
+++ b/addons/account_anglo_saxon/i18n/fr_BE.po
@@ -0,0 +1,54 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_anglo_saxon
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-24 12:50:50+0000\n"
+"PO-Revision-Date: 2009-11-24 12:50:50+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_anglo_saxon
+#: view:product.category:0
+msgid " Accounting Property"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
+msgid "This module will support the Anglo-Saxons accounting methodology by \n"
+"    changing the accounting logic with stock transactions. The difference between the Anglo-Saxon accounting countries \n"
+"    and the Rhine or also called Continental accounting countries is the moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
+"    Anglo-Saxons accounting does take the cost when sales invoice is created, Continental accounting will take the cost at he moment the goods are shipped.\n"
+"    This module will add this functionality by using a interim account, to store the value of shipped goods and will contra book this interim account \n"
+"    when the invoice is created to transfer this amount to the debtor or creditor account."
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
+msgid "Stock Account"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: field:product.category,property_account_creditor_price_difference_categ:0
+#: field:product.template,property_account_creditor_price_difference:0
+msgid "Price Difference Account"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: help:product.category,property_account_creditor_price_difference_categ:0
+#: help:product.template,property_account_creditor_price_difference:0
+msgid "This account will be used to value price difference between purchase price and cost price."
+msgstr ""
+
diff --git a/addons/account_anglo_saxon/i18n/pl.po b/addons/account_anglo_saxon/i18n/pl.po
new file mode 100644
index 00000000000..f23f6949fee
--- /dev/null
+++ b/addons/account_anglo_saxon/i18n/pl.po
@@ -0,0 +1,66 @@
+# Polish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-24 12:50+0000\n"
+"PO-Revision-Date: 2010-01-06 01:42+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"Language-Team: Polish <pl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-01-22 04:42+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_anglo_saxon
+#: view:product.category:0
+msgid " Accounting Property"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
+msgid ""
+"This module will support the Anglo-Saxons accounting methodology by \n"
+"    changing the accounting logic with stock transactions. The difference "
+"between the Anglo-Saxon accounting countries \n"
+"    and the Rhine or also called Continental accounting countries is the "
+"moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
+"    Anglo-Saxons accounting does take the cost when sales invoice is "
+"created, Continental accounting will take the cost at he moment the goods "
+"are shipped.\n"
+"    This module will add this functionality by using a interim account, to "
+"store the value of shipped goods and will contra book this interim account \n"
+"    when the invoice is created to transfer this amount to the debtor or "
+"creditor account."
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
+msgid "Stock Account"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
+
+#. module: account_anglo_saxon
+#: field:product.category,property_account_creditor_price_difference_categ:0
+#: field:product.template,property_account_creditor_price_difference:0
+msgid "Price Difference Account"
+msgstr "Konto różnic cenowych"
+
+#. module: account_anglo_saxon
+#: help:product.category,property_account_creditor_price_difference_categ:0
+#: help:product.template,property_account_creditor_price_difference:0
+msgid ""
+"This account will be used to value price difference between purchase price "
+"and cost price."
+msgstr ""
+"To konto będzie stosowane do rejestrowania różnic cenowych między ceną "
+"zakupu a kosztem."
diff --git a/addons/account_anglo_saxon/invoice.py b/addons/account_anglo_saxon/invoice.py
new file mode 100644
index 00000000000..3904cd6b01e
--- /dev/null
+++ b/addons/account_anglo_saxon/invoice.py
@@ -0,0 +1,158 @@
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import fields, osv
+
+class account_invoice_line(osv.osv):
+    _inherit = "account.invoice.line"
+    
+    def move_line_get(self, cr, uid, invoice_id, context=None):
+        res = super(account_invoice_line,self).move_line_get(cr, uid, invoice_id, context)
+        inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id)
+        if inv.type in ('out_invoice','out_refund'):
+            for i_line in inv.invoice_line:
+                if i_line.product_id:
+                    if inv.type == 'out_invoice':
+                        dacc = i_line.product_id.product_tmpl_id.property_stock_account_output and i_line.product_id.product_tmpl_id.property_stock_account_output.id
+                        if not dacc:
+                            dacc = i_line.product_id.categ_id.property_stock_account_output_categ and i_line.product_id.categ_id.property_stock_account_output_categ.id
+                    else:
+                        dacc = i_line.product_id.product_tmpl_id.property_stock_account_input and i_line.product_id.product_tmpl_id.property_stock_account_input.id
+                        if not dacc:
+                            dacc = i_line.product_id.categ_id.property_stock_account_input_categ and i_line.product_id.categ_id.property_stock_account_input_categ.id
+                            
+                    cacc = i_line.product_id.product_tmpl_id.property_account_expense and i_line.product_id.product_tmpl_id.property_account_expense.id
+                    if not cacc:
+                        cacc = i_line.product_id.categ_id.property_account_expense_categ and i_line.product_id.categ_id.property_account_expense_categ.id
+                    if dacc and cacc:
+                        res.append({
+                            'type':'src',
+                            'name': i_line.name[:64],
+                            'price_unit':i_line.product_id.product_tmpl_id.standard_price,
+                            'quantity':i_line.quantity,
+                            'price':i_line.product_id.product_tmpl_id.standard_price * i_line.quantity,
+                            'account_id':dacc,
+                            'product_id':i_line.product_id.id,
+                            'uos_id':i_line.uos_id.id,
+                            'account_analytic_id':i_line.account_analytic_id.id,
+                            'taxes':i_line.invoice_line_tax_id,
+                            })
+                        
+                        res.append({
+                            'type':'src',
+                            'name': i_line.name[:64],
+                            'price_unit':i_line.product_id.product_tmpl_id.standard_price,
+                            'quantity':i_line.quantity,
+                            'price': -1 * i_line.product_id.product_tmpl_id.standard_price * i_line.quantity,
+                            'account_id':cacc,
+                            'product_id':i_line.product_id.id,
+                            'uos_id':i_line.uos_id.id,
+                            'account_analytic_id':i_line.account_analytic_id.id,
+                            'taxes':i_line.invoice_line_tax_id,
+                            })
+        elif inv.type in ('in_invoice','in_refund'):
+            for i_line in inv.invoice_line:
+                if i_line.product_id:
+                    if i_line.product_id.product_tmpl_id.type != 'service':
+                        acc = i_line.product_id.product_tmpl_id.property_account_creditor_price_difference and i_line.product_id.product_tmpl_id.property_account_creditor_price_difference.id
+                        if not acc:
+                            acc = i_line.product_id.categ_id.property_account_creditor_price_difference_categ and i_line.product_id.categ_id.property_account_creditor_price_difference_categ.id
+                        a = None
+                        if inv.type == 'in_invoice':
+                            oa = i_line.product_id.product_tmpl_id.property_stock_account_input and i_line.product_id.product_tmpl_id.property_stock_account_input.id
+                            if not oa:
+                                oa = i_line.product_id.categ_id.property_stock_account_input_categ and i_line.product_id.categ_id.property_stock_account_input_categ.id
+                        else:
+                            oa = i_line.product_id.product_tmpl_id.property_stock_account_output and i_line.product_id.product_tmpl_id.property_stock_account_output.id
+                            if not oa:
+                                oa = i_line.product_id.categ_id.property_stock_account_output_categ and i_line.product_id.categ_id.property_stock_account_output_categ.id
+                        if oa:
+                            fpos = i_line.invoice_id.fiscal_position or False
+                            a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, oa)
+                        diff_res = []
+                        for line in res:
+                            if a == line['account_id'] and i_line.product_id.id == line['product_id']:
+                                uom = i_line.product_id.uos_id or i_line.product_id.uom_id
+                                standard_price = self.pool.get('product.uom')._compute_price(cr, uid, uom.id, i_line.product_id.product_tmpl_id.standard_price, i_line.uos_id.id)
+                                if standard_price != i_line.price_unit and line['price'] == i_line.price_unit and acc:
+                                    price_diff = i_line.price_unit - standard_price
+                                    line.update({'price':standard_price * line['quantity']})
+                                    diff_res.append({
+                                        'type':'src',
+                                        'name': i_line.name[:64],
+                                        'price_unit':price_diff,
+                                        'quantity':line['quantity'],
+                                        'price': price_diff * line['quantity'],
+                                        'account_id':acc,
+                                        'product_id':line['product_id'],
+                                        'uos_id':line['uos_id'],
+                                        'account_analytic_id':line['account_analytic_id'],
+                                        'taxes':line.get('taxes',[]),
+                                        })
+                        res += diff_res
+        return res   
+    
+    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, context=None):
+        if not product:
+            return super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, context)
+        else:
+            res = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, context)
+
+        if type in ('in_invoice','in_refund'):
+            product_obj = self.pool.get('product.product').browse(cr, uid, product, context=context)
+            if type == 'in_invoice':
+                oa = product_obj.product_tmpl_id.property_stock_account_input and product_obj.product_tmpl_id.property_stock_account_input.id
+                if not oa:
+                    oa = product_obj.categ_id.property_stock_account_input_categ and product_obj.categ_id.property_stock_account_input_categ.id
+            else:
+                oa = product_obj.product_tmpl_id.property_stock_account_output and product_obj.product_tmpl_id.property_stock_account_output.id
+                if not oa:
+                    oa = product_obj.categ_id.property_stock_account_output_categ and product_obj.categ_id.property_stock_account_output_categ.id
+            if oa:
+                fpos = fposition_id and self.pool.get('account.fiscal.position').browse(cr, uid, fposition_id) or False
+                a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, oa)
+                res['value'].update({'account_id':a})            
+        return res
+         
+account_invoice_line()
+
+class account_invoice(osv.osv):
+    _inherit = "account.invoice"
+
+    def _refund_cleanup_lines(self, cr, uid, lines):
+        for line in lines:
+            inv_id = line['invoice_id']
+            inv_obj = self.browse(cr,uid,inv_id[0])
+            if inv_obj.type == 'in_invoice':
+                if line.get('product_id',False):
+                    product_obj = self.pool.get('product.product').browse(cr,uid,line['product_id'][0])
+                    oa = product_obj.product_tmpl_id.property_stock_account_output and product_obj.product_tmpl_id.property_stock_account_output.id
+                    if not oa:
+                        oa = product_obj.categ_id.property_stock_account_output_categ and product_obj.categ_id.property_stock_account_output_categ.id
+                    if oa:
+                        fpos = inv_obj.fiscal_position or False
+                        a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, oa)
+                        account_data = self.pool.get('account.account').read(cr,uid,[a],['name'])[0]
+                        line.update({'account_id': (account_data['id'],account_data['name'])})
+        res = super(account_invoice,self)._refund_cleanup_lines(cr, uid, lines)
+        return res
+    
+account_invoice()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_anglo_saxon/product.py b/addons/account_anglo_saxon/product.py
new file mode 100644
index 00000000000..acd6577fbb7
--- /dev/null
+++ b/addons/account_anglo_saxon/product.py
@@ -0,0 +1,55 @@
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import fields, osv
+
+class product_category(osv.osv):
+    _inherit = "product.category"
+    _columns = {
+        'property_account_creditor_price_difference_categ': fields.property(
+            'account.account',
+            type='many2one',
+            relation='account.account',
+            string="Price Difference Account",
+            method=True,
+            view_load=True,
+            help="This account will be used to value price difference between purchase price and cost price."),                
+
+    }
+product_category()
+
+class product_template(osv.osv):
+    _inherit = "product.template"
+    _columns = {
+        'property_account_creditor_price_difference': fields.property(
+            'account.account',
+            type='many2one',
+            relation='account.account',
+            string="Price Difference Account",
+            method=True,
+            view_load=True,
+            help="This account will be used to value price difference between purchase price and cost price."),                
+
+    }
+product_template()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_anglo_saxon/product_view.xml b/addons/account_anglo_saxon/product_view.xml
new file mode 100644
index 00000000000..78e51374128
--- /dev/null
+++ b/addons/account_anglo_saxon/product_view.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<openerp>
+	<data>
+        <record id="product_normal_form_view" model="ir.ui.view">
+            <field name="name">product.normal.form.inherit.stock</field>
+            <field name="model">product.product</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page/field[@name='property_account_expense']" position="after">
+                    <field name="property_account_creditor_price_difference" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />
+                    <newline/>
+<!--	                <field name="property_account_sending_goods" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}" />-->
+<!--	                <field name="property_account_received_goods" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />-->
+                </xpath>
+            </field>
+        </record>
+
+        <record id="product_template_form_view" model="ir.ui.view">
+            <field name="name">product.template.product.form.inherit</field>
+            <field name="model">product.template</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="product.product_template_form_view"/>
+            <field name="arch" type="xml">
+            	<xpath expr="/form/notebook/page/field[@name='property_account_expense']" position="after">
+                    <field name="property_account_creditor_price_difference" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />
+                    <newline/>
+<!--					<field name="property_account_sending_goods" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}" />-->
+<!--	                <field name="property_account_received_goods" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />-->
+                </xpath>
+             </field>
+        </record>
+
+        <record id="view_category_property_form" model="ir.ui.view">
+            <field name="name">product.category.property.form.inherit.stock</field>
+            <field name="model">product.category</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="product.product_category_form_view"/>
+            <field name="arch" type="xml">
+                <form position="inside">
+                    <group col="2" colspan="2">
+                        <separator string=" Accounting Property" colspan="2"/>
+                            <field name="property_account_creditor_price_difference_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />                        
+<!--					<field name="property_account_sending_goods_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}" />-->
+<!--	                <field name="property_account_received_goods_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />-->
+                    </group>
+                </form>
+            </field>
+        </record>
+
+	</data>
+</openerp>
+
diff --git a/addons/account_anglo_saxon/purchase.py b/addons/account_anglo_saxon/purchase.py
new file mode 100644
index 00000000000..98694a3d5dd
--- /dev/null
+++ b/addons/account_anglo_saxon/purchase.py
@@ -0,0 +1,41 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import fields, osv
+
+class purchase_order(osv.osv):
+    _name = "purchase.order"
+    _inherit = "purchase.order"
+    _description = "Purchase order"
+
+    def inv_line_create(self, cr, uid, a, ol):
+        line = super(purchase_order, self).inv_line_create(cr, uid, a, ol)
+        if ol.product_id:
+            oa = ol.product_id.product_tmpl_id.property_stock_account_input and ol.product_id.product_tmpl_id.property_stock_account_input.id
+            if not oa:
+                oa = ol.product_id.categ_id.property_stock_account_input_categ and ol.product_id.categ_id.property_stock_account_input_categ.id
+            if oa:
+                fpos = ol.order_id.fiscal_position or False
+                a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, oa)
+                line[2].update({'account_id': a})
+        return line
+purchase_order()        
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:        
\ No newline at end of file
diff --git a/addons/account_anglo_saxon/sale.py b/addons/account_anglo_saxon/sale.py
new file mode 100644
index 00000000000..e2cfa7bbb3b
--- /dev/null
+++ b/addons/account_anglo_saxon/sale.py
@@ -0,0 +1,43 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import fields, osv
+
+#class sale_order_line(osv.osv):
+#    _name = 'sale.order.line'
+#    _description = 'Sale Order line'
+#    _inherit = 'sale.order.line'
+#
+#    def invoice_line_create(self, cr, uid, ids, context={}):
+#        line_ids = super('sale_order_line',self).invoice_line_create(cr, uid, ids, context)
+#        invoice_line_obj = self.pool.get('account.invoice.line')
+#        for line in invoice_line_obj.browse(cr, uid, line_ids):
+#            if line.product_id:
+#                    a =  line.product_id.product_tmpl_id.property_stock_account_output and line.product_id.product_tmpl_id.property_stock_account_output.id
+#                    if not a:
+#                        a = line.product_id.categ_id.property_stock_account_output_categ and line.product_id.categ_id.property_stock_account_output_categ.id
+#                    if a:
+#                        a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, a)
+#                        invoice_line_obj.write(cr, uid, line.id, {'account_id':a})
+#
+#sale_order_line()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_anglo_saxon/stock.py b/addons/account_anglo_saxon/stock.py
new file mode 100644
index 00000000000..ad091364fd8
--- /dev/null
+++ b/addons/account_anglo_saxon/stock.py
@@ -0,0 +1,51 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import fields,osv
+
+#----------------------------------------------------------
+# Stock Picking
+#----------------------------------------------------------
+class stock_picking(osv.osv):
+    _inherit = "stock.picking"
+    _description = "Packing List"
+
+    def action_invoice_create(self, cr, uid, ids, journal_id=False,
+            group=False, type='out_invoice', context=None):
+        '''Return ids of created invoices for the pickings'''
+        res = super(stock_picking,self).action_invoice_create(cr, uid, ids, journal_id, group, type, context)
+        if type == 'in_refund':
+            for inv in self.pool.get('account.invoice').browse(cr, uid, res.values(), context=context):
+                for ol in inv.invoice_line:
+                    if ol.product_id:
+                        oa = ol.product_id.product_tmpl_id.property_stock_account_output and ol.product_id.product_tmpl_id.property_stock_account_output.id
+                        if not oa:
+                            oa = ol.product_id.categ_id.property_stock_account_output_categ and ol.product_id.categ_id.property_stock_account_output_categ.id
+                        if oa:
+                            fpos = ol.invoice_id.fiscal_position or False
+                            a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, oa)
+                            self.pool.get('account.invoice.line').write(cr, uid, [ol.id], {'account_id': a})
+        return res
+
+stock_picking()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 9208e4c28cca5f42e8a9d50cb4ac0de040f60046 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Tue, 2 Feb 2010 11:53:06 +0530
Subject: [PATCH 26/68] [IMP]:added 'avg' attribute to the 'field' and 'bold'
 to have the 'sum/avg' in bold

bzr revid: nch@tinyerp.com-20100202062306-aq7r5d2e1vtrlb0v
---
 bin/addons/base/rng/view.rng | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bin/addons/base/rng/view.rng b/bin/addons/base/rng/view.rng
index c49548c9330..ab59714f2e9 100644
--- a/bin/addons/base/rng/view.rng
+++ b/bin/addons/base/rng/view.rng
@@ -304,6 +304,8 @@
             <rng:optional><rng:attribute name="password"/></rng:optional>
             <rng:optional><rng:attribute name="comparator"/></rng:optional>
             <rng:optional><rng:attribute name="sum"/></rng:optional>
+            <rng:optional><rng:attribute name="bold"/></rng:optional>
+            <rng:optional><rng:attribute name="avg"/></rng:optional>
             <rng:optional><rng:attribute name="select"/></rng:optional>
             <rng:optional><rng:attribute name="group"/></rng:optional>
             <rng:optional><rng:attribute name="operator"/></rng:optional>

From d6119cafe8e80d3a0af14ba0278ea4506466c1aa Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Tue, 2 Feb 2010 12:09:40 +0530
Subject: [PATCH 27/68] [IMP] crm: added default value of section on all cases
 search view

bzr revid: mra@tinyerp.com-20100202063940-yi3u7zrtuoo5g6gj
---
 addons/crm/crm_claims_view.xml      | 18 ++++++-------
 addons/crm/crm_fund_view.xml        | 16 ++++++------
 addons/crm/crm_lead_view.xml        | 22 ++++++++--------
 addons/crm/crm_meeting_view.xml     | 20 +++++++--------
 addons/crm/crm_opportunity_view.xml | 22 ++++++++--------
 addons/crm/crm_phonecall_view.xml   | 40 ++++++++++++++---------------
 addons/crm/crm_report_view.xml      |  2 +-
 addons/crm/crm_view.xml             | 16 ++++++------
 8 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/addons/crm/crm_claims_view.xml b/addons/crm/crm_claims_view.xml
index 17dd87caa50..5f7e9b07fdc 100644
--- a/addons/crm/crm_claims_view.xml
+++ b/addons/crm/crm_claims_view.xml
@@ -8,24 +8,24 @@
         <field name="name">Claim Categories</field>
         <field name="res_model">crm.case.categ</field>
         <field name="view_type">form</field>
- 		<field name="view_id" ref="crm.crm_case_categ_tree-view"/>        
+ 		<field name="view_id" ref="crm.crm_case_categ_tree-view"/>
        	<field name="domain">[('object_id.model', '=', 'crm.claim')]</field>
-		<field name="context">{'object_id':'crm.claim'}</field>       	
+		<field name="context">{'object_id':'crm.claim'}</field>
     </record>
     <menuitem action="crm_claim_categ_action" id="menu_crm_case_claim-act" parent="crm.menu_crm_case_categ"/>
     # ------------------------------------------------------
     # Stages
-    # ------------------------------------------------------	    
+    # ------------------------------------------------------
 	    <record id="crm_claim_stage_act" model="ir.actions.act_window">
 	        <field name="name">Claim Stages</field>
 	        <field name="res_model">crm.case.stage</field>
 	        <field name="view_type">form</field>
 	        <field name="view_id" ref="crm.crm_case_stage_tree"/>
 	       <field name="domain">[('object_id.model', '=', 'crm.claim')]</field>
-	      <field name="context">{'object_id':'crm.claim'}</field>  
+	      <field name="context">{'object_id':'crm.claim'}</field>
 	    </record>
 	  <menuitem action="crm_claim_stage_act" id="menu_crm_claim_stage_act" parent="crm.menu_crm_case_stage"/>
-	    
+
 	<!-- Claims	-->
     <record model="ir.ui.view" id="crm_case_claims_tree_view">
         <field name="name">CRM - Claims Tree</field>
@@ -169,7 +169,7 @@
 	        </graph>
 	    </field>
     </record>
-        
+
    <record id="view_crm_case_claims_filter" model="ir.ui.view">
             <field name="name">CRM - Claims Search</field>
             <field name="model">crm.claim</field>
@@ -198,12 +198,12 @@
                        <field name="partner_id" select="1"/>
                        <field name="user_id" select="1" widget="selection"/>
                    </group>
-					<field name="section_id" select="1" widget="selection" string="Section">
+					<field name="section_id" select="1" widget="selection" string="Section" default="context.get('section_id', False)">
 							<filter icon="terp-crm"
                                domain="[('section_id','=',context.get('section_id',False))]"
                                help="My section"
-                           />		
-                 </field>          
+                           />
+                 </field>
                </search>
             </field>
         </record>
diff --git a/addons/crm/crm_fund_view.xml b/addons/crm/crm_fund_view.xml
index 4fec4afb976..96b0ac51ad9 100644
--- a/addons/crm/crm_fund_view.xml
+++ b/addons/crm/crm_fund_view.xml
@@ -9,9 +9,9 @@
         <field name="name">Fundraising Categories</field>
         <field name="res_model">crm.case.categ</field>
         <field name="view_type">form</field>
- 		<field name="view_id" ref="crm.crm_case_categ_tree-view"/>       
-		<field name="domain">[('object_id.model', '=', 'crm.fundraising')]</field> 
-		<field name="context">{'object_id':'crm.fundraising'}</field>  		       
+ 		<field name="view_id" ref="crm.crm_case_categ_tree-view"/>
+		<field name="domain">[('object_id.model', '=', 'crm.fundraising')]</field>
+		<field name="context">{'object_id':'crm.fundraising'}</field>
     </record>
    <menuitem action="crm_fund_categ_action" id="menu_crm_case_fundraising-act" parent="crm.menu_crm_case_categ"/>
     # ------------------------------------------------------
@@ -23,10 +23,10 @@
 	        <field name="view_type">form</field>
 	        <field name="view_id" ref="crm.crm_case_stage_tree"/>
    			<field name="domain">[('object_id.model', '=', 'crm.fundraising')]</field>
-   			<field name="context">{'object_id':'crm.fundraising'}</field>  		        
+   			<field name="context">{'object_id':'crm.fundraising'}</field>
 	    </record>
 	  <menuitem action="crm_fundraising_stage_act" id="menu_crm_fundraising_stage_act" parent="crm.menu_crm_case_stage"/>
-	    
+
     # ------------------------------------------------------
     # Fund Raising
     # ------------------------------------------------------
@@ -194,12 +194,12 @@
                        </field>
                        <field name="name" select='1'/>
                        <field name="user_id" select="1" widget="selection"/>
-					   <field name="section_id" select="1" widget="selection" string="Section">
+					   <field name="section_id" select="1" widget="selection" string="Section" default="context.get('section_id', False)">
 							<filter icon="terp-crm"
                                domain="[('section_id','=',context.get('section_id',False))]"
                                help="My section"
-                           />	
-                       </field>		
+                           />
+                       </field>
                    </group>
                </search>
             </field>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 975bb764ce7..2c5024ebd0f 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -2,23 +2,23 @@
 <openerp>
 <data>
 
-    
-   
-		# ------------------------------------------------------ 
+
+
+		# ------------------------------------------------------
 	    # Stage
-	    # ------------------------------------------------------ 
+	    # ------------------------------------------------------
 	    <record id="crm_lead_stage_act" model="ir.actions.act_window">
 	        <field name="name">Lead Stages</field>
 	        <field name="res_model">crm.case.stage</field>
 	        <field name="view_type">form</field>
 		    <field name="view_id" ref="crm.crm_case_stage_tree"/>
 			<field name="domain">[('object_id.model', '=', 'crm.lead')]</field>
-			<field name="context">{'object_id':'crm.lead'}</field> 
+			<field name="context">{'object_id':'crm.lead'}</field>
 	    </record>
 	  <menuitem action="crm_lead_stage_act" id="menu_crm_lead_stage_act" parent="crm.menu_crm_case_stage"/>
     # ------------------------------------------------------
     # Leads
-    # ------------------------------------------------------   
+    # ------------------------------------------------------
 
     <record model="ir.ui.view" id="crm_case_form_view_leads">
         <field name="name">CRM - Leads Form</field>
@@ -29,9 +29,9 @@
                 <group colspan="4" col="7">
                     <field name="name" select="1" string="Lead Subject"/>
                     <field name="section_id" colspan="1" widget="selection"/>
-                    <field name="opportunity_id" string="Opportunity Case"/>                    	                    
+                    <field name="opportunity_id" string="Opportunity Case"/>
 	                <button string="Convert to Opportunity" name="%(wizard_crm_lead_opportunity_set)d" icon="gtk-index" type="action"  attrs="{'invisible':[('opportunity_id','!=',False)]}"/>
-                    
+
                     <label string="Stage: " align="1.0"/>
                     <group colspan="1" col="2">
                         <field name="stage_id" select="1" nolabel="1"/>
@@ -53,7 +53,7 @@
                     <field name="partner_mobile"/>
                     <field name="email_from" string="Lead Email"/>
                     <newline/>
-                    <label string="Partner:" align="1.0"/>                     
+                    <label string="Partner:" align="1.0"/>
                     <group colspan="1" col="2">
                         <field name="partner_id" nolabel="1" colspan="1"/>
                         <button string="Convert to Partner"
@@ -177,11 +177,11 @@
                        <filter icon="gtk-new" domain="[('state','=','draft')]" help="Draft Leads"/>
                        <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Leads"/>
                    </field>
-					<field name="section_id" select="1" widget="selection" string="Section">
+					<field name="section_id" select="1" default="context.get('section_id', False)" widget="selection" string="Section">
  						<filter icon="terp-crm"
                                domain="[('section_id','=',context.get('section_id',False))]"
                                help="My section"
-                           />					
+                           />
 					</field>
                </group>
            </search>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 194bade3477..0e651da8136 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -9,11 +9,11 @@
         <field name="name">Meeting Categories</field>
         <field name="res_model">crm.case.categ</field>
         <field name="view_type">form</field>
-        <field name="view_id"  ref="crm.crm_case_categ_tree-view"/>        
+        <field name="view_id"  ref="crm.crm_case_categ_tree-view"/>
 		<field name="domain">[('object_id.model', '=', 'crm.meeting')]</field>
-		<field name="context">{'object_id':'crm.meeting'}</field>                
+		<field name="context">{'object_id':'crm.meeting'}</field>
     </record>
-     <menuitem action="crm_meeting_categ_action" id="menu_crm_case_meeting-act" parent="crm.menu_crm_case_categ"/>    
+     <menuitem action="crm_meeting_categ_action" id="menu_crm_case_meeting-act" parent="crm.menu_crm_case_categ"/>
 
     # ------------------------------------------------------
     # Meetings
@@ -43,11 +43,11 @@
                             	colspan="1" />
                             <button string="Custom"
             					name="%(caldav.action_calendar_custom_rrule_wizard)d"
-            					icon="gtk-save-as" type="action" context="{'model' : 'crm.meeting'}" 
+            					icon="gtk-save-as" type="action" context="{'model' : 'crm.meeting'}"
                                 attrs="{'readonly': [('rrule_type','!=','custom')]}"
                                 />
                     </group>
-                   
+
             	</group>
             	<notebook colspan="4">
             		<page string="Description">
@@ -88,7 +88,7 @@
             		<page string="Other Information">
             			<field name="priority"/>
             			<field name="show_as"/>
-            			<field name="alarm_id" string="Reminder" widget="selection" />            			
+            			<field name="alarm_id" string="Reminder" widget="selection" />
             			<field name="class"/>
             			<field name="user_id"/>
             			<field name="vtimezone"/>
@@ -167,16 +167,16 @@
 	               		<separator orientation="vertical"/>
 	               		<field name="name" select="1" string="Subject"/>
 	               		<field name="partner_id" select="1"/>
-	               		<field name="section_id" select="1" widget="selection">
+	               		<field name="section_id" default="context.get('section_id', False)" select="1" widget="selection">
 							<filter icon="terp-crm"
                                domain="[('section_id','=',context.get('section_id',False))]"
                                help="My section"
-                           />	
-						 </field>   
+                           />
+						 </field>
 	               		<field name="user_id" select="1" widget="selection"/>
 	               	</group>
                 </search>
         	</field>
-    	</record>        
+    	</record>
 	</data>
 </openerp>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index a19eb2f3587..0268ffc0b3c 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -10,14 +10,14 @@
         <field name="name">Opportunity Categories</field>
         <field name="res_model">crm.case.categ</field>
         <field name="view_type">form</field>
-        <field name="view_id"  ref="crm.crm_case_categ_tree-view"/>        
+        <field name="view_id"  ref="crm.crm_case_categ_tree-view"/>
 		<field name="domain">[('object_id.model', '=', 'crm.opportunity')]</field>
-		<field name="context">{'object_id':'crm.opportunity'}</field>                
+		<field name="context">{'object_id':'crm.opportunity'}</field>
     </record>
      <menuitem action="crm_opportunity_categ_action" id="menu_crm_case_opportunity-act" parent="crm.menu_crm_case_categ"/>
-		# ------------------------------------------------------ 
+		# ------------------------------------------------------
 	    # Stage
-	    # ------------------------------------------------------ 
+	    # ------------------------------------------------------
 	    <record id="crm_opportunity_stage_act" model="ir.actions.act_window">
 	        <field name="name">Opportunity Stages</field>
 	        <field name="res_model">crm.case.stage</field>
@@ -29,7 +29,7 @@
 	  <menuitem action="crm_opportunity_stage_act" id="menu_crm_opportunity_stage_act" parent="crm.menu_crm_case_stage"/>
     # ------------------------------------------------------
     # Opportunities
-    # ------------------------------------------------------   
+    # ------------------------------------------------------
 
 
 
@@ -52,9 +52,9 @@
                         <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
                         </group>
                     <field name="date" />
-                    <field name="date_deadline"/>                    
+                    <field name="date_deadline"/>
                     <button string="Schedule a Phone Call"
-                        name="%(wizard_crm_opportunity_reschedule_phone_call)d" icon="gtk-redo" type="action"  />                    
+                        name="%(wizard_crm_opportunity_reschedule_phone_call)d" icon="gtk-redo" type="action"  />
                 </group>
                 <notebook colspan="4">
                 <page string="Description">
@@ -172,7 +172,7 @@
                 <field name="state" group="True"/>
             </graph>
         </field>
-    </record>    
+    </record>
 
     <record id="view_crm_case_opportunities_filter" model="ir.ui.view">
         <field name="name">CRM - Opportunities Search</field>
@@ -204,11 +204,11 @@
                    <field name="state" select="1">
                        <filter icon="gtk-index" domain="[('state','in',('open','draft'))]" help="Current "/>
                    </field>
-					<field name="section_id" select="1" widget="selection" string="Section">
+					<field name="section_id" default="context.get('section_id', False)" select="1" widget="selection" string="Section">
 						<filter icon="terp-crm"
                                domain="[('section_id','=',context.get('section_id',False))]"
-                               help="My section"/>		
-			   		</field>     
+                               help="My section"/>
+			   		</field>
                </group>
            </search>
         </field>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 791f0ebeaee..48e6d256924 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-    
+
     # ------------------------------------------------------
     # Phonecall Categories
     # ------------------------------------------------------
-   
+
     <record id="crm_phonecall_categ_action" model="ir.actions.act_window">
         <field name="name">Phonecall Categories</field>
         <field name="res_model">crm.case.categ</field>
         <field name="view_type">form</field>
         <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
-		<field name="domain">[('object_id.model', '=', 'crm.phonecall')]</field> 
+		<field name="domain">[('object_id.model', '=', 'crm.phonecall')]</field>
 		<field name="context">{'object_id':'crm.phonecall'}</field>
     </record>
-   
+
    <menuitem action="crm_phonecall_categ_action" id="menu_crm_case_phonecall-act" parent="crm.menu_crm_case_categ"/>
     # ------------------------------------------------------
     # Fund Stage
@@ -24,11 +24,11 @@
 	        <field name="res_model">crm.case.stage</field>
 	        <field name="view_type">form</field>
  			<field name="view_id" ref="crm.crm_case_stage_tree"/>
-			<field name="domain">[('object_id.model', '=', 'crm.phonecall')]</field>	
+			<field name="domain">[('object_id.model', '=', 'crm.phonecall')]</field>
 			<field name="context">{'object_id':'crm.phonecall'}</field>
 	    </record>
 	  <menuitem action="crm_phonecall_stage_act" id="menu_crm_phonecall_stage_act" parent="crm.menu_crm_case_stage"/>
-	        
+
     # ------------------------------------------------------
     # Phone Calls
     # ------------------------------------------------------
@@ -45,7 +45,7 @@
                 <field name="partner_id" string="Partner"/>
                 <field name="partner_address_id" string="Contact"/>
                 <field name="opportunity_id"/>
-                <button string="Opportunity" name="%(wizard_crm_phonecall_opportunity_set)d"  type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />                       
+                <button string="Opportunity" name="%(wizard_crm_phonecall_opportunity_set)d"  type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />
                 <button string="Meeting"
                         name="%(wizard_crm_phonecall_meeting_set)d"  type="action" />
             </tree>
@@ -62,12 +62,12 @@
                 <field name="name" string="Call Summary"/>
                 <field name="partner_id" string="Partner"/>
                 <field name="partner_address_id" string="Contact"/>
-                <group col="2">    
+                <group col="2">
                 <field name="opportunity_id"/>
-                <button string="Opportunity" name="%(wizard_crm_phonecall_opportunity_set)d"  type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />            
+                <button string="Opportunity" name="%(wizard_crm_phonecall_opportunity_set)d"  type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />
                 <button string="Meeting"
                         name="%(wizard_crm_phonecall_meeting_set)d"  type="action" />
-                </group>        
+                </group>
             </tree>
         </field>
     </record>
@@ -84,25 +84,25 @@
                     <field name="user_id" string="Assigned to" select="2"/>
                     <button string="Schedule a Meeting"
                         name="%(wizard_crm_phonecall_meeting_set)d" icon="gtk-redo" type="action" />
-                    
+
                     <newline/>
                     <field name="date" string="Planned Date"/>
-                    <field name="duration"/>                    
+                    <field name="duration"/>
                     <field name="opportunity_id" on_change="onchange_case_id(case_id, name, partner_id)"
                     context="{'default_name':name,'default_section_id':section_id,'default_user_id':user_id,'default_duration':duration,
                            'default_partner_id':partner_id,'default_partner_address_id':partner_address_id,'default_partner_phone':partner_phone,
                            'default_partner_mobile':partner_mobile,'default_categ_id':categ_id}"/>
-                       
-                    
-                    <button string="Convert to Opportunity" name="%(wizard_crm_phonecall_opportunity_set)d" icon="gtk-index" type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />   
+
+
+                    <button string="Convert to Opportunity" name="%(wizard_crm_phonecall_opportunity_set)d" icon="gtk-index" type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />
                 </group>
                 <notebook colspan="4">
                 <page string="General">
                     <field name="categ_id" string="Direction" select="1" on_change="onchange_categ_id(categ_id)" required="1"/>
-                    <field name="active" string="Reminder"/>                    
+                    <field name="active" string="Reminder"/>
                     <group colspan="2" col="3">
                         <field name="partner_id" string="Partner"/>
-                        <button string="Convert to Partner" icon="terp-crm" name="%(wizard_crm_phonecall_partner_create)d" type="action" attrs="{'invisible':[('partner_id','!=',False)]}"  />   
+                        <button string="Convert to Partner" icon="terp-crm" name="%(wizard_crm_phonecall_partner_create)d" type="action" attrs="{'invisible':[('partner_id','!=',False)]}"  />
                     </group>
                     <field name="partner_address_id" string="Contact"/>
                     <field name="partner_phone"/>
@@ -179,11 +179,11 @@
                    <field name="state" select="1">
                        <filter icon="gtk-index" domain="[('state','in',('open','draft' ))]" help="Current "/>
                    </field>
-					<field name="section_id" select="1" widget="selection" string="Section">
+					<field name="section_id" default="context.get('section_id', False)" select="1" widget="selection" string="Section">
 						<filter icon="terp-crm"
                                domain="[('section_id','=',context.get('section_id',False))]"
-                               help="My section"/>		
-			   		</field>     				
+                               help="My section"/>
+			   		</field>
                    </group>
            </search>
         </field>
diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml
index df76994d9b3..04e4f235988 100644
--- a/addons/crm/crm_report_view.xml
+++ b/addons/crm/crm_report_view.xml
@@ -68,7 +68,7 @@
                    		<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]" help="Cases by Section and Type for this year"/>
 						<filter string="This Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]" help="Cases by Section and Type for this month"/>
 						<separator orientation="vertical"/>
-						<field name="section_id" select="1" widget="selection"/>
+						<field name="section_id" default="context.get('section_id', False)" select="1" widget="selection"/>
                 		<field name="category2_id" select="1"/>
                 		<field name="nbr" select="1"/>
                 		<field name="state" select="1"/>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 2c8dc9209a9..1c9a7aa2bfd 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -48,9 +48,9 @@
             <field name="view_id" ref="crm_case_section_view_tree"/>
         </record>
 
-        # ------------------------------------------------------ 
+        # ------------------------------------------------------
         # Stage
-        # ------------------------------------------------------ 
+        # ------------------------------------------------------
         <record model="ir.ui.view" id="crm_case_stage_tree">
             <field name="name">crm.case.stage.tree</field>
             <field name="model">crm.case.stage</field>
@@ -92,7 +92,7 @@
                 <form string="Case Category">
                     <field name="name" select="1"/>
                     <field name="section_id" select="1" widget="selection"/>
-                    <field name="object_id"  invisible="1" />                    
+                    <field name="object_id"  invisible="1" />
                     <field name="probability"/>
                 </form>
             </field>
@@ -117,7 +117,7 @@
             <field name="view_id" ref="crm_case_categ_tree-view"/>
         </record>
         <menuitem id="menu_crm_case_categ"   name="Categories"  parent="crm.menu_crm_configuration"/>
-        
+
         <menuitem action="crm_case_section_act" id="menu_crm_case_section_act" parent="crm.menu_crm_configuration"/>
 
 <!--        <menuitem id="next_id_52" name="All Cases" parent="crm.menu_crm" sequence="1"/>-->
@@ -442,11 +442,11 @@
                        <field name="name" select='1'/>
                        <field name="user_id" select="1" widget="selection"/>
                    </group>
-                     <field name="section_id" select="1" widget="selection" string="Section"/>
+                     <field name="section_id" default="context.get('section_id', False)" select="1" widget="selection" string="Section"/>
                </search>
             </field>
         </record>
-    
+
         <record id="crm_case_categ0-act" model="ir.actions.act_window">
             <field name="name">Cases</field>
             <field name="res_model">crm.case</field>
@@ -507,8 +507,8 @@
                        <separator orientation="vertical"/>
                      <group col="6" colspan="2">
                        <field name="date" select="1"/>
-                    <field name="user_id" select="1" widget="selection"/>                    
-                     <field name="section_id" select="1" widget="selection" string="Section"/>
+                    <field name="user_id" select="1" widget="selection"/>
+                     <field name="section_id" default="context.get('section_id', False)" select="1" widget="selection" string="Section"/>
                     </group>
                 </search>
             </field>

From f7a80ed5bf1938122ea7780b4b8930cfe104294d Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Tue, 2 Feb 2010 12:31:34 +0530
Subject: [PATCH 28/68] [FIX] crm_project: default value of get project

bzr revid: mra@tinyerp.com-20100202070134-j5cjswktumoi46n7
---
 addons/crm_project/crm_project_bug.py     | 10 +++++-----
 addons/crm_project/crm_project_feature.py | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/crm_project/crm_project_bug.py b/addons/crm_project/crm_project_bug.py
index fa408b8a570..6e56e0e3746 100644
--- a/addons/crm_project/crm_project_bug.py
+++ b/addons/crm_project/crm_project_bug.py
@@ -54,20 +54,20 @@ class crm_project_bug(osv.osv):
         'categ_id': fields.many2one('crm.case.categ','Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.project.bug')]"),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
         'type_id': fields.many2one('crm.case.resource.type', 'Bug Type', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.project.bug')]"),
-        
+
         'partner_name': fields.char("Employee's Name", size=64),
         'partner_mobile': fields.char('Mobile', size=32),
         'partner_phone': fields.char('Phone', size=32),
         'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.project.bug')]"),
         'project_id':fields.many2one('project.project', 'Project'),
         'duration': fields.float('Duration') ,
-        'probability': fields.float('Probability (%)'),       
+        'probability': fields.float('Probability (%)'),
     }
 
     def _get_project(self, cr, uid, context):
        user = self.pool.get('res.users').browse(cr,uid,uid, context=context)
        if user.context_project_id:
-           return user.context_project_id.id
+           return user.context_project_id
        return False
 
     _defaults = {
@@ -77,8 +77,8 @@ class crm_project_bug(osv.osv):
         if not categ:
             return {'value':{}}
         cat = self.pool.get('crm.case.categ').browse(cr, uid, categ, context).probability
-        return {'value':{'probability':cat}}    
-    
+        return {'value':{'probability':cat}}
+
 
 crm_project_bug()
 
diff --git a/addons/crm_project/crm_project_feature.py b/addons/crm_project/crm_project_feature.py
index 18674cda5db..77314ec32de 100644
--- a/addons/crm_project/crm_project_feature.py
+++ b/addons/crm_project/crm_project_feature.py
@@ -38,7 +38,7 @@ class crm_project_future_request(osv.osv):
     _name = "crm.project.future"
     _description = "Project Future Request"
     _order = "id desc"
-    _inherit = 'crm.case'    
+    _inherit = 'crm.case'
     _columns = {
         'date_closed': fields.datetime('Closed', readonly=True),
         'ref' : fields.reference('Reference', selection=crm._links_get, size=128),
@@ -53,19 +53,19 @@ class crm_project_future_request(osv.osv):
         'categ_id': fields.many2one('crm.case.categ','Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.project.future')]"),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
         'type_id': fields.many2one('crm.case.resource.type', 'Bug Type', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.project.future')]"),
-        
+
         'partner_name': fields.char("Employee's Name", size=64),
         'partner_mobile': fields.char('Mobile', size=32),
         'partner_phone': fields.char('Phone', size=32),
         'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.project.future')]"),
         'project_id':fields.many2one('project.project', 'Project'),
         'duration': fields.float('Duration') ,
-        'probability': fields.float('Probability (%)'), 
+        'probability': fields.float('Probability (%)'),
     }
     def _get_project(self, cr, uid, context):
        user = self.pool.get('res.users').browse(cr,uid,uid, context=context)
        if user.context_project_id:
-           return user.context_project_id.id
+           return user.context_project_id
        return False
 
     _defaults = {
@@ -76,7 +76,7 @@ class crm_project_future_request(osv.osv):
             return {'value':{}}
         cat = self.pool.get('crm.case.categ').browse(cr, uid, categ, context).probability
         return {'value':{'probability':cat}}
-       
+
 
 crm_project_future_request()
 

From e0379c5c209020a2f8f62be0d1a15554d4e7db67 Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Tue, 2 Feb 2010 12:44:28 +0530
Subject: [PATCH 29/68] [IMP] report_project: added default value of project in
 search views

bzr revid: mra@tinyerp.com-20100202071428-rbotsga8z6jofm2d
---
 addons/report_project/report_project_view.xml | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/addons/report_project/report_project_view.xml b/addons/report_project/report_project_view.xml
index 7560fd1d917..0ed75aa6d6d 100644
--- a/addons/report_project/report_project_view.xml
+++ b/addons/report_project/report_project_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        
+
         <!-- Tasks by projects and users -->
         <record id="view_task_project_user_form" model="ir.ui.view">
             <field name="name">report.project.task.user.form</field>
@@ -12,7 +12,7 @@
                     <field name="name" select="1"/>
                     <field name="month" select="1"/>
                     <field name="user_id" select="1"/>
-                    <field name="project_id" select="1"/>
+                    <field name="project_id" select="1" default="context.get('project_id', False)"/>
                     <field name="task_closed" select="1"/>
                     <field name="hours_planned" select="1"/>
                     <field name="hours_effective" select="1"/>
@@ -21,8 +21,8 @@
                 </form>
             </field>
         </record>
-        
-        
+
+
         <record id="view_task_project_user_tree" model="ir.ui.view">
             <field name="name">report.project.task.user.tree</field>
             <field name="model">report.project.task.user</field>
@@ -41,7 +41,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_task_project_user_search" model="ir.ui.view">
             <field name="name">report.project.task.user.search</field>
             <field name="model">report.project.task.user</field>
@@ -55,12 +55,12 @@
 	            		<field name="name" select="1"/>
 	                    <field name="month" select="1"/>
 	                    <field name="user_id" select="1"/>
-	                    <field name="project_id" select="1"/>
+	                    <field name="project_id" select="1" default="context.get('project_id', False)"/>
             		</group>
             	</search>
             </field>
         </record>
-        
+
         <record id="action_project_task_user_tree" model="ir.actions.act_window">
             <field name="name">Tasks Closed by Project and User</field>
             <field name="res_model">report.project.task.user</field>
@@ -69,9 +69,9 @@
             <field name="search_view_id" ref="view_task_project_user_search"/>
         </record>
         <menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="report_task.next_id_57"/>
-        
+
         <!-- Tasks by projects -->
-        
+
         <record id="view_task_project_form" model="ir.ui.view">
             <field name="name">report.project.task.form</field>
             <field name="model">report.project.task</field>
@@ -106,7 +106,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_task_project_search" model="ir.ui.view">
             <field name="name">report.project.task.search</field>
             <field name="model">report.project.task</field>
@@ -119,13 +119,13 @@
 	            		<separator orientation="vertical"/>
 	            		<field name="name" select="1"/>
 	                    <field name="month" select="1"/>
-	                    <field name="project_id" select="1"/>
+	                    <field name="project_id" select="1" default="context.get('project_id', False)"/>
 	                    <field name="task_closed" select="1"/>
 	                </group>
             	</search>
             </field>
         </record>
-        
+
         <record id="action_project_task_tree" model="ir.actions.act_window">
             <field name="name">Tasks Closed by Project</field>
             <field name="res_model">report.project.task</field>
@@ -134,6 +134,6 @@
             <field name="search_view_id" ref="view_task_project_search"/>
         </record>
         <menuitem action="action_project_task_tree" id="menu_project_task_tree" parent="report_task.next_id_57"/>
-        
+
     </data>
 </openerp>

From b9c8adb48709344d85c83cbdf84321dee4795649 Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Tue, 2 Feb 2010 12:50:19 +0530
Subject: [PATCH 30/68] [IMP] scrum: default value on search view

bzr revid: mra@tinyerp.com-20100202072019-okscsqi1i7ckro6k
---
 addons/scrum/scrum_view.xml | 64 ++++++++++++++++++-------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index 2ddb8353fec..fb6c3a716d6 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        
-        
+
+
         <!--
               Usual views
               -->
-        
-        
+
+
         <!-- Scrum Project -->
-        
+
         <record id="view_scrum_project_form" model="ir.ui.view">
             <field name="name">scrum.project.form</field>
             <field name="model">scrum.project</field>
@@ -24,7 +24,7 @@
                 </field>
             </field>
         </record>
-        
+
         <record id="view_scrum_project_tree" model="ir.ui.view">
             <field name="name">scrum.project.tree</field>
             <field name="model">scrum.project</field>
@@ -48,7 +48,7 @@
             <field name="domain">[('parent_id','=',False),('scrum','=',1)]</field>
         </record>
         <menuitem id="next_id_67" name="Scrum" parent="project.menu_main"/><menuitem action="action_scrum_project_tree" id="menu_action_scrum_project_tree" parent="next_id_67"/>
-        
+
         <record id="action_scrum_project_form" model="ir.actions.act_window">
             <field name="name">Edit Projects</field>
             <field name="res_model">scrum.project</field>
@@ -57,12 +57,12 @@
             <field name="domain">[('scrum','=',1)]</field>
         </record>
         <menuitem action="action_scrum_project_form" id="menu_action_scrum_project_form" parent="scrum.menu_action_scrum_project_tree"/>
-        
-        
+
+
         <!--
        Product backlog
        -->
-        
+
         <record id="view_scrum_product_backlog_tree" model="ir.ui.view">
             <field name="name">scrum.product.backlog.tree</field>
             <field name="model">scrum.product.backlog</field>
@@ -80,7 +80,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_scrum_product_backlog_form" model="ir.ui.view">
             <field name="name">scrum.product.backlog.form</field>
             <field name="model">scrum.product.backlog</field>
@@ -111,7 +111,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record model="ir.ui.view" id="view_scrum_product_backlog_search">
 			<field name="name">scrum.product.backlog.search</field>
 			<field name="model">scrum.product.backlog</field>
@@ -123,7 +123,7 @@
 						<filter icon="terp-project" string="Open" domain="[('state','=','open')]" help="Open Backlogs"/>
 						<separator orientation="vertical"/>
 						<field name="name" select="1"/>
-                        <field name="project_id" select="1"/>
+                        <field name="project_id" select="1" default="context.get('project_id', False)"/>
                         <field name="sprint_id" select="1"/>
                         <field name="user_id" select="1"/>
                         <field name="state" select="1"/>
@@ -131,7 +131,7 @@
 				</search>
 			</field>
 		</record>
-		
+
         <record id="action_product_backlog_form" model="ir.actions.act_window">
             <field name="name">Backlogs</field>
             <field name="res_model">scrum.product.backlog</field>
@@ -139,11 +139,11 @@
             <field name="search_view_id" ref="view_scrum_product_backlog_search"/>
         </record>
         <menuitem action="action_product_backlog_form" id="menu_action_product_backlog_form" parent="scrum.next_id_67"/>
-        
+
         <!--
               Scrum Sprint
        -->
-        
+
         <record id="view_scrum_sprint_tree" model="ir.ui.view">
             <field name="name">scrum.sprint.tree</field>
             <field name="model">scrum.sprint</field>
@@ -195,7 +195,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record model="ir.ui.view" id="view_scrum_sprint_search">
 			<field name="name">scrum.sprint.search</field>
 			<field name="model">scrum.sprint</field>
@@ -215,7 +215,7 @@
 				</search>
 			</field>
 		</record>
-		
+
         <record id="action_sprint_all_tree" model="ir.actions.act_window">
             <field name="name">Sprints</field>
             <field name="res_model">scrum.sprint</field>
@@ -224,12 +224,12 @@
             <field name="view_id" ref="view_scrum_sprint_tree"/>
             <field name="search_view_id" ref="view_scrum_sprint_search"/>
         </record>
-        <menuitem action="action_sprint_all_tree" id="menu_action_sprint_all_tree" parent="scrum.next_id_67"/>        
+        <menuitem action="action_sprint_all_tree" id="menu_action_sprint_all_tree" parent="scrum.next_id_67"/>
 
         <!--
               Daily Meeting
        -->
-        
+
         <record id="view_scrum_meeting_tree" model="ir.ui.view">
             <field name="name">scrum.meeting.tree</field>
             <field name="model">scrum.meeting</field>
@@ -276,11 +276,11 @@
             <field name="view_id" ref="view_scrum_meeting_form"/>
         </record>
         <menuitem action="action_meeting_form" id="menu_action_meeting_form" parent="scrum.next_id_67"/>
-        
+
         <!--
        Clicks on a sprint: what a hack
        -->
-        
+
         <record id="action_sprint_task_open" model="ir.actions.act_window">
             <field name="res_model">project.task</field>
             <field name="name">View sprint Tasks</field>
@@ -295,7 +295,7 @@
             <field eval="'ir.actions.act_window,'+str(action_sprint_task_open)" name="value"/>
             <field eval="True" name="object"/>
         </record>
-        
+
         <record id="action_sprint_backlog_open" model="ir.actions.act_window">
             <field name="res_model">scrum.product.backlog</field>
             <field name="name">View sprint backlog</field>
@@ -310,11 +310,11 @@
             <field eval="'ir.actions.act_window,'+str(action_sprint_backlog_open)" name="value"/>
             <field eval="True" name="object"/>
         </record>
-        
+
         <!--
        Clicks on a project
        -->
-        
+
         <record id="dblc_proj" model="ir.actions.act_window">
             <field name="res_model">scrum.product.backlog</field>
             <field name="name">View project's backlog</field>
@@ -343,7 +343,7 @@
             <field eval="'ir.actions.act_window,'+str(dblc_proj2)" name="value"/>
             <field eval="True" name="object"/>
         </record>
-        
+
         <!--
         Tasks
         -->
@@ -361,7 +361,7 @@
                 </field>
             </field>
         </record>
-        
+
         <record id="view_task_search_form" model="ir.ui.view">
             <field name="name">scrum.task.search</field>
             <field name="model">scrum.task</field>
@@ -382,23 +382,23 @@
             <field name="domain">[('scrum','=',1)]</field>
             <field name="search_view_id" ref="view_task_search_form"/>
         </record>
-        
+
         <record id="action_view_scrum_task_tree_view" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
             <field name="view_mode">tree</field>
             <field name="view_id" ref="project.view_task_tree2"/>
             <field name="act_window_id" ref="action_view_task"/>
         </record>
-        
+
         <record id="action_view_scrum_task_form_view" model="ir.actions.act_window.view">
             <field eval="2" name="sequence"/>
             <field name="view_mode">form</field>
             <field name="view_id" ref="view_task_form2"/>
             <field name="act_window_id" ref="action_view_task"/>
         </record>
-        
+
         <menuitem action="action_view_task" id="menu_action_view_task" parent="scrum.next_id_67"/>
-        
+
         <record id="action_view_task6" model="ir.actions.act_window">
             <field name="name">Opened tasks</field>
             <field name="res_model">scrum.task</field>
@@ -407,6 +407,6 @@
             <field name="domain">[('state','=','open'),('scrum','=',1)]</field>
             <field name="filter" eval="True"/>
         </record>
-    
+
     </data>
 </openerp>

From dd5b2c0963456a581722f6192418538120363131 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Tue, 2 Feb 2010 13:20:19 +0530
Subject: [PATCH 31/68] [IMP, ADD] crm: Added search view for helpdesk.
 Improved wizards.

bzr revid: uco@tinyerp.co.in-20100202075019-fmntqwfo96dll50g
---
 addons/crm/crm.py                         |  6 ++++
 addons/crm/crm_claim.py                   |  6 ----
 addons/crm/crm_fundraising.py             |  8 +----
 addons/crm/crm_helpdesk.py                |  8 +----
 addons/crm/crm_helpdesk_menu.xml          |  2 +-
 addons/crm/crm_helpdesk_view.xml          | 37 +++++++++++++++++++++++
 addons/crm/crm_lead.py                    |  6 ----
 addons/crm/crm_opportunity.py             |  6 ----
 addons/crm/crm_phonecall.py               |  8 +----
 addons/crm/crm_phonecall_view.xml         | 11 -------
 addons/crm/wizard/crm_lead_wizard.py      |  5 +--
 addons/crm/wizard/crm_phonecall_wizard.py | 10 +++---
 12 files changed, 56 insertions(+), 57 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index d9d4c6e6c9d..2551c389ebc 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -406,6 +406,12 @@ class crm_case(osv.osv):
 
         return True
 
+    def onchange_categ_id(self, cr, uid, ids, categ, context={}):
+        if not categ:
+            return {'value':{}}
+        cat = self.pool.get('crm.case.categ').browse(cr, uid, categ, context).probability
+        return {'value':{'probability':cat}}
+
     def onchange_case_id(self, cr, uid, ids, case_id, name, partner_id, context={}):
         if not case_id:
             return {}
diff --git a/addons/crm/crm_claim.py b/addons/crm/crm_claim.py
index 14921372fad..d9296c41352 100644
--- a/addons/crm/crm_claim.py
+++ b/addons/crm/crm_claim.py
@@ -53,12 +53,6 @@ class crm_claim(osv.osv):
                  'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
     }
     
-    def onchange_categ_id(self, cr, uid, ids, categ, context={}):
-        if not categ:
-            return {'value':{}}
-        cat = self.pool.get('crm.case.categ').browse(cr, uid, categ, context).probability
-        return {'value':{'probability':cat}}    
-
 crm_claim()
 
 
diff --git a/addons/crm/crm_fundraising.py b/addons/crm/crm_fundraising.py
index 5085f01333f..c04b40c2c63 100644
--- a/addons/crm/crm_fundraising.py
+++ b/addons/crm/crm_fundraising.py
@@ -53,11 +53,5 @@ class crm_fundraising(osv.osv):
     _defaults = {
                  'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
     }
-    
-    def onchange_categ_id(self, cr, uid, ids, categ, context={}):
-        if not categ:
-            return {'value':{}}
-        cat = self.pool.get('crm.case.categ').browse(cr, uid, categ, context).probability
-        return {'value':{'probability':cat}}    
-    
+
 crm_fundraising()    
diff --git a/addons/crm/crm_helpdesk.py b/addons/crm/crm_helpdesk.py
index 13bc13d214c..6ffd71d351f 100644
--- a/addons/crm/crm_helpdesk.py
+++ b/addons/crm/crm_helpdesk.py
@@ -43,13 +43,7 @@ class crm_helpdesk(osv.osv):
             'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.helpdesk')]"),
             'duration': fields.float('Duration'),
     }
-    
-    def onchange_categ_id(self, cr, uid, ids, categ, context={}):
-        if not categ:
-            return {'value':{}}
-        cat = self.pool.get('crm.case.categ').browse(cr, uid, categ, context).probability
-        return {'value':{'probability':cat}}    
-        
+
 crm_helpdesk()
 
 
diff --git a/addons/crm/crm_helpdesk_menu.xml b/addons/crm/crm_helpdesk_menu.xml
index 270237aa698..d3bce9dcb2e 100644
--- a/addons/crm/crm_helpdesk_menu.xml
+++ b/addons/crm/crm_helpdesk_menu.xml
@@ -10,7 +10,7 @@
         <field name="view_mode">tree,calendar,form</field>
         <field name="view_id" ref="crm_case_tree_view_helpdesk"/>        
         <field name="context" eval="{'default_state':'open'}"/>
-        <field name="search_view_id" ref="crm.view_crm_case_filter"/>
+        <field name="search_view_id" ref="crm.view_crm_case_helpdesk_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_act111">
         <field name="sequence" eval="1"/>
diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm/crm_helpdesk_view.xml
index af702600e28..1f0877946c7 100644
--- a/addons/crm/crm_helpdesk_view.xml
+++ b/addons/crm/crm_helpdesk_view.xml
@@ -154,5 +154,42 @@
             </calendar>
         </field>
     </record>
+    
+    <record id="view_crm_case_helpdesk_filter" model="ir.ui.view">
+        <field name="name">CRM - Helpdesk Search</field>
+        <field name="model">crm.helpdesk</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Search Helpdesk">
+               <group col="6" colspan="1">
+                   <filter icon="gtk-home" string="Today"
+                   	separator="1"
+                   	domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"
+                   	help="Todays's Helpdesk Requests"
+                   />
+                   <filter icon="gtk-media-rewind"
+                   	string="7 Days" separator="1"
+                   	help="Helpdesk requests during last 7 days"
+                   	domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                   />
+               </group>
+               <separator orientation="vertical"/>
+               <group col="6" colspan="2">
+             		<field name="name" select='1' string="Subject"/>
+               		<field name="user_id" select="1" widget="selection">
+	                   	<filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Helpdesk Requests" default="1"/>
+                   </field>
+                   <field name="state" select="1">
+                       <filter icon="gtk-index" domain="[('state','in',('open','draft' ))]" help="Current "/>
+                   </field>
+					<field name="section_id" select="1" widget="selection" string="Section">
+						<filter icon="terp-crm"
+                               domain="[('section_id','=',context.get('section_id',False))]"
+                               help="My section"/>		
+			   		</field>     				
+                   </group>
+           </search>
+        </field>
+    </record>
 </data>
 </openerp>
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index f346bcf88f7..04a5a09da3d 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -54,11 +54,5 @@ class crm_lead(osv.osv):
                                                                        "to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."),
              'opportunity_id': fields.many2one ('crm.opportunity', 'Opportunity'),
     }
-    
-    def onchange_categ_id(self, cr, uid, ids, categ, context={}):
-        if not categ:
-            return {'value':{}}
-        cat = self.pool.get('crm.case.categ').browse(cr, uid, categ, context).probability
-        return {'value':{'probability':cat}}        
 
 crm_lead()
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 529bdbf7eb0..4e2e6902f7f 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -45,12 +45,6 @@ class crm_opportunity(osv.osv):
         'date_closed': fields.datetime('Closed', readonly=True),
         'phonecall_id':fields.many2one ('crm.phonecall', 'Phonecall'),
     }
-    
-    def onchange_categ_id(self, cr, uid, ids, categ, context={}):
-        if not categ:
-            return {'value':{}}
-        cat = self.pool.get('crm.case.categ').browse(cr, uid, categ, context).probability
-        return {'value':{'probability':cat}}        
 
 crm_opportunity()
 
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 5f610860407..1c3bf015489 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -43,12 +43,6 @@ class crm_phonecall(osv.osv):
         'date_closed': fields.datetime('Closed', readonly=True),
         'opportunity_id':fields.many2one ('crm.opportunity', 'Opportunity'),        
     }
- 
-    def onchange_categ_id(self, cr, uid, ids, categ, context={}):
-        if not categ:
-            return {'value':{}}
-        cat = self.pool.get('crm.case.categ').browse(cr, uid, categ, context).probability
-        return {'value':{'probability':cat}}
-
+    
 crm_phonecall()
 
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 48e6d256924..1294cabc364 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -148,17 +148,6 @@
         <field name="arch" type="xml">
             <search string="Search Phonecalls">
                <group col="6" colspan="1">
-                   <filter icon="gtk-jump-to"
-                   	string="Inbound"
-                   	domain="[('categ_id.name','=','Inbound')]"
-                   	separator="1" help="All Inbound Phonecalls"
-                   />
-                   <filter icon="gtk-redo"
-                   	string="Outbound"
-                   	domain="[('categ_id.name','=','Outbound')]"
-                   	separator="1" help="All Outbound Phonecalls"
-                   />
-                   <separator orientation="vertical"/>
                    <filter icon="gtk-home" string="   Today   "
                    	separator="1"
                    	domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"
diff --git a/addons/crm/wizard/crm_lead_wizard.py b/addons/crm/wizard/crm_lead_wizard.py
index 95127336a4c..c5a2a63f2ec 100644
--- a/addons/crm/wizard/crm_lead_wizard.py
+++ b/addons/crm/wizard/crm_lead_wizard.py
@@ -116,7 +116,8 @@ class lead2opportunity(wizard.interface):
                 'description':lead.description,
                 'date_deadline': lead.date_deadline,
                 'partner_address_id':lead.partner_address_id.id, 
-                'priority':lead.priority,         
+                'priority':lead.priority,
+                'date': lead.date,
             })       
             
             new_opportunity = opportunity_case_obj.browse(cr, uid, new_opportunity_id)
@@ -128,7 +129,7 @@ class lead2opportunity(wizard.interface):
                 vals.update({'opportunity_id' : new_opportunity.id})
 
             lead_case_obj.write(cr, uid, [lead.id], vals)
-            lead_case_obj.case_cancel(cr, uid, [lead.id])
+            lead_case_obj.case_close(cr, uid, [lead.id])
             opportunity_case_obj.case_open(cr, uid, [new_opportunity_id])
         
         value = {            
diff --git a/addons/crm/wizard/crm_phonecall_wizard.py b/addons/crm/wizard/crm_phonecall_wizard.py
index 581c8019d87..22914fb3755 100644
--- a/addons/crm/wizard/crm_phonecall_wizard.py
+++ b/addons/crm/wizard/crm_phonecall_wizard.py
@@ -112,9 +112,11 @@ class phonecall2opportunity(wizard.interface):
                 'planned_revenue': data['form']['planned_revenue'],
                 'probability': data['form']['probability'],
                 'partner_id': data['form']['partner_id'],                 
-                'section_id':phonecall.section_id.id,
-                'description':phonecall.description,         
-                'phonecall_id': phonecall.id    
+                'section_id': phonecall.section_id.id,
+                'description': phonecall.description,         
+                'phonecall_id': phonecall.id,
+                'date': phonecall.date,
+                'priority': phonecall.priority    
             })
             new_opportunity = opportunity_case_obj.browse(cr, uid, new_opportunity_id)
             vals = {
@@ -122,7 +124,7 @@ class phonecall2opportunity(wizard.interface):
                 'opportunity_id' : new_opportunity_id,                
                 }            
             phonecall_case_obj.write(cr, uid, [phonecall.id], vals)
-            phonecall_case_obj.case_cancel(cr, uid, [phonecall.id])
+            phonecall_case_obj.case_close(cr, uid, [phonecall.id])
             opportunity_case_obj.case_open(cr, uid, [new_opportunity_id])
         value = {            
             'name': _('Opportunity'),

From 99656278bfc3d0b26011a855fc53d1614ec39bf8 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Tue, 2 Feb 2010 13:55:49 +0530
Subject: [PATCH 32/68] [IMP] caldav, crm: improve view of attendee and change
 menu

bzr revid: hmo@tinyerp.com-20100202082549-ao8atwkf8zourzjd
---
 addons/caldav/caldav_view.xml   | 35 ++++++---------------------------
 addons/crm/crm_meeting_menu.xml | 16 +++++++++++++++
 2 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index 54aaea8c5f4..4d10b9529f5 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -65,6 +65,8 @@
             		<field name="user_id"
             			on_change="onchange_user_id(user_id)" readonly="1" />
             		<field name="email" select="1" readonly="1" />
+                    <field name="partner_id" select="1" readonly="1" />
+                    <field name="partner_address_id" select="1" readonly="1" />
             		<newline />
             		<field name="role" select="1" readonly="1" string="Role" />
             		<field name="cutype" select="1" readonly="1"  string="Invitation type" />
@@ -114,7 +116,7 @@
             </field>
         </record>
 
-	 <record id="caldav_attendee_tree_view" model="ir.ui.view">
+	    <record id="caldav_attendee_tree_view" model="ir.ui.view">
             <field name="name">calendar.attendee.tree</field>
             <field name="model">calendar.attendee</field>
             <field name="type">tree</field>
@@ -126,32 +128,9 @@
             		<field name="state" />
             	</tree>
             </field>
-        </record>
+        </record>	 
 
-	 <record id="action_view_attendee_form" model="ir.actions.act_window">
-	 	<field name="name">My Invitations</field>
-	 	<field name="type">ir.actions.act_window</field>
-	 	<field name="res_model">calendar.attendee</field>
-	 	<field name="view_type">form</field>
-	 	<field name="view_mode">tree,form</field>
-	 	<field name="view_id" ref="caldav_attendee_tree_view" />
-	 	<field name="domain">[('user_id', '=', uid)]</field>
-	 	<field name="context">{'default_sent_by_uid': uid}</field>
-	 </record>
-
-	 <record id="action_invitation_tree_view1" model="ir.actions.act_window.view">
-	 	<field eval="1" name="sequence" />
-	 	<field name="view_mode">tree</field>
-	 	<field name="view_id" ref="caldav_attendee_tree_view" />
-	 	<field name="act_window_id" ref="action_view_attendee_form" />
-	 </record>
 	 
-	 <record id="action_invitation_form_view1" model="ir.actions.act_window.view">
-	 	<field eval="2" name="sequence" />
-	 	<field name="view_mode">form</field>
-	 	<field name="view_id" ref="caldav_attendee_form_view" />
-	 	<field name="act_window_id" ref="action_view_attendee_form" />
-	 </record>
 	 
         <record id="res_alarm_form_view" model="ir.ui.view">
             <field name="name">res.alarm.form</field>
@@ -251,7 +230,7 @@
             </field>
         </record>
 	
-	<record id="action_calendar_custom_rrule_wizard" model="ir.actions.act_window">
+    	<record id="action_calendar_custom_rrule_wizard" model="ir.actions.act_window">
             <field name="name">Custom Rule</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">calendar.custom.rrule</field>
@@ -260,9 +239,7 @@
             <field name="target">new</field>
         </record>
         
-        <menuitem id="menu_attendee_invitations"
-			name="My Invitations" parent="base_calendar.menu_calendar_configuration"
-			sequence="10" action="action_view_attendee_form" />
+        
         
         <!--	Available alarms-->
 
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index c18a6e4554d..34d03979897 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -119,6 +119,22 @@
     <menuitem name="Meetings" id="menu_meeting_sale" parent="base.menu_base_partner" sequence="3"/>
     <menuitem name="Meetings" id="menu_crm_case_categ_meet" action="crm_case_categ_meet" parent="menu_meeting_sale" sequence="1"/>
 
+    <record id="action_view_attendee_form" model="ir.actions.act_window">
+	 	<field name="name">Meeting Invitations</field>
+	 	<field name="type">ir.actions.act_window</field>
+	 	<field name="res_model">calendar.attendee</field>
+	 	<field name="view_type">form</field>
+	 	<field name="view_mode">tree,form</field>
+	 	<field name="view_id" ref="caldav.caldav_attendee_tree_view" />	 	
+        <field name="domain">[('ref','like','crm.meeting,')]</field>
+	 	<field name="context">{'default_sent_by_uid': uid}</field>
+	 </record>
+
+    <menuitem id="menu_attendee_invitations"
+			name="Meeting Invitations" parent="menu_meeting_sale"
+			sequence="10" action="action_view_attendee_form" />
+    
+
     <record model="ir.actions.act_window" id="crm_case_category_act_meetall3">
         <field name="name">Next Meetings</field>
         <field name="res_model">crm.meeting</field>

From efbad4f5792b06043f136aa4110c27254666ba88 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Tue, 2 Feb 2010 14:33:34 +0530
Subject: [PATCH 33/68] [IMP]: base_calendar: Improvement for importing proper
 timezone data

bzr revid: rpa@openerp.co.in-20100202090334-15isyc18bdidktom
---
 addons/base_calendar/base_calendar.py | 11 +++++------
 addons/caldav/caldav.py               |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 70395eecb10..6cb7e5324fd 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -197,6 +197,8 @@ class CalDAV(object):
                 self.ical_set(cal_data.name.lower(), vals, 'value')
                 continue
             if cal_data.name.lower() in self.__attribute__:
+                if cal_data.params.get('X-VOBJ-ORIGINAL-TZID'):
+                    self.ical_set('vtimezone', cal_data.params.get('X-VOBJ-ORIGINAL-TZID'), 'value')
                 self.ical_set(cal_data.name.lower(), cal_data.value, 'value')
         vals = map_data(cr, uid, self)
         return vals
@@ -258,7 +260,7 @@ class CalDAV(object):
                                 dtfield = vevent.add(field)
                                 dtfield.value = parser.parse(data[map_field])
                                 if tzval:
-                                    dtfield.params['TZID'] = [tzval]
+                                    dtfield.params['TZID'] = [tzval.title()]
                         elif map_type == "timedelta":
                             vevent.add(field).value = timedelta(hours=data[map_field])
                         elif map_type == "many2one":
@@ -315,9 +317,6 @@ class CalDAV(object):
         for child in parsedCal.getChildren():
             if child.name.lower() in ('vevent', 'vtodo'):
                 vals = self.parse_ics(cr, uid, child, context=context)
-            elif child.name.lower() == 'vtimezone':
-                tz_obj = self.pool.get('basic.calendar.timezone')
-                tz_obj.import_cal(cr, uid, child, context=context)
             else:
                 vals = {}
                 continue
@@ -623,7 +622,7 @@ class Timezone(CalDAV, osv.osv_memory):
     }
     
     def get_name_offset(self, cr, uid, tzid, context={}):
-        mytz = pytz.timezone(tzid)
+        mytz = pytz.timezone(tzid.title())
         mydt = datetime.now(tz=mytz)
         offset = mydt.utcoffset()
         val = offset.days * 24 + float(offset.seconds) / 3600
@@ -636,7 +635,7 @@ class Timezone(CalDAV, osv.osv_memory):
         ctx = context.copy()
         ctx.update({'model': model})
         cal_tz = ical.add('vtimezone')
-        cal_tz.add('TZID').value = tzid
+        cal_tz.add('TZID').value = tzid.title()
         tz_std = cal_tz.add('STANDARD')
         tzname, offset = self.get_name_offset(cr, uid, tzid)
         tz_std.add("TZOFFSETFROM").value = offset
diff --git a/addons/caldav/caldav.py b/addons/caldav/caldav.py
index 9b24c145a1b..be51f321f9d 100644
--- a/addons/caldav/caldav.py
+++ b/addons/caldav/caldav.py
@@ -426,7 +426,7 @@ class calendar_event(osv.osv):
     __attribute__ = {}
     
     def _tz_get(self,cr,uid, context={}):
-        return [(x, x) for x in pytz.all_timezones]
+        return [(x.lower(), x) for x in pytz.all_timezones]
 
     def onchange_rrule_type(self, cr, uid, ids, rtype, *args, **argv):
         if rtype == 'none' or not rtype:

From 2b4d6bb821cba997001225b19e40ab34bb17f196 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Tue, 2 Feb 2010 14:34:27 +0530
Subject: [PATCH 34/68] [FIX]orm : format_trace is not available in traceback
 module. format_exc use instand of that

bzr revid: hmo@tinyerp.com-20100202090427-r2eefz8j6ee00uy1
---
 bin/osv/orm.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 223c2875f03..4d874824196 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -165,7 +165,7 @@ class browse_record(object):
             else:
                 self.logger.notifyChannel("browse_record", netsvc.LOG_WARNING,
                     "Field '%s' does not exist in object '%s': \n%s" % (
-                        name, self, ''.join(traceback.format_trace())))
+                        name, self, ''.join(traceback.format_exc())))
                 raise KeyError("Field '%s' does not exist in object '%s'" % (
                     name, self))
 
@@ -203,7 +203,7 @@ class browse_record(object):
                 # Where did those ids come from? Perhaps old entries in ir_model_dat?
                 self.logger.notifyChannel("browse_record", netsvc.LOG_WARNING,
                     "No datas found for ids %s in %s \n%s" % (
-                        ids, self, ''.join(traceback.format_trace())))
+                        ids, self, ''.join(traceback.format_exc())))
                 raise KeyError('Field %s not found in %s'%(name,self))
             # create browse records for 'remote' objects
             for data in datas:

From 0111d8b79e1d60e6ece8573e33dc103e2ec72a3b Mon Sep 17 00:00:00 2001
From: "RCH(Open ERP)" <>
Date: Tue, 2 Feb 2010 14:43:30 +0530
Subject: [PATCH 35/68] [Fix] report_task : problem of date_close. Replace
 date_close to date_end

bzr revid: vir@tinyerp.com-20100202091330-u9x2765j9lwi7oyo
---
 addons/report_task/report_task.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/report_task/report_task.py b/addons/report_task/report_task.py
index 2c13b570b86..2c53267f7d9 100644
--- a/addons/report_task/report_task.py
+++ b/addons/report_task/report_task.py
@@ -91,10 +91,11 @@ class  report_closed_task(osv.osv):
                    tsk.date_deadline as date_deadline, tsk.planned_hours as planned_hours,
                    tsk.delay_hours as delay_hours, tsk.progress as progress,
                    tsk.priority as priority, tsk.state as state,
-                   tsk.remaining_hours as remaining_hours
+                   tsk.remaining_hours as remaining_hours, tsk.date_end as date_close
                 from
                     project_task tsk
-
+              where
+                    (tsk.date_end <= CURRENT_DATE AND tsk.date_end > (CURRENT_DATE-15))
             )
         ''')
 report_closed_task()

From f0e09d4726d6c45c7f6b8fa71f02e5bde763be9f Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Tue, 2 Feb 2010 15:03:00 +0530
Subject: [PATCH 36/68] [Fix] report_project : Changed to date_close to
 date_end

bzr revid: vir@tinyerp.com-20100202093300-3do38c3ipo203lcy
---
 addons/report_project/report_project.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/report_project/report_project.py b/addons/report_project/report_project.py
index f894b9301dc..183163813da 100644
--- a/addons/report_project/report_project.py
+++ b/addons/report_project/report_project.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -46,13 +46,13 @@ class report_project_task_user(osv.osv):
             create or replace view report_project_task_user as (
                 select
                     min(t.id) as id,
-                    to_char(date_close, 'YYYY') as name,
-                    to_char(date_close, 'MM') as month,
+                    to_char(date_end, 'YYYY') as name,
+                    to_char(date_end, 'MM') as month,
                     count(distinct t.id) as task_closed,
                     t.user_id,
                     t.project_id,
                     sum(planned_hours) as hours_planned,
-                    to_char(avg(date_close::abstime-t.create_date::timestamp), 'DD"d" HH24:MI:SS') as closing_days,
+                    to_char(avg(date_end::abstime-t.create_date::timestamp), 'DD"d" HH24:MI:SS') as closing_days,
                     sum(w.hours) as hours_effective,
                     ((sum(planned_hours)-sum(w.hours))/count(distinct t.id))::decimal(16,2) as hours_delay
                 from project_task t
@@ -60,7 +60,7 @@ class report_project_task_user(osv.osv):
                 where
                     t.state='done'
                 group by
-                    to_char(date_close, 'YYYY'),to_char(date_close, 'MM'),t.user_id,project_id
+                    to_char(date_end, 'YYYY'),to_char(date_end, 'MM'),t.user_id,project_id
             )
         """)
 report_project_task_user()
@@ -89,12 +89,12 @@ class report_project_task(osv.osv):
             create or replace view report_project_task as (
                 select
                     min(t.id) as id,
-                    to_char(date_close, 'YYYY') as name,
-                    to_char(date_close, 'MM') as month,
+                    to_char(date_end, 'YYYY') as name,
+                    to_char(date_end, 'MM') as month,
                     count(distinct t.id) as task_closed,
                     t.project_id,
                     sum(planned_hours) as hours_planned,
-                    to_char(avg(date_close::abstime-t.create_date::timestamp), 'DD"d" HH12:MI:SS') as closing_days,
+                    to_char(avg(date_end::abstime-t.create_date::timestamp), 'DD"d" HH12:MI:SS') as closing_days,
                     sum(w.hours) as hours_effective,
                     ((sum(planned_hours)-sum(w.hours))/count(distinct t.id))::decimal(16,2) as hours_delay
                 from project_task t
@@ -102,7 +102,7 @@ class report_project_task(osv.osv):
                 where
                     t.state='done'
                 group by
-                    to_char(date_close, 'YYYY'),to_char(date_close, 'MM'),project_id
+                    to_char(date_end, 'YYYY'),to_char(date_end, 'MM'),project_id
             )
         """)
 report_project_task()

From 523d374327e27932615661a7dfbe971cadb94075 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Tue, 2 Feb 2010 15:08:44 +0530
Subject: [PATCH 37/68] [IMP]: caldav: Improvement for proper data in  attendee
 invitations

bzr revid: rpa@openerp.co.in-20100202093844-rgeg44obbemkg7tn
---
 addons/caldav/caldav.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/caldav/caldav.py b/addons/caldav/caldav.py
index be51f321f9d..66c336f0f6a 100644
--- a/addons/caldav/caldav.py
+++ b/addons/caldav/caldav.py
@@ -112,12 +112,11 @@ class calendar_attendee(osv.osv):
                 fromdata = map(get_delegate_data, attdata.del_from_user_ids)
                 result[id][name] = ', '.join(fromdata)
             if name == 'event_date':
-                # TO fix date for project task
                 if attdata.ref:
                     model, res_id = tuple(attdata.ref.split(','))
                     model_obj = self.pool.get(model)
                     obj = model_obj.read(cr, uid, res_id, ['date'])[0]
-                    result[id][name] = None#obj['date']
+                    result[id][name] = obj['date']
                 else:
                     result[id][name] = None
             if name == 'event_end_date':
@@ -136,6 +135,10 @@ class calendar_attendee(osv.osv):
                     result[id][name] = obj['user_id']
                 else:
                     result[id][name] = uid
+            if name == 'language':
+                user_obj = self.pool.get('res.users')
+                lang = user_obj.read(cr, uid, uid, ['context_lang']) ['context_lang']
+                result[id][name] = lang.replace('_', '-')
         return result
 
     def _links_get(self, cr, uid, context={}):
@@ -182,11 +185,10 @@ request was delegated to"),
         'del_from_user_ids': fields.many2many('res.users', 'att_del_from_user_rel', \
                                       'attendee_id', 'user_id', 'Users'), 
         'sent_by': fields.function(_compute_data, method=True, string='Sent By', type="char", multi='sent_by', store=True, size=124, help="Specify the user that is acting on behalf of the calendar user"), 
-        'sent_by_uid': fields.many2one('res.users', 'Sent by User'), 
+        'sent_by_uid': fields.function(_compute_data, method=True, string='Sent By User', type="many2one", relation="res.users", multi='sent_by_uid'),
         'cn': fields.function(_compute_data, method=True, string='Common name', type="char", size=124, multi='cn', store=True), 
         'dir': fields.char('URI Reference', size=124, help="Reference to the URI that points to the directory information corresponding to the attendee."), 
-        'language': fields.selection(_lang_get, 'Language', 
-                                  help="To specify the language for text values in a property or property parameter."), 
+        'language':  fields.function(_compute_data, method=True, string='Language', type="selection", selection=_lang_get, multi='language', store=True, help="To specify the language for text values in a property or property parameter."),
         'user_id': fields.many2one('res.users', 'User'), 
         'partner_address_id': fields.many2one('res.partner.address', 'Contact'), 
         'partner_id':fields.related('partner_address_id', 'partner_id', type='many2one', relation='res.partner', string='Partner'), 

From 9285d5acf60855cba75634e3f5ffc803992aedd6 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 2 Feb 2010 15:55:54 +0530
Subject: [PATCH 38/68] [IMP] crm_hr:In search view add the domain for section
 id

bzr revid: sbh@tinyerp.com-20100202102554-f4hbq4gec9crlcbg
---
 addons/crm_hr/crm_hr_view.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/crm_hr/crm_hr_view.xml b/addons/crm_hr/crm_hr_view.xml
index ca0a7d635d7..f4a46ec9621 100644
--- a/addons/crm_hr/crm_hr_view.xml
+++ b/addons/crm_hr/crm_hr_view.xml
@@ -240,6 +240,12 @@
                    		<field name="email_from" select='1' string="Email"/>
                        <field name="user_id" select="1" widget="selection"/>
                    </group>
+					<field name="section_id" select="1" widget="selection" string="Section">
+ 						<filter icon="terp-crm"
+                               domain="[('section_id','=',context.get('section_id',False))]"
+                               help="My section"
+                           />					
+					</field>                         
                </search>
             </field>
         </record>

From 83e5509f9c86ddef5921dad105df178c1096393a Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Tue, 2 Feb 2010 16:04:25 +0530
Subject: [PATCH 39/68] [FIX] caldav: sent by user, event date display on
 attendee(invitation) form

bzr revid: hmo@tinyerp.com-20100202103425-ctcj8hd0fxqapli1
---
 addons/caldav/caldav.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/addons/caldav/caldav.py b/addons/caldav/caldav.py
index 66c336f0f6a..cf346ad3def 100644
--- a/addons/caldav/caldav.py
+++ b/addons/caldav/caldav.py
@@ -116,7 +116,7 @@ class calendar_attendee(osv.osv):
                     model, res_id = tuple(attdata.ref.split(','))
                     model_obj = self.pool.get(model)
                     obj = model_obj.read(cr, uid, res_id, ['date'])[0]
-                    result[id][name] = obj['date']
+                    result[id][name] = obj.get('date')
                 else:
                     result[id][name] = None
             if name == 'event_end_date':
@@ -124,7 +124,7 @@ class calendar_attendee(osv.osv):
                     model, res_id = tuple(attdata.ref.split(','))
                     model_obj = self.pool.get(model)
                     obj = model_obj.read(cr, uid, res_id, ['date_deadline'])[0]
-                    result[id][name] = obj['date_deadline']
+                    result[id][name] = obj.get('date_deadline')
                 else:
                     result[id][name] = None
             if name == 'sent_by_uid':
@@ -132,7 +132,7 @@ class calendar_attendee(osv.osv):
                     model, res_id = tuple(attdata.ref.split(','))
                     model_obj = self.pool.get(model)
                     obj = model_obj.read(cr, uid, res_id, ['user_id'])[0]
-                    result[id][name] = obj['user_id']
+                    result[id][name] = obj.get('user_id')
                 else:
                     result[id][name] = uid
             if name == 'language':
@@ -1003,9 +1003,7 @@ class res_users(osv.osv):
             status = 'busy'
             res.update({user_id:status})
 
-        #TOCHECK: Delegrated Event
-        #cr.execute("SELECT user_id,'busy' FROM att_del_to_user_rel where user_id = ANY(%s)", (ids,))
-        #res.update(cr.dictfetchall())
+        #TOCHECK: Delegrated Event        
         for user_id in ids:
             if user_id not in res:
                 res[user_id] = 'free'

From 274379ca3a769690f318772500c4315c0a1ec357 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 2 Feb 2010 16:34:03 +0530
Subject: [PATCH 40/68] [IMP] crm_hr:add domain for section id in search view

bzr revid: sbh@tinyerp.com-20100202110403-s7jthcnzaq9knwbq
---
 addons/crm_project/crm_bugs_view.xml    | 11 ++++++-----
 addons/crm_project/crm_feature_view.xml | 11 ++++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/addons/crm_project/crm_bugs_view.xml b/addons/crm_project/crm_bugs_view.xml
index 85a17d10505..7c17d1e6320 100644
--- a/addons/crm_project/crm_bugs_view.xml
+++ b/addons/crm_project/crm_bugs_view.xml
@@ -189,11 +189,12 @@
                    <field name="user_id" select="1" widget="selection">
                    	<filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Bugs" default="1"/>
                    </field>
-                   <field name="state" select="1">
-                       <filter icon="gtk-new" domain="[('state','=','draft')]" help="Draft Bugs"/>
-                       <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Bugs"/>
-                       <filter icon="gtk-media-pause" domain="[('state','=','pending')]" help="Pending Bugs"/>
-                   </field>
+					<field name="section_id" select="1" widget="selection" string="Section" default="context.get('section_id', False)">
+							<filter icon="terp-crm"
+                               domain="[('section_id','=',context.get('section_id',False))]"
+                               help="My section"
+                           />
+                 </field>
                </group>
             </search>
          </field>
diff --git a/addons/crm_project/crm_feature_view.xml b/addons/crm_project/crm_feature_view.xml
index 547eb8a53e4..30f330fe891 100644
--- a/addons/crm_project/crm_feature_view.xml
+++ b/addons/crm_project/crm_feature_view.xml
@@ -164,11 +164,12 @@
                    <field name="user_id" select="1" widget="selection">
                    	<filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Future Requests" default="1"/>
                    </field>
-                   <field name="state" select="1">
-                       <filter icon="gtk-new" domain="[('state','=','draft')]" help="Draft Future Requests"/>
-                       <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Future Requests"/>
-                       <filter icon="gtk-media-pause" domain="[('state','=','pending')]" help="Pending Future Requests"/>
-                   </field>
+					<field name="section_id" select="1" widget="selection" string="Section" default="context.get('section_id', False)">
+							<filter icon="terp-crm"
+                               domain="[('section_id','=',context.get('section_id',False))]"
+                               help="My section"
+                           />
+                    </field>       
                </group>
             </search>
          </field>

From 63ae8274cecc171185bffeabf082aef9f14a5e2d Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Tue, 2 Feb 2010 16:54:35 +0530
Subject: [PATCH 41/68] [FIX]: base_calendar, caldav: Fixed problem of wrong
 attendee data

bzr revid: rpa@openerp.co.in-20100202112435-r6b2bm4e60i9ba5b
---
 addons/base_calendar/base_calendar.py |  7 ++++---
 addons/caldav/caldav.py               | 13 +++++++------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 6cb7e5324fd..31b2d7f7cc8 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -775,14 +775,15 @@ class Attendee(CalDAV, osv.osv_memory):
             cn_val = ''
             for a_key, a_val in self.__attribute__.items():
                 if attendee[a_val['field']] and a_val['field'] != 'cn':
-                    if a_val['type'] == 'text':
+                    if a_val['type'] in ('text', 'char', 'selection'):
                         attendee_add.params[a_key] = [str(attendee[a_val['field']])]
                     elif a_val['type'] == 'boolean':
                         attendee_add.params[a_key] = [str(attendee[a_val['field']])]
                 if a_val['field'] == 'cn' and attendee[a_val['field']]:
                     cn_val = [str(attendee[a_val['field']])]
-            if cn_val:
-                attendee_add.params['CN'] = cn_val
+                    if cn_val:
+                        attendee_add.params['CN'] = cn_val
+            attendee_add.value = 'MAILTO:' + attendee['email']
         return vevent
 
 Attendee()
diff --git a/addons/caldav/caldav.py b/addons/caldav/caldav.py
index cf346ad3def..160e9dea599 100644
--- a/addons/caldav/caldav.py
+++ b/addons/caldav/caldav.py
@@ -82,8 +82,11 @@ class calendar_attendee(osv.osv):
         result = {}
 
         def get_delegate_data(user):
-            email = user.address_id and user.address_id.email or ''
-            return self._get_address(user.name, email)
+            if not user.address_id.email:
+                raise osv.except_osv(_('Error!'), \
+                                ("User does not have an email Address"))
+            email = (user.address_id and ('MAILTO:' + user.address_id.email)) or ''
+            return email
 
         for attdata in self.browse(cr, uid, ids, context=context):
             id = attdata.id
@@ -192,7 +195,7 @@ request was delegated to"),
         'user_id': fields.many2one('res.users', 'User'), 
         'partner_address_id': fields.many2one('res.partner.address', 'Contact'), 
         'partner_id':fields.related('partner_address_id', 'partner_id', type='many2one', relation='res.partner', string='Partner'), 
-        'email': fields.char('Email', size=124), 
+        'email': fields.char('Email', size=124, required=True), 
         'event_date': fields.function(_compute_data, method=True, string='Event Date', type="datetime", multi='event_date'), 
         'event_end_date': fields.function(_compute_data, method=True, string='Event End Date', type="datetime", multi='event_end_date'), 
         'ref': fields.reference('Document Ref', selection=_links_get, size=128), 
@@ -503,9 +506,7 @@ rule or repeating pattern for anexception to a recurrence set"),
         event_data = self.read(cr, uid, ids)
         event_obj = self.pool.get('basic.calendar.event')
         ical = event_obj.export_cal(cr, uid, event_data, context={'model': self._name})
-        cal_val = ical.serialize()
-        cal_val = cal_val.replace('"', '').strip()
-        return cal_val
+        return ical.serialize()
 
     def import_cal(self, cr, uid, data, data_id=None, context={}):
         event_obj = self.pool.get('basic.calendar.event')

From 513c7881351a21229ec3fa5372a69b329203ec6e Mon Sep 17 00:00:00 2001
From: "HDA (OpenERP)" <hda@tinyerp.com>
Date: Tue, 2 Feb 2010 17:46:43 +0530
Subject: [PATCH 42/68] Removed menu without action

bzr revid: hda@tinyerp.com-20100202121643-315if8tlfhnxmxzb
---
 addons/purchase/purchase_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 4b6f184ebe2..f70b72cc604 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -27,9 +27,9 @@
      <!--Invoice control-->
       <menuitem id="menu_procurement_management_invoice" name="Invoice Control"
             parent="menu_purchase_root" sequence="6"/>
-     <menuitem name="Pending Invoices" id="menu_procurement_management_panding_invoice" action="account.action_invoice_tree_panding_invoice"
+<!--  <menuitem name="Pending Invoices" id="menu_procurement_management_panding_invoice" action="account.action_invoice_tree_panding_invoice"
       parent="menu_procurement_management_invoice"/>
-
+ -->
       <!--product menu-->
       <menuitem id="menu_procurement_management_product" name="Product"
             parent="menu_purchase_root" sequence="8"/>

From e88f9dd39b6bd55a8a81bca5875fe426d948869d Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Tue, 2 Feb 2010 17:51:26 +0530
Subject: [PATCH 43/68] [FIX]: caldav: Fixed problem of proper priority mapping
 in crm and project_calendar

bzr revid: rpa@openerp.co.in-20100202122126-rgyz6mfbxsihcvbp
---
 addons/crm/crm_meeting_data.xml                   | 3 ++-
 addons/project_calendar/project_calendar_data.xml | 9 +++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/addons/crm/crm_meeting_data.xml b/addons/crm/crm_meeting_data.xml
index 09566903d1c..a724d185e26 100644
--- a/addons/crm/crm_meeting_data.xml
+++ b/addons/crm/crm_meeting_data.xml
@@ -31,7 +31,7 @@
 <!--		Event Attribute mapping for Calendar-->
 
         <record model="basic.calendar" id="base_calendar.basic_calendar1">
-			<field name="name">meeting</field>
+			<field name="name">Meetings</field>
 		</record>
 
         <record model="basic.calendar.lines" id="caldav.calendar_lines_event">
@@ -102,6 +102,7 @@
 		    <field name="type_id" ref="caldav.calendar_lines_event" />
 			<field name="field_id" search="[('name','=','priority'),('model_id.model','=','crm.meeting')]" />
 		    <field name="fn">field</field>
+		    <field name="mapping">{'1': '1', '2': '2', '3': '2','4': '2', '5': '3', '6': '4', '7': '4', '8': '4', '9': '5'}</field>
 		</record>	
 		
 
diff --git a/addons/project_calendar/project_calendar_data.xml b/addons/project_calendar/project_calendar_data.xml
index 63b5e99333a..11e7885e3cd 100644
--- a/addons/project_calendar/project_calendar_data.xml
+++ b/addons/project_calendar/project_calendar_data.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0"?>
 <openerp>
 	<data noupdate="1">
+
         <record model="basic.calendar" id="base_calendar.basic_calendar2">
-			<field name="name">meeting_todo</field>
+			<field name="name">Meeting-Todo</field>
 		</record>
 		
         <record model="basic.calendar.lines" id="caldav.calendar_lines_todo">
@@ -81,6 +82,7 @@
 			<field name="type_id" ref="caldav.calendar_lines_todo" />
 			<field name="field_id" search="[('name','=','priority'),('model_id.model','=','project.task')]" />
 			<field name="fn">field</field>
+			<field name="mapping">{'1': '0', '2': '1', '3': '1','4': '1', '5': '2', '6': '3', '7': '3', '8': '3', '9': '4'}</field>
 		</record>
 
         <record model="basic.calendar.fields" id="map_todo_13">
@@ -439,10 +441,5 @@
             <field name="fn">field</field>
         </record>
 		
-		
-		
-		
-		
-		
 	</data>
 </openerp>

From 3974ad0f611e329f6a9d578142e3dfc7cfd762c7 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 2 Feb 2010 19:03:38 +0530
Subject: [PATCH 44/68] [Fix] project :fix the Wrong ID problem

bzr revid: sbh@tinyerp.com-20100202133338-1qp1f4mrz4373zdz
---
 addons/project/project.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 35b6e3840ff..e35c94d264f 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -254,7 +254,7 @@ class task(osv.osv):
 
     def _default_project(self, cr, uid, context={}):
         if 'project_id' in context and context['project_id']:
-            return context['project_id']
+            return int(context['project_id'])
         return False
 
     #_sql_constraints = [
@@ -527,6 +527,12 @@ class message(osv.osv):
         'date': fields.date('Date'),
         'user_id': fields.many2one('res.users', 'User'),
         }
+    def _default_project(self, cr, uid, context={}):
+        if 'project_id' in context and context['project_id']:
+            return int(context['project_id'])
+        return False    
+    _defaults = {
+              'project_id':_default_project}    
 message()
 
 def _project_get(self, cr, uid, context={}):

From c9339c84bbf04253c57f3948b38adb646758a8ba Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Tue, 2 Feb 2010 19:18:55 +0530
Subject: [PATCH 45/68] [IMP]: Caldav: Send invitation mail while inviting
 external user

bzr revid: rpa@openerp.co.in-20100202134855-cammwbzrtt6wr80d
---
 addons/caldav/caldav.py | 68 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/addons/caldav/caldav.py b/addons/caldav/caldav.py
index 160e9dea599..1e2aa15b77a 100644
--- a/addons/caldav/caldav.py
+++ b/addons/caldav/caldav.py
@@ -31,6 +31,7 @@ import pooler
 import pytz
 import re
 import time
+import tools
 
 months = {
         1:"January", 2:"February", 3:"March", 4:"April", \
@@ -65,6 +66,54 @@ def _links_get(self, cr, uid, context={}):
     res = obj.read(cr, uid, ids, ['object', 'name'], context)
     return [(r['object'], r['name']) for r in res]
 
+html_invitation = """
+<head>
+<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+<title>%(name)s</title>
+</head>
+<div>
+<table cellspacing="0" cellpadding="0" border=3D "1" summary=3D"">
+    <tr align="center">
+        <td bgcolor="DFDFDF">
+        <h3>%(name)s</h3>
+        </td>
+    </tr>
+    <tr>
+        <td>
+        <table cellpadding="8" cellspacing="0" border=3D "0" summary=3D
+            "Eventdetails" bgcolor="f6f6f6">
+            <tr>
+                <td>
+                <div><b><i>Start Date</i></b></div>
+                </td>
+                <td>%(start_date)s</td>
+                <td>
+                <div><b><i>End Date</i></b></div>
+                </td>
+                <td>%(end_date)s</td>
+            </tr>
+            <tr>
+                <td><b><i>Description</i></b></td>
+                <td colspan="3">%(description)s</td>
+            </tr>
+            <tr>
+                <td>
+                <div><b><i>Location</i></b></div>
+                </td>
+                <td colspan="3">%(location)s</td>
+            </tr>
+            <tr>
+                <td>
+                <div><b><i>Event Attendees</i></b></div>
+                </td>
+                <td colspan="3">
+                <div>
+                <div>%(attendees)s</div>
+                </div>
+                </td>
+            </tr>
+        </table>"""
+
 class calendar_attendee(osv.osv):
     _name = 'calendar.attendee'
     _description = 'Attendee information'
@@ -1064,6 +1113,25 @@ class invite_attendee_wizard(osv.osv_memory):
             vals.update({'email': datas['email']})
             att_id = att_obj.create(cr, uid, vals)
             obj.write(cr, uid, res_obj.id, {'attendee_ids': [(4, att_id)]})
+
+            sub = '[OpenERP Invitation] %s'  % (res_obj.name)
+            body_vals = {'name': res_obj.name, 
+                        'start_date': res_obj.date, 
+                        'end_date': res_obj.date_deadline or None, 
+                        'description': res_obj.description, 
+                        'location': res_obj.location or '-', 
+                        'attendees': '-' #Todo
+            }
+            body = html_invitation % body_vals
+            mail_to = [datas['email']]
+            tools.email_send(
+                    res_obj.user_id.name, 
+                    mail_to, 
+                    sub, 
+                    body, 
+                    subtype='html'
+                )
+
         elif  type == 'partner':
             add_obj = self.pool.get('res.partner.address')
             for contact in  add_obj.browse(cr, uid, datas['contact_ids']):

From 167b79423fe2838bcbf9252c1da539983ea6553e Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Tue, 2 Feb 2010 19:21:00 +0530
Subject: [PATCH 46/68] [FIX] base: default company

bzr revid: hmo@tinyerp.com-20100202135100-cj9oqg6i1is3dn68
---
 bin/addons/base/base_update.xml    |  2 +-
 bin/addons/base/res/res_company.py |  3 +--
 bin/addons/base/res/res_user.py    | 34 +++++++++---------------------
 3 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 93c33fd9a9d..2475de60db4 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -78,7 +78,7 @@
                 <form string="Users">
                 	<notebook colspan="4">
                 		<page string="Current Activity">
-                    		<field name="company_id" widget="selection" readonly="0" domain="[('user_ids','=',uid)]"/>
+                    		<field name="company_id" widget="selection" readonly="0"/>
                     		<newline/>
                     		<separator colspan="4" string="Preferences"/>
                     	</page>
diff --git a/bin/addons/base/res/res_company.py b/bin/addons/base/res/res_company.py
index bfc2b7291ef..7b751eb7c20 100644
--- a/bin/addons/base/res/res_company.py
+++ b/bin/addons/base/res/res_company.py
@@ -86,8 +86,7 @@ class res_company(osv.osv):
         'currency_id': fields.many2one('res.currency', 'Currency', required=True),
         'currency_ids': fields.one2many('res.currency', 'company_id', 'Currency'),
         'user_ids': fields.many2many('res.users', 'res_company_users_rel', 'cid', 'user_id', 'Accepted Users')
-    }
-
+    }    
 
     def _company_default_get(self, cr, uid, object=False, field=False, context=None):
         """
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index c85f2544e3c..c459fbbe5a1 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -113,12 +113,6 @@ def _lang_get(self, cr, uid, context={}):
 def _tz_get(self,cr,uid, context={}):
     return [(x, x) for x in pytz.all_timezones]
 
-def _companies_get(self,cr, uid, context={}):
-    res=[]
-    ids = self.pool.get('res.users').browse(cr, uid, uid, context).company_ids
-    res = [(i.id,i.name) for i in ids]
-    return res
-
 class users(osv.osv):
     __admin_ids = {}
     _uid_cache = {}
@@ -147,8 +141,7 @@ class users(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', help="The company this user is currently working on.", required=True),
         'company_ids':fields.many2many('res.company','res_company_users_rel','user_id','cid','Accepted Companies'),
         'context_lang': fields.selection(_lang_get, 'Language', required=True),
-        'context_tz': fields.selection(_tz_get,  'Timezone', size=64),
-        'company': fields.selection(_companies_get,  'Company', size=64),
+        'context_tz': fields.selection(_tz_get,  'Timezone', size=64),       
     }
     def read(self,cr, uid, ids, fields=None, context=None, load='_classic_read'):
         def override_password(o):
@@ -180,8 +173,11 @@ class users(osv.osv):
         ids = self.pool.get('ir.ui.menu').search(cr, uid, [('usage','=','menu')])
         return ids and ids[0] or False
 
-    def _get_company(self,cr, uid, context={}):
-        return self.pool.get('res.users').browse(cr, uid, uid, context).company_id.id
+    def _get_company(self,cr, uid, context={}, uid2=False):
+        if not uid2:
+            uid2 = uid
+        user = self.pool.get('res.users').browse(cr, uid, uid2, context)        
+        return user.company_id.id
 
     def _get_menu(self,cr, uid, context={}):
         ids = self.pool.get('ir.actions.act_window').search(cr, uid, [('usage','=','menu')])
@@ -201,9 +197,8 @@ class users(osv.osv):
         'groups_id': _get_group,
         'address_id': False,
     }
-    def company_get(self, cr, uid, uid2):
-        company_id = self.pool.get('res.users').browse(cr, uid, uid2).company_id.id
-        return company_id
+    def company_get(self, cr, uid, uid2, context={}):
+        return self._get_company(cr, uid, context=context, uid2=uid2)
     company_get = tools.cache()(company_get)
 
     def write(self, cr, uid, ids, values, *args, **argv):
@@ -251,13 +246,7 @@ class users(osv.osv):
                 result[k[8:]] = getattr(user,k)
         return result
 
-
-    def _check_company(self, cursor, user, ids):
-        for user in self.browse(cursor, user, ids):
-            if user.company_ids and (user.company_id.id not in map(lambda x: x.id, user.company_ids)):
-                return False
-        return True
-
+    
     def action_get(self, cr, uid, context={}):
         dataobj = self.pool.get('ir.model.data')
         data_id = dataobj._get_id(cr, 1, 'base', 'action_res_users_my')
@@ -312,10 +301,7 @@ class users(osv.osv):
         if not res:
             raise security.ExceptionNoTb('Bad username or password')
         return res[0]
-
-    _constraints = [
-        (_check_company, 'This user can not connect using this company !', ['company_id']),
-    ]
+   
 users()
 
 class config_users(osv.osv_memory):

From ca24db4e13e2ebba3bd84d2f59c54163fa196171 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Tue, 2 Feb 2010 19:42:37 +0530
Subject: [PATCH 47/68] [FIX] mrp: remove domain from procurement menu action

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

bzr revid: hmo@tinyerp.com-20100202141237-gvvrlg4176sffqif
---
 addons/mrp/mrp.py       | 4 ++--
 addons/mrp/mrp_view.xml | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 8aad4209b9d..59cc80fef11 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -790,7 +790,7 @@ class mrp_procurement(osv.osv):
         'priority': fields.selection([('0','Not urgent'),('1','Normal'),('2','Urgent'),('3','Very Urgent')], 'Priority', required=True),
         'date_planned': fields.datetime('Scheduled date', required=True),
         'date_close': fields.datetime('Date Closed'),
-        'product_id': fields.many2one('product.product', 'Product', required=True),
+        'product_id': fields.many2one('product.product', 'Product', required=True, states={'draft':[('readonly',False)]}, readonly=True),
         'product_qty': fields.float('Quantity', required=True, states={'draft':[('readonly',False)]}, readonly=True),
         'product_uom': fields.many2one('product.uom', 'Product UoM', required=True, states={'draft':[('readonly',False)]}, readonly=True),
         'product_uos_qty': fields.float('UoS Quantity', states={'draft':[('readonly',False)]}, readonly=True),
@@ -800,7 +800,7 @@ class mrp_procurement(osv.osv):
         'bom_id': fields.many2one('mrp.bom', 'BoM', ondelete='cascade', select=True),
 
         'close_move': fields.boolean('Close Move at end', required=True),
-        'location_id': fields.many2one('stock.location', 'Location', required=True),
+        'location_id': fields.many2one('stock.location', 'Location', required=True, states={'draft':[('readonly',False)]}, readonly=True),
         'procure_method': fields.selection([('make_to_stock','from stock'),('make_to_order','on order')], 'Requisition Method', states={'draft':[('readonly',False)], 'confirmed':[('readonly',False)]},
             readonly=True, required=True, help="If you encode manually a Requisition, you probably want to use" \
             " a make to order method."),
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 34ea506fb23..ad0e6b95935 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -772,8 +772,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.procurement</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','=','confirmed')]</field>
+            <field name="view_mode">tree,form</field>            
         </record>
 
       <menuitem action="mrp_procurement_action3" id="menu_procurement_requisitions" parent="purchase.menu_procurement_management"

From 8297e744f25ebeb022443b775bcdd8f927e25c91 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Tue, 2 Feb 2010 19:51:55 +0530
Subject: [PATCH 48/68] [FIX] purchase: remove comments from Pending Invoice
 Menu

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

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index f70b72cc604..4b6f184ebe2 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -27,9 +27,9 @@
      <!--Invoice control-->
       <menuitem id="menu_procurement_management_invoice" name="Invoice Control"
             parent="menu_purchase_root" sequence="6"/>
-<!--  <menuitem name="Pending Invoices" id="menu_procurement_management_panding_invoice" action="account.action_invoice_tree_panding_invoice"
+     <menuitem name="Pending Invoices" id="menu_procurement_management_panding_invoice" action="account.action_invoice_tree_panding_invoice"
       parent="menu_procurement_management_invoice"/>
- -->
+
       <!--product menu-->
       <menuitem id="menu_procurement_management_product" name="Product"
             parent="menu_purchase_root" sequence="8"/>

From 1350a121fdd9eb5c138f687d6cd87dd2b35acac0 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 2 Feb 2010 23:27:30 +0100
Subject: [PATCH 49/68] [Imp] add company on sequences

bzr revid: fp@tinyerp.com-20100202222730-vck4y6nl1qgc70sm
---
 bin/addons/base/ir/ir_sequence.py | 2 ++
 bin/tools/translate.py            | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/bin/addons/base/ir/ir_sequence.py b/bin/addons/base/ir/ir_sequence.py
index 1b9a23351ea..46428c80262 100644
--- a/bin/addons/base/ir/ir_sequence.py
+++ b/bin/addons/base/ir/ir_sequence.py
@@ -47,9 +47,11 @@ class ir_sequence(osv.osv):
         'number_next': fields.integer('Next Number', required=True),
         'number_increment': fields.integer('Increment Number', required=True),
         'padding' : fields.integer('Number padding', required=True),
+        'company_id': fields.many2one('res.company', 'Company'),
     }
     _defaults = {
         'active': lambda *a: True,
+        'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'ir.sequence', context=c),
         'number_increment': lambda *a: 1,
         'number_next': lambda *a: 1,
         'padding' : lambda *a : 0,
diff --git a/bin/tools/translate.py b/bin/tools/translate.py
index bfc078edd58..05f7f95e9b4 100644
--- a/bin/tools/translate.py
+++ b/bin/tools/translate.py
@@ -767,6 +767,8 @@ def trans_load_data(db_name, fileobj, fileformat, lang, strict=False, lang_name=
                 # the same source
                 obj = pool.get(model)
                 if obj:
+                    if not field in obj._columns:
+                        continue
                     ids = obj.search(cr, uid, [(field, '=', dic['src'])])
 
                     # if the resource id (res_id) is in that list, use it,

From 4f125c6983b39c74e9e6cd893fa2db6340eb9d26 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 3 Feb 2010 00:28:35 +0100
Subject: [PATCH 50/68] [IMP] removed reporting menu

bzr revid: fp@tinyerp.com-20100202232835-vz99jc6k3e0sy01m
---
 addons/board_project/board_project_view.xml |  2 +-
 addons/project/project_view.xml             | 40 +++------------------
 addons/report_task/report_task.py           |  4 +--
 3 files changed, 7 insertions(+), 39 deletions(-)

diff --git a/addons/board_project/board_project_view.xml b/addons/board_project/board_project_view.xml
index 3cadd1ed8b6..f1e27da0839 100644
--- a/addons/board_project/board_project_view.xml
+++ b/addons/board_project/board_project_view.xml
@@ -71,7 +71,7 @@
             <field name="res_model">project.message</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="project.view_project_editable_message_tree"/>
+            <field name="view_id" ref="project.view_project_message_tree"/>
        </record>
 
         <record id="action_view_project_member_tree" model="ir.actions.act_window">
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 51138dcdf0a..1e75b2a9a82 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -406,26 +406,6 @@
             </field>
         </record>
 
-        <record id="my_pending_task" model="ir.ui.view">
-            <field name="name">my.pending.task.tree</field>
-            <field name="model">project.task</field>
-            <field name="type">tree</field>
-            <field eval="2" name="priority"/>
-            <field name="arch" type="xml">
-                <tree colors="grey:state in ('cancelled','done');blue:remaining_hours&lt;0;red:bool(date_deadline) and (date_deadline&lt;current_date) and (state in ('draft','open'));black:state not in ('cancelled','done')" string="Tasks">
-                    <field name="sequence" string="Seq."/>
-                    <field name="name"/>
-                    <field name="project_id"/>
-                    <field name="delegated_user_id"/>
-                    <field name="date_deadline"/>
-                    <field name="remaining_hours" widget="float_time"/>
-                    <field name="progress" widget="progressbar"/>
-                    <field name="priority"/>
-                    <field name="state"/>
-                </tree>
-            </field>
-        </record>
-
         <record id="view_task_calendar" model="ir.ui.view">
             <field name="name">project.task.calendar</field>
             <field name="model">project.task</field>
@@ -491,6 +471,9 @@
                         <filter string="By Project" icon="terp-project" domain="[]" context="{'group_by':'project_id'}"/>
                         <filter string="By Stage" icon="terp-project" domain="[]" context="{'group_by':'type'}"/>
                         <filter string="By State" icon="terp-project" domain="[]" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Start Date" icon="terp-project" domain="[]" context="{'group_by':'date_start'}"/>
+                        <filter string="End Date" icon="terp-project" domain="[]" context="{'group_by':'date_end'}"/>
                     </group>
                 </search>
             </field>
@@ -656,7 +639,7 @@
        </record>
 
      <record id="view_project_message_tree" model="ir.ui.view">
-            <field name="name">project.message.form</field>
+            <field name="name">project.message.tree</field>
             <field name="model">project.message</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
@@ -685,20 +668,5 @@
 
         <act_window domain="[('user_id', '=', active_id),('date', '&gt;=', time.strftime('%Y-%m-01'))]" id="act_res_users_2_project_task_work_month" name="Month works" res_model="project.task.work" src_model="res.users" view_mode="tree,form" view_type="form"/>
 
-		<!-- Editable list of messages -->
-	    <record id="view_project_editable_message_tree" model="ir.ui.view">
-            <field name="name">project.message.form</field>
-            <field name="model">project.message</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Messages" editable="top">
-                        <field name="subject" select="1"/>
-                        <field name="description" select="1"/>
-                        <field name="project_id" select="1"/>
-                        <field name="date" select="1"/>
-                        <field name="user_id" select="1"/>
-                </tree>
-            </field>
-       </record>
     </data>
 </openerp>
diff --git a/addons/report_task/report_task.py b/addons/report_task/report_task.py
index 2c53267f7d9..54792395053 100644
--- a/addons/report_task/report_task.py
+++ b/addons/report_task/report_task.py
@@ -79,7 +79,7 @@ class  report_closed_task(osv.osv):
         'priority' : fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Urgent'), ('0','Very urgent')], 'Importance', readonly=True),
         'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'Status', readonly=True),
         'remaining_hours': fields.float('Remaining Hours', readonly=True),
-        'date_close' : fields.datetime('Date Closed', readonly=True)
+        'date_end' : fields.datetime('Date Closed', readonly=True)
     }
 
     def init(self, cr):
@@ -91,7 +91,7 @@ class  report_closed_task(osv.osv):
                    tsk.date_deadline as date_deadline, tsk.planned_hours as planned_hours,
                    tsk.delay_hours as delay_hours, tsk.progress as progress,
                    tsk.priority as priority, tsk.state as state,
-                   tsk.remaining_hours as remaining_hours, tsk.date_end as date_close
+                   tsk.remaining_hours as remaining_hours, tsk.date_end as date_end
                 from
                     project_task tsk
               where

From 7ef68b986be80bd3af4f01e23f40f137552a2174 Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Wed, 3 Feb 2010 04:46:34 +0000
Subject: [PATCH 51/68] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100203044634-ft3stpi5lo772db2
---
 bin/addons/base/i18n/hr.po | 4 ++--
 bin/addons/base/i18n/ja.po | 4 ++--
 bin/addons/base/i18n/tr.po | 6 +++---
 debian/po/hr.po            | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po
index 97f71727395..1ffc23dfc67 100644
--- a/bin/addons/base/i18n/hr.po
+++ b/bin/addons/base/i18n/hr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-02-01 10:37+0000\n"
+"PO-Revision-Date: 2010-02-02 05:57+0000\n"
 "Last-Translator: goranc <goranc@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: 2010-02-02 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-02-03 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po
index 3688ec5e3b2..357c26a7786 100644
--- a/bin/addons/base/i18n/ja.po
+++ b/bin/addons/base/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-02-01 05:36+0000\n"
+"PO-Revision-Date: 2010-02-02 06:00+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-02 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-02-03 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/tr.po b/bin/addons/base/i18n/tr.po
index 4eacd20c693..3536b695e75 100644
--- a/bin/addons/base/i18n/tr.po
+++ b/bin/addons/base/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-02-01 19:22+0000\n"
-"Last-Translator: Oktay Altunergil <Unknown>\n"
+"PO-Revision-Date: 2010-02-02 06:03+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.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: 2010-02-02 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-02-03 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/debian/po/hr.po b/debian/po/hr.po
index 2f496fec9fd..fbfddfaa363 100644
--- a/debian/po/hr.po
+++ b/debian/po/hr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2010-02-01 09:48+0000\n"
+"PO-Revision-Date: 2010-02-02 05:55+0000\n"
 "Last-Translator: goranc <goranc@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-02 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-02-03 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string

From 7e84979565be470d1bdbb4544fe4ad418f5cd97a Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Wed, 3 Feb 2010 04:47:12 +0000
Subject: [PATCH 52/68] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100203044712-qqsr1b80gza4r2fz
---
 addons/account_anglo_saxon/i18n/pl.po     |    6 +-
 addons/account_reporting/i18n/ru.po       |   18 +-
 addons/base_module_quality/i18n/ru.po     |   49 +-
 addons/base_report_creator/i18n/zh_CN.po  |    2 +-
 addons/base_setup/i18n/ru.po              |   14 +-
 addons/base_vat/i18n/ru.po                |   14 +-
 addons/board_crm_configuration/i18n/it.po |    8 +-
 addons/crm/i18n/es.po                     |    2 +-
 addons/crm/i18n/it.po                     |   38 +-
 addons/crm/i18n/pt_BR.po                  |   22 +-
 addons/document/i18n/zh_CN.po             |    2 +-
 addons/olap/i18n/it.po                    | 1399 +++++++++++++++++++++
 addons/thunderbird/i18n/it.po             |   87 ++
 13 files changed, 1579 insertions(+), 82 deletions(-)
 create mode 100644 addons/olap/i18n/it.po
 create mode 100644 addons/thunderbird/i18n/it.po

diff --git a/addons/account_anglo_saxon/i18n/pl.po b/addons/account_anglo_saxon/i18n/pl.po
index f23f6949fee..aab9ded1466 100644
--- a/addons/account_anglo_saxon/i18n/pl.po
+++ b/addons/account_anglo_saxon/i18n/pl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-11-24 12:50+0000\n"
-"PO-Revision-Date: 2010-01-06 01:42+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-02-02 06:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-22 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-02-03 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_anglo_saxon
diff --git a/addons/account_reporting/i18n/ru.po b/addons/account_reporting/i18n/ru.po
index 0395309484f..0fac8e23859 100644
--- a/addons/account_reporting/i18n/ru.po
+++ b/addons/account_reporting/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 16:28+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-02-02 17:25+0000\n"
+"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.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: 2009-12-16 05:20+0000\n"
+"X-Launchpad-Export-Date: 2010-02-03 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
@@ -58,7 +58,7 @@ msgstr "Балансовый отчет"
 #. module: account_reporting
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Недопустимое имя модели в определении действия."
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
@@ -78,7 +78,7 @@ msgstr "Распечатать балансовый отчет"
 #. module: account_reporting
 #: help:account.account.balancesheet.report,init,periods:0
 msgid "All periods if empty"
-msgstr ""
+msgstr "Если не заполнены все периоды"
 
 #. module: account_reporting
 #: field:account.report.bs,color_font:0
@@ -95,7 +95,7 @@ msgstr "Отчет с объектами, счетами и потомками 
 msgid ""
 "Financial and accounting reporting\n"
 "    Balance Sheet Report"
-msgstr ""
+msgstr "Финансовые и аналитические отчеты"
 
 #. module: account_reporting
 #: selection:account.report.bs,report_type:0
@@ -126,7 +126,7 @@ msgstr "Отчетность по счету"
 #. module: account_reporting
 #: model:ir.ui.menu,name:account_reporting.bs_report_action_form
 msgid "Balance Sheet Report Form"
-msgstr ""
+msgstr "Отчет главной книги (Форма)"
 
 #. module: account_reporting
 #: view:account.report.bs:0
@@ -166,7 +166,7 @@ msgstr "Цвета RML"
 #. module: account_reporting
 #: model:ir.module.module,shortdesc:account_reporting.module_meta_information
 msgid "Reporting of Balancesheet for accounting"
-msgstr ""
+msgstr "Отчет главной книги по счетам"
 
 #. module: account_reporting
 #: field:account.report.bs,code:0
@@ -207,7 +207,7 @@ msgstr "Учётные записи"
 #. module: account_reporting
 #: wizard_field:account.account.balancesheet.report,init,periods:0
 msgid "Periods"
-msgstr ""
+msgstr "Периоды"
 
 #. module: account_reporting
 #: field:account.report.bs,color_back:0
diff --git a/addons/base_module_quality/i18n/ru.po b/addons/base_module_quality/i18n/ru.po
index eb6a90f89b5..bd6fee8b068 100644
--- a/addons/base_module_quality/i18n/ru.po
+++ b/addons/base_module_quality/i18n/ru.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 08:55+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-02-02 17:45+0000\n"
+"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.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: 2009-12-16 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-02-03 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
 #: field:module.quality.check,final_score:0
 msgid "Final Score (%)"
-msgstr ""
+msgstr "% выполнения"
 
 #. module: base_module_quality
 #: constraint:ir.model:0
@@ -32,12 +32,12 @@ msgstr ""
 #. module: base_module_quality
 #: model:ir.module.module,shortdesc:base_module_quality.module_meta_information
 msgid "Base module quality"
-msgstr ""
+msgstr "Базисный модуль контроля качества"
 
 #. module: base_module_quality
 #: field:module.quality.check,name:0
 msgid "Rated Module"
-msgstr ""
+msgstr "Оценка модуля"
 
 #. module: base_module_quality
 #: view:module.quality.detail:0
@@ -47,17 +47,17 @@ msgstr "Подробности"
 #. module: base_module_quality
 #: field:module.quality.detail,note:0
 msgid "Note"
-msgstr ""
+msgstr "Заметка"
 
 #. module: base_module_quality
 #: field:module.quality.detail,state:0
 msgid "State"
-msgstr ""
+msgstr "Область/штат"
 
 #. module: base_module_quality
 #: field:module.quality.detail,detail:0
 msgid "Details"
-msgstr ""
+msgstr "Подробно"
 
 #. module: base_module_quality
 #: field:module.quality.detail,ponderation:0
@@ -75,12 +75,12 @@ msgstr ""
 #: view:module.quality.check:0
 #: field:module.quality.check,check_detail_ids:0
 msgid "Tests"
-msgstr ""
+msgstr "Тесты"
 
 #. module: base_module_quality
 #: selection:module.quality.detail,state:0
 msgid "Skipped"
-msgstr ""
+msgstr "Пропущено"
 
 #. module: base_module_quality
 #: help:module.quality.detail,state:0
@@ -88,6 +88,7 @@ msgid ""
 "The test will be completed only if the module is installed or if the test "
 "may be processed on uninstalled module."
 msgstr ""
+"Тест проводится только для установленных или помеченных для деинсталяции."
 
 #. module: base_module_quality
 #: constraint:ir.ui.view:0
@@ -102,27 +103,27 @@ msgstr ""
 #. module: base_module_quality
 #: field:module.quality.detail,name:0
 msgid "Name"
-msgstr ""
+msgstr "Имя"
 
 #. module: base_module_quality
 #: wizard_field:quality_detail_save,init,module_file:0
 msgid "Save report"
-msgstr ""
+msgstr "Сохранить отчет"
 
 #. module: base_module_quality
 #: wizard_field:quality_detail_save,init,name:0
 msgid "File name"
-msgstr ""
+msgstr "Имя файла"
 
 #. module: base_module_quality
 #: field:module.quality.detail,score:0
 msgid "Score (%)"
-msgstr ""
+msgstr "% выполнения"
 
 #. module: base_module_quality
 #: help:quality_detail_save,init,name:0
 msgid "Save report as .html format"
-msgstr ""
+msgstr "Сохранить отчет в формате HTML"
 
 #. module: base_module_quality
 #: view:module.quality.detail:0
@@ -133,22 +134,22 @@ msgstr "Аннотация"
 #. module: base_module_quality
 #: model:ir.actions.wizard,name:base_module_quality.quality_detail_save
 msgid "Report Save"
-msgstr ""
+msgstr "Сохранить отчет"
 
 #. module: base_module_quality
 #: wizard_view:quality_detail_save,init:0
 msgid "Standard entries"
-msgstr ""
+msgstr "Стандартные точки входа"
 
 #. module: base_module_quality
 #: view:module.quality.detail:0
 msgid "Save Report"
-msgstr ""
+msgstr "Сохранить отчет"
 
 #. module: base_module_quality
 #: model:ir.actions.wizard,name:base_module_quality.create_quality_check_id
 msgid "Quality Check"
-msgstr ""
+msgstr "Проверка качества"
 
 #. module: base_module_quality
 #: model:ir.model,name:base_module_quality.model_module_quality_detail
@@ -158,23 +159,23 @@ msgstr ""
 #. module: base_module_quality
 #: selection:module.quality.detail,state:0
 msgid "Done"
-msgstr ""
+msgstr "Завершено"
 
 #. module: base_module_quality
 #: view:module.quality.check:0
 #: view:module.quality.detail:0
 msgid "Result"
-msgstr ""
+msgstr "Результат"
 
 #. module: base_module_quality
 #: wizard_button:quality_detail_save,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Отмена"
 
 #. module: base_module_quality
 #: field:module.quality.detail,message:0
 msgid "Message"
-msgstr ""
+msgstr "Сообщение"
 
 #. module: base_module_quality
 #: field:module.quality.detail,quality_check_id:0
diff --git a/addons/base_report_creator/i18n/zh_CN.po b/addons/base_report_creator/i18n/zh_CN.po
index cfd7bb92238..6b64eeb3280 100644
--- a/addons/base_report_creator/i18n/zh_CN.po
+++ b/addons/base_report_creator/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-02 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-02-03 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_setup/i18n/ru.po b/addons/base_setup/i18n/ru.po
index 9000fd7722e..853d609b31b 100644
--- a/addons/base_setup/i18n/ru.po
+++ b/addons/base_setup/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 08:51+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-02-02 17:28+0000\n"
+"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.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: 2009-12-16 05:10+0000\n"
+"X-Launchpad-Export-Date: 2010-02-03 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
@@ -134,7 +134,7 @@ msgstr "Улица (2-я строка)"
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,company:0
 msgid "Report Information"
-msgstr ""
+msgstr "Информация об отчетах"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,phone:0
@@ -194,6 +194,9 @@ msgid ""
 "We suggest you to write legal sentences here:\n"
 "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
 msgstr ""
+"Это предложение появится внизу ваших отчетов.\n"
+"Рекомендуем поместить здесь юридическую информацию:\n"
+"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,update:0
@@ -219,6 +222,9 @@ msgid ""
 "We suggest you to put a slogan here:\n"
 "\"Open Source Business Solutions\"."
 msgstr ""
+"Это предложение появится в правом верхнем углу ваших отчетов.\n"
+"Рекомендуем поместить здесь слоган:\n"
+"\"Решения для бизнеса с открытым исходным кодом\"."
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,rml_header1:0
diff --git a/addons/base_vat/i18n/ru.po b/addons/base_vat/i18n/ru.po
index 3d8e316e279..fc16d1b23f8 100644
--- a/addons/base_vat/i18n/ru.po
+++ b/addons/base_vat/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 08:49+0000\n"
-"Last-Translator: Sergei Kostigoff <sergei.kostigoff@gmail.com>\n"
+"PO-Revision-Date: 2010-02-02 17:36+0000\n"
+"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.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: 2009-12-16 05:09+0000\n"
+"X-Launchpad-Export-Date: 2010-02-03 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
@@ -21,18 +21,20 @@ msgstr ""
 msgid ""
 "Enable the VAT Number for the partner. Check the validity of that VAT Number."
 msgstr ""
+"Разрешить использование кода налога для партнера. Проверьте правильность "
+"кода налога."
 
 #. module: base_vat
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "Неправильный XML для просмотра архитектуры!"
+msgstr "Некорректный формат XML структуры для просмотра."
 
 #. module: base_vat
 #: field:res.partner,vat_subjected:0
 msgid "VAT Legal Statement"
-msgstr "Официальное положение по НДС"
+msgstr "Действующий код налога"
 
 #. module: base_vat
 #: model:ir.module.module,shortdesc:base_vat.module_meta_information
 msgid "VAT"
-msgstr "НДС"
+msgstr "Код налога"
diff --git a/addons/board_crm_configuration/i18n/it.po b/addons/board_crm_configuration/i18n/it.po
index c662003bda4..dad58efb8b1 100644
--- a/addons/board_crm_configuration/i18n/it.po
+++ b/addons/board_crm_configuration/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 07:58+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-02-02 09:39+0000\n"
+"Last-Translator: Carlo Vettore <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: 2009-12-16 05:10+0000\n"
+"X-Launchpad-Export-Date: 2010-02-03 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_crm_configuration
@@ -86,7 +86,7 @@ msgstr "Richieste di Lavoro del Mese per Personale Assunto"
 #. module: board_crm_configuration
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome del modulo non valido nella definizione dell'azione."
 
 #. module: board_crm_configuration
 #: view:board.board:0
diff --git a/addons/crm/i18n/es.po b/addons/crm/i18n/es.po
index b03bf59f360..85c3f0e87cf 100644
--- a/addons/crm/i18n/es.po
+++ b/addons/crm/i18n/es.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: 2010-02-02 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-02-03 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/it.po b/addons/crm/i18n/it.po
index 39990a084d7..6d3527522a9 100644
--- a/addons/crm/i18n/it.po
+++ b/addons/crm/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-01-22 14:44+0000\n"
-"Last-Translator: Carlo <Unknown>\n"
+"PO-Revision-Date: 2010-02-02 16:15+0000\n"
+"Last-Translator: Carlo Vettore <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: 2010-01-23 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-02-03 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -678,7 +678,7 @@ msgstr "   Oggi   "
 #: wizard_view:crm.job.reschedule_phone_call,init:0
 #: wizard_view:crm.opportunity.reschedule_phone_call,init:0
 msgid "Phone Call Description"
-msgstr ""
+msgstr "Descrizione Chiamata Telefonica"
 
 #. module: crm
 #: view:crm.case.categ:0
@@ -1397,7 +1397,7 @@ msgstr "Casi aperti"
 #: field:report.crm.case.section.categ2,stage_id:0
 #: field:report.crm.case.section.stage,stage_id:0
 msgid "Stage"
-msgstr ""
+msgstr "Scenario"
 
 #. module: crm
 #: constraint:ir.ui.view:0
@@ -1428,7 +1428,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_case_stage_act
 #: model:ir.ui.menu,name:crm.menu_crm_case_stage_act
 msgid "Stages"
-msgstr ""
+msgstr "Tirocini"
 
 #. module: crm
 #: wizard_field:crm.case.opportunity.partner_opportunity,init,planned_revenue:0
@@ -1857,7 +1857,7 @@ msgstr "Permetti di cancellare i casi non in bozza"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor7
 msgid "Closed Lost"
-msgstr ""
+msgstr "Perdita chiusa"
 
 #. module: crm
 #: field:crm.menu.config_wizard,bugs:0
@@ -1886,7 +1886,7 @@ msgstr "Alta"
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
-msgstr ""
+msgstr "Converti candidato in business partner"
 
 #. module: crm
 #: view:crm.claim:0
@@ -2065,7 +2065,7 @@ msgstr "Minuti"
 #: field:report.crm.case.section.categ2,amount_revenue:0
 #: field:report.crm.case.section.stage,amount_revenue:0
 msgid "Est.Revenue"
-msgstr ""
+msgstr "Entrate stimate"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job1
@@ -2278,7 +2278,7 @@ msgstr "Luglio"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor1
 msgid "Prospecting"
-msgstr ""
+msgstr "Candidatura"
 
 #. module: crm
 #: field:crm.case,partner_name2:0
@@ -2362,7 +2362,7 @@ msgstr "Mese"
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_leads
 #: model:process.node,name:crm.process_node_leads0
 msgid "Leads"
-msgstr ""
+msgstr "Iniziative"
 
 #. module: crm
 #: wizard_button:crm.new.send.mail,init,send:0
@@ -2432,7 +2432,7 @@ msgstr "Note"
 #: field:report.crm.case.section.categ2,delay_close:0
 #: field:report.crm.case.section.stage,delay_close:0
 msgid "Delay Close"
-msgstr ""
+msgstr "Ritardo Chiusura"
 
 #. module: crm
 #: selection:crm.case,priority:0
@@ -2595,7 +2595,7 @@ msgstr ">"
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Phone"
-msgstr ""
+msgstr "Telefono Candidato"
 
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_send_mail
@@ -2759,7 +2759,7 @@ msgstr ""
 #: code:addons/crm/wizard/crm_phonecall_wizard.py:0
 #, python-format
 msgid "A partner is already existing with the same name."
-msgstr ""
+msgstr "Esiste già un Partner con lo stesso nome"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall
@@ -2899,7 +2899,7 @@ msgstr ""
 #. module: crm
 #: view:crm.job:0
 msgid "Open Jobs"
-msgstr ""
+msgstr "Lavori Aperti"
 
 #. module: crm
 #: selection:crm.email.add.cc,name:0
@@ -3071,7 +3071,7 @@ msgstr "Modulo Fondi"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Search Meetings"
-msgstr ""
+msgstr "Ricerca Incontri"
 
 #. module: crm
 #: selection:crm.lead.opportunity_set,create_partner,action:0
@@ -3174,7 +3174,7 @@ msgstr "Annullato"
 #. module: crm
 #: view:crm.job:0
 msgid "Applied Job"
-msgstr ""
+msgstr "Lavoro Svolto"
 
 #. module: crm
 #: help:crm.meeting,exrule:0
@@ -4008,7 +4008,7 @@ msgstr "Sequenza"
 #: wizard_view:caldav.crm.import,init:0
 #: wizard_field:caldav.crm.import,init,file_path:0
 msgid "Select ICS file"
-msgstr ""
+msgstr "Seleziona il file ICS"
 
 #. module: crm
 #: wizard_view:caldav.crm.import,display:0
@@ -4029,7 +4029,7 @@ msgstr "Casi per Sezione"
 #. module: crm
 #: view:crm.job:0
 msgid "New Jobs"
-msgstr ""
+msgstr "Nuovo Lavoro"
 
 #. module: crm
 #: field:crm.menu.config_wizard,fund:0
diff --git a/addons/crm/i18n/pt_BR.po b/addons/crm/i18n/pt_BR.po
index e81b4ec93c1..462d0108159 100644
--- a/addons/crm/i18n/pt_BR.po
+++ b/addons/crm/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-01-26 22:43+0000\n"
+"PO-Revision-Date: 2010-02-02 17:06+0000\n"
 "Last-Translator: pedrobom <pedrobomlimeira@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: 2010-01-29 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-02-03 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -1557,11 +1557,13 @@ msgid ""
 "Helps you to organise the jobs hiring process: evaluation, meetings, email "
 "integration..."
 msgstr ""
+"Ajuda você a organizar as tarefas do processo de contratação: avaliação, "
+"reuniões, integração de e-mail ..."
 
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Funds"
-msgstr ""
+msgstr "Fundos"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -1573,7 +1575,7 @@ msgstr "esboço"
 #: model:crm.case.stage,name:crm.stage_claim5
 #: model:crm.case.stage,name:crm.stage_meet4
 msgid "Awaiting Response"
-msgstr ""
+msgstr "Aguardando resposta"
 
 #. module: crm
 #: field:crm.case,date:0
@@ -1587,7 +1589,7 @@ msgstr "Data"
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Name"
-msgstr ""
+msgstr "Nome do candidato"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead2
@@ -1598,12 +1600,12 @@ msgstr ""
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_claim3
 msgid "Won't fix"
-msgstr ""
+msgstr "Não irá corrigir"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead4
 msgid "Converted"
-msgstr ""
+msgstr "Convertido"
 
 #. module: crm
 #: view:crm.case:0
@@ -1613,7 +1615,7 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Reply to Last Email"
-msgstr ""
+msgstr "Resposta ao último Email"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1623,7 +1625,7 @@ msgstr "Descrição da segmentação"
 #. module: crm
 #: help:crm.meeting,location:0
 msgid "Gives Location of Meeting"
-msgstr ""
+msgstr "Dá a localização da reunião"
 
 #. module: crm
 #: view:crm.case:0
@@ -1638,7 +1640,7 @@ msgstr "Histórico"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_job
 msgid "Job Cases"
-msgstr ""
+msgstr "Casos de Emprego"
 
 #. module: crm
 #: view:crm.job:0
diff --git a/addons/document/i18n/zh_CN.po b/addons/document/i18n/zh_CN.po
index e7c646b4847..e13dba025e8 100644
--- a/addons/document/i18n/zh_CN.po
+++ b/addons/document/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-02 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-02-03 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/olap/i18n/it.po b/addons/olap/i18n/it.po
new file mode 100644
index 00000000000..42cda6497d5
--- /dev/null
+++ b/addons/olap/i18n/it.po
@@ -0,0 +1,1399 @@
+# Italian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-26 05:24+0000\n"
+"PO-Revision-Date: 2010-02-02 16:04+0000\n"
+"Last-Translator: Carlo Vettore <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: 2010-02-03 04:47+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: olap
+#: view:olap.database.columns:0
+#: view:olap.database.tables:0
+msgid "Hide"
+msgstr "Nascondi"
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_saved_query_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_saved_query_form
+#: view:olap.saved.query:0
+msgid "Olap Saved Query"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,time:0
+#: field:olap.saved.query,time:0
+msgid "Time"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+msgid "Auto Configure Structure"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Olap fact database"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,value_sql:0
+msgid ""
+"You can provide valid sql expression. Make sure it have function with fully "
+"qualified column name like (sum,avg ...)(tablename.columnname (+,- ...) "
+"tablename.columnname)"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table,schema_id:0
+msgid "Schema id"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,database_id:0
+msgid "Database Connection"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,type:0
+msgid "MySQL"
+msgstr "MySQL"
+
+#. module: olap
+#: field:olap.fact.database,db_password:0
+msgid "Database password"
+msgstr "Password Database"
+
+#. module: olap
+#: view:olap.database.tables:0
+msgid "Olap database tables"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Connection url"
+msgstr ""
+
+#. module: olap
+#: view:olap.application.table:0
+msgid "Olap Application Table"
+msgstr ""
+
+#. module: olap
+#: field:olap.parameters.config.wizard,host_name:0
+msgid "Server Name"
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_password:0
+msgid "Password for the login."
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,application_id:0
+#: field:olap.application.table,application_id:0
+msgid "Application Id"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.todo,note:olap.config_auto_directory
+msgid "This wizard will configure the URL of the web client"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_fact_database_form
+#: model:ir.ui.menu,name:olap.menu_bi_conf_fact
+msgid "Fact Databases"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_browser_url
+msgid "Cube Browser"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_action_olap_dimension_form
+msgid "Olap Dimension"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_database_columns
+msgid "Olap Database Columns"
+msgstr ""
+
+#. module: olap
+#: view:olap.parameters.config.wizard:0
+msgid "BI Web Client."
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_port:0
+msgid " Port to be used in connection"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,primary_key:0
+msgid "Primary Key"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,table_id:0
+msgid "Table Id"
+msgstr ""
+
+#. module: olap
+#: view:olap.parameters.config.wizard:0
+msgid "This wizard will automatically configure the web client for BI."
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,type:0
+msgid "Database type"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.query_builder,back:0
+#: wizard_view:olap.query_builder,init:0
+msgid "Cube Fetcher"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,info:0
+#: wizard_view:olap.load.table,ok:0
+msgid "Your database structure has been correctly loaded"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_parameters_config_wizard
+msgid "Olap Server Parameters"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_cube_table_form
+msgid "Olap Cube Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,formatstring:0
+msgid "Format string"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.query_builder,exec,exec:0
+#: wizard_button:olap.query_builder,ok,exec:0
+msgid "Execute"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.application.configuration,configure,end:0
+#: wizard_button:olap.fact.database.test_connection,init,end:0
+#: wizard_button:olap.load.table,info,end:0
+#: wizard_button:olap.query.logs.clear,info,end:0
+#: wizard_button:olap.query.logs.clear,ok,end:0
+#: view:olap.warehouse.wizard:0
+msgid "Ok"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_conf_known_application
+msgid "Known Application"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,level:0
+#: wizard_field:olap.query_builder,ok,level:0
+msgid "Level"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,column_id_name:0
+#: field:olap.measure,value_column_id_name:0
+msgid "Column ID"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid ""
+"We will load the complete structure of the database by introspection, so "
+"that you will be able to work on it, and specify a better structure "
+"according to your reporting needs."
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_application_form
+msgid "Olap Applicatiion"
+msgstr ""
+
+#. module: olap
+#: field:olap.saved.query,name:0
+msgid "Query Name"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,mdx_query:0
+#: wizard_field:olap.query_builder,ok,mdx_query:0
+msgid "MDX Query"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_bi_auto_configure_wizard
+msgid "bi.auto.configure.wizard"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,primary_key:0
+msgid "Primary key"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.act_bi_auto_configure
+msgid "Auto Configuration"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,note:0
+msgid "Schema description"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.act_bi_load_db_wizard
+msgid "Load database Structure"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_level
+#: view:olap.level:0
+msgid "Olap level"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "None (0000.00)"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_host:0
+msgid "Database host"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_fact_database
+msgid "Olap Fact Database"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+msgid "Auto Congifuring Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.application,name:0
+msgid "Application name"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table,column_link_id:0
+msgid "Relational Column"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,type:0
+msgid "Level class"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,name:0
+msgid "Cube name"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_application_table_form
+msgid "Olap Applicatiion Table"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_saved_query
+msgid "olap.saved.query"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,column_name:0
+msgid "Columns Name"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_hierarchy_form
+msgid "Olap Hierarchies"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,ready:0
+msgid "Ready"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,measure_type:0
+#: field:olap.measure,value_column:0
+msgid "Fact Table Column"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_database_tables_form
+#: field:olap.application,table_ids:0
+#: view:olap.fact.database:0
+#: field:olap.fact.database,table_ids:0
+msgid "Tables"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_application
+msgid "Olap application"
+msgstr ""
+
+#. module: olap
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "Schema is ready to use"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_designer_url
+msgid "Cube Designer"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_login:0
+msgid "Database login"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_application_table_form
+msgid "Application Table"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.query.logs.clear,info:0
+#: wizard_view:olap.query.logs.clear,ok:0
+msgid "Logs Cleared successfully"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_schema
+#: model:ir.ui.menu,name:olap.menu_action_olap_schema_form
+#: view:olap.schema:0
+msgid "Olap Schema"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_application_form
+msgid "Application"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,mdx_query_output:0
+#: wizard_field:olap.query_builder,ok,mdx_query_output:0
+msgid "MDX Query Output"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,primary_key_table:0
+msgid "Primary key table"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,table_name:0
+msgid ""
+"The name of the table on which the column is defined. If False, take the "
+"table from the cube."
+msgstr ""
+
+#. module: olap
+#: view:olap.warehouse.wizard:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_dimension_form
+msgid "Olap Dimensions"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,user_id:0
+msgid "Tiny ERP User"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_application_configuration
+msgid "Configure from Application"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_port:0
+msgid "Database port"
+msgstr ""
+
+#. module: olap
+#: help:olap.parameters.config.wizard,host_port:0
+msgid ""
+"Put the port for the server. Put 8080 if                 its not clear."
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "The Structure is Loaded"
+msgstr ""
+
+#. module: olap
+#: field:olap.dimension,cube_id:0
+#: field:olap.measure,cube_id:0
+#: field:olap.query.logs,cube_id:0
+#: field:olap.saved.query,cube_id:0
+msgid "Cube"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table,available_table_ids:0
+msgid "Available Tables"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Configure Manually"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,related_to:0
+msgid "Related To"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.columns:0
+#: view:olap.database.tables:0
+msgid "Olap database columns"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table.line,field_id:0
+msgid "Link Field"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Mark as Configured"
+msgstr ""
+
+#. module: olap
+#: view:olap.application.field:0
+msgid "Olap Application Field"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Comma Seperator (0,000)"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,agregator:0
+msgid "Agregator"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,configure:0
+msgid "Your database structure (Open ERP) has been sucessfully configured."
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: olap
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: olap
+#: help:olap.parameters.config.wizard,host_name:0
+msgid ""
+"Put here the server address or IP                 Put localhost if its not "
+"clear."
+msgstr ""
+
+#. module: olap
+#: view:olap.database.tables:0
+msgid "Database tables"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Reload Structure"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,init:0
+msgid "This will Auto Configure Application"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid "Load Data Structure"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+#: view:bi.load.db.wizard:0
+#: wizard_button:olap.application.configuration,init,end:0
+#: wizard_button:olap.load.table,init,end:0
+#: view:olap.parameters.config.wizard:0
+#: wizard_button:olap.query.logs.clear,init,end:0
+#: wizard_button:olap.query_builder,exec,end:0
+#: wizard_button:olap.query_builder,ok,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid ""
+"After having loaded the structure, you will be able to hide/show or rename "
+"tables and columns to simplify end-users interface. The following database "
+"will be loaded:"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_level_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_level_form
+#: view:olap.level:0
+msgid "Olap Level"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,loaded:0
+msgid "Loaded"
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_name:0
+msgid "Name of the database to be used for analysis."
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_login:0
+msgid "Login for the database name specified."
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,dimension_id:0
+#: wizard_field:olap.query_builder,exec,dimension:0
+#: wizard_field:olap.query_builder,ok,dimension:0
+msgid "Dimension"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_application_table
+msgid "Olap application table"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,init:0
+msgid ""
+"We will load the complete structure of the database by introspection,      "
+"so that you will be able to work on it, and specify a better structure      "
+"according to your reporting needs."
+msgstr ""
+
+#. module: olap
+#: field:olap.saved.query,axis_keys:0
+msgid "Axis Keys"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,query_log:0
+msgid "Query Logging"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,measure_type:0
+msgid "Measure Type"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.tables,fact_database_id:0
+msgid "Database Id"
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_host:0
+msgid "Give hostname to make connection to the database."
+msgstr ""
+
+#. module: olap
+#: field:olap.level,hierarchy_id:0
+msgid "Hierarchy"
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "The Structure is Configured."
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_schema_form
+msgid "Olap Schemas"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,table_id:0
+msgid "Fact table"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+msgid ""
+"This will Auto Configure Application. This will help to increase the "
+"readability of the tables and columns by giving it meaningful and easy to "
+"comprehend name. You can hides particular data and columns by reconfiguring "
+"the structure option."
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_application_field_form
+msgid "Olap Applicatiion Field"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,query:0
+#: field:olap.saved.query,query:0
+#: view:olap.warehouse.wizard:0
+#: field:olap.warehouse.wizard,query:0
+msgid "Query"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Auto Application Configuration"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Postfix Default Currency(0000.00 EUR)"
+msgstr ""
+
+#. module: olap
+#: field:bi.load.db.wizard,db_name:0
+#: wizard_field:olap.load.table,init,db_name:0
+msgid "Database Name"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,measure_ids:0
+msgid "Measures"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_conf_cube_query_builder
+#: wizard_view:olap.query_builder,exec:0
+#: wizard_view:olap.query_builder,ok:0
+msgid "Query Builder"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,dimension_ids:0
+msgid "Dimensions"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_cube
+#: view:olap.cube:0
+msgid "Olap cube"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_warehouse
+#: model:ir.model,name:olap.model_olap_warehouse_wizard
+#: model:ir.ui.menu,name:olap.menu_bi_warehouse
+msgid "Olap Warehouse"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_application_field_form
+msgid "Application Field"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_dimension
+#: view:olap.dimension:0
+msgid "Olap dimension"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,name:0
+msgid "Application field name"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Connection parameters"
+msgstr ""
+
+#. module: olap
+#: field:bi.auto.configure.wizard,name:0
+#: field:bi.load.db.wizard,fact_table:0
+#: wizard_field:olap.load.table,init,fact_table:0
+msgid "Fact Name"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.columns:0
+msgid "Database columns"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.table,table_name:0
+#: field:olap.cube.table,name:0
+#: field:olap.level,table_name:0
+#: field:olap.measure,table_name:0
+msgid "Table name"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,measure_type:0
+msgid "Select between auto column or sql expression for the measures"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_load_column
+msgid "Open Columns"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_database_columns_form
+#: field:olap.database.tables,columns:0
+msgid "Columns"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_test_connection
+#: view:olap.fact.database:0
+msgid "Test Connection"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_measure_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_measure_form
+msgid "Olap Measures"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.application.configuration,init,configure:0
+#: view:olap.parameters.config.wizard:0
+msgid "Configure"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,init:0
+msgid ""
+"After having loaded the structure, you will be able to hide/show or      "
+"rename tables and columns to simplify end-users interface. The following "
+"database      will be loaded:"
+msgstr ""
+
+#. module: olap
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,hierarchy:0
+#: wizard_field:olap.query_builder,ok,hierarchy:0
+msgid "Hiearchy"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,measure_type:0
+#: field:olap.measure,value_sql:0
+msgid "SQL Expression"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_menu_olap_load_table
+msgid "Load Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,level_ids:0
+msgid "Levels"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_application_field
+msgid "Olap application field"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_database_columns_form
+msgid "Database Columns"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,active:0
+#: field:olap.database.tables,active:0
+msgid "Active"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,datatype:0
+msgid "Integer"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,init:0
+msgid " Auto Configure "
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,agregator:0
+msgid "Sum"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query.logs.clear,init,user_name:0
+#: field:olap.saved.query,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,count:0
+msgid "Count"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.tables,name:0
+msgid "End-User Name"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Postfix Default Currency with comma seperator (0,000.00 EUR)"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,datatype:0
+msgid "Datatype"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.query_builder,back,ok:0
+#: wizard_button:olap.query_builder,init,ok:0
+msgid "Fetch Data"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Prefix Default Currency with comma seperator (EUR 0,000.00)"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,info:0
+#: wizard_view:olap.load.table,ok:0
+#: wizard_view:olap.query.logs.clear,info:0
+#: wizard_view:olap.query.logs.clear,ok:0
+msgid "Load Data"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,query_ids:0
+msgid "Queries"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,type:0
+msgid "Oracle"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_cube_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_cube_form
+#: model:ir.ui.menu,name:olap.menu_bi_conf_cubes
+msgid "Olap Cubes"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_action_olap_cube_table_form
+msgid "Olap Cubes Table"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,name:0
+msgid "Measure name"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,connection_type:0
+msgid "Socket"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,connection_type:0
+msgid "Connection type"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,agregator:0
+msgid "count"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_name:0
+msgid "Database name"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,type:0
+msgid "Type"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.columns:0
+#: view:olap.database.tables:0
+msgid "Show"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.query_builder,exec,back:0
+#: wizard_button:olap.query_builder,ok,back:0
+msgid "Change cube"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_database_tables_form
+#: view:olap.cube.table:0
+#: field:olap.cube.table,line_ids:0
+msgid "Database Tables"
+msgstr ""
+
+#. module: olap
+#: help:olap.level,table_name:0
+msgid ""
+"The name of the table on which the column is defined. If False, take the "
+"table from the hierarchy."
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "Nothing has been Configured"
+msgstr ""
+
+#. module: olap
+#: field:olap.dimension,name:0
+msgid "Dimension name"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.load.table,ok,end:0
+msgid "Continue and Configure Structure"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_measure
+#: view:olap.measure:0
+msgid "Olap measure"
+msgstr ""
+
+#. module: olap
+#: help:olap.cube,table_id:0
+msgid "Table(s) for cube."
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,measure:0
+#: wizard_field:olap.query_builder,ok,measure:0
+msgid "Measure"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,column_db_name:0
+msgid "Column DBName"
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "We Can Start building Cube"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table.line,table_id:0
+msgid "Database Table"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,name:0
+msgid "Schema name"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_query_logs_my_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_query_logs_my_form
+#: view:olap.query.logs:0
+msgid "My Logs"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Information"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,back,cube_schema:0
+#: wizard_field:olap.query_builder,init,cube_schema:0
+msgid "Select Cube"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,table_id:0
+msgid "Fact table(s)"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.url,name:olap.menu_url_cube_designer
+msgid "name_menu_url_cube_designer"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_config_bi_parameters
+msgid "Parameters Configuration"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Connect to Database"
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "Database Connected"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,table_name:0
+#: field:olap.application.table,name:0
+msgid "Application table name"
+msgstr ""
+
+#. module: olap
+#: help:olap.hierarchy,table_id:0
+msgid "Table(s) to make hierarchy on the cube."
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "General information"
+msgstr ""
+
+#. module: olap
+#: field:olap.application,query:0
+msgid "Application Query"
+msgstr ""
+
+#. module: olap
+#: help:olap.cube,query_log:0
+msgid "Enabling  this will log all the queries in the browser"
+msgstr ""
+
+#. module: olap
+#: field:olap.saved.query,mdx_id:0
+msgid "Module"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,is_hidden:0
+#: field:olap.application.table,is_hidden:0
+#: field:olap.database.columns,hide:0
+#: field:olap.database.tables,hide:0
+msgid "Hidden"
+msgstr ""
+
+#. module: olap
+#: field:olap.dimension,hierarchy_ids:0
+msgid "Hierarchies"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,result_size:0
+msgid "Result Size"
+msgstr ""
+
+#. module: olap
+#: view:olap.application:0
+msgid "Olap Application"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_database_tables
+msgid "Olap Database Tables"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Prefix Default Currency (EUR 0000.00)"
+msgstr ""
+
+#. module: olap
+#: view:olap.cube.table:0
+msgid "Olap cube_table"
+msgstr ""
+
+#. module: olap
+#: view:olap.parameters.config.wizard:0
+msgid "Parameters Configure"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_hierarchy
+#: view:olap.hierarchy:0
+msgid "Olap hierarchy"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_cube_table
+#: model:ir.model,name:olap.model_olap_cube_table_line
+msgid "Olap cube table"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,field_name:0
+msgid "Field name"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_query_logs
+msgid "Olap query logs"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,name:0
+msgid "Fact name"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,formatstring:0
+msgid " Let you specify how the measure to be displayed in cube browser"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_server_parameters
+msgid "Server Parameters"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,init:0
+#: wizard_button:olap.load.table,init,ok:0
+#: view:olap.schema:0
+msgid "Load Database Structure"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,name:0
+msgid "Level name"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,schema_id:0
+#: field:olap.query.logs,schema_id:0
+#: field:olap.saved.query,schema_id:0
+msgid "Schema"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,connection_url:0
+#: field:olap.schema,app_detect:0
+msgid "Connection URL"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,cube_ids:0
+msgid "Cubes"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "ReConfigure Structure"
+msgstr ""
+
+#. module: olap
+#: field:olap.application,field_ids:0
+msgid "Fields"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,agregator:0
+msgid "Average"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid "Load Database Tables"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_action_olap_hierarchy_form
+msgid "Olap Hierarchy"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table.line,cube_table_id:0
+msgid "Cube Table"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi
+msgid "Businesss Intelligence"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_bi_load_db_wizard
+msgid "bi.load.db.wizard"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.url,name:olap.menu_url_cube_browser
+msgid "name_menu_url_cube_browser"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_fact_database_form
+msgid "Databases"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,name:0
+msgid "Hierarchy name"
+msgstr ""
+
+#. module: olap
+#: model:ir.module.module,description:olap.module_meta_information
+msgid ""
+"\n"
+"    Base module to manage Olap schemas. Cube designer.\n"
+"    "
+msgstr ""
+
+#. module: olap
+#: view:olap.cube.table:0
+msgid "Joined Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,loaded:0
+msgid "Loading Datastructure"
+msgstr ""
+
+#. module: olap
+#: view:olap.cube.table:0
+msgid "Joined Table"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,type:0
+msgid "PostgreSQL"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.query.logs.clear,init:0
+msgid " To Load Data"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,sequence:0
+#: field:olap.level,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_conf_tools
+msgid "Tools"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,state:0
+msgid "Schema State"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,datatype:0
+msgid "Float"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_query_logs_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_query_logs_form
+#: view:olap.query.logs:0
+msgid "All Logs"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,connection_type:0
+#: field:olap.parameters.config.wizard,host_port:0
+msgid "Port"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Fact database"
+msgstr ""
+
+#. module: olap
+#: model:ir.module.module,shortdesc:olap.module_meta_information
+msgid "olap"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,name:0
+msgid "Column Name"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.tables,table_db_name:0
+msgid "Table Name"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,configure:0
+msgid "Auto Configure"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,configure:0
+msgid "Configuring Datastructure"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_load_configuration_table
+msgid "Open Configuration"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Configure Automatically "
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_clear_logs
+#: model:ir.ui.menu,name:olap.menu_bi_clear_logs
+#: wizard_button:olap.query.logs.clear,init,ok:0
+msgid "Clear Logs"
+msgstr ""
diff --git a/addons/thunderbird/i18n/it.po b/addons/thunderbird/i18n/it.po
new file mode 100644
index 00000000000..cb65706f8ff
--- /dev/null
+++ b/addons/thunderbird/i18n/it.po
@@ -0,0 +1,87 @@
+# Italian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-26 06:05+0000\n"
+"PO-Revision-Date: 2010-02-02 09:39+0000\n"
+"Last-Translator: Carlo Vettore <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: 2010-02-03 04:47+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,copy_to:0
+msgid "Copy To"
+msgstr "Copia a"
+
+#. module: thunderbird
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
+"speciali!"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,description:0
+msgid "Description"
+msgstr "Descrizione"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,reference:0
+msgid "Reference"
+msgstr "Riferimento"
+
+#. module: thunderbird
+#: model:ir.model,name:thunderbird.model_tinythunderbird_partner
+msgid "Thunderbid mails"
+msgstr "Posta Thunderbid"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,attachments:0
+msgid "Attached Files"
+msgstr "File Allegati"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,res_user_id:0
+msgid "User"
+msgstr "Utente"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,receiver:0
+msgid "Receiver"
+msgstr "Destinatario"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,title:0
+msgid "Subject"
+msgstr "Oggetto"
+
+#. module: thunderbird
+#: code:addons/thunderbird/partner/partner.py:0
+#, python-format
+msgid "Archive"
+msgstr "Archivia"
+
+#. module: thunderbird
+#: model:ir.module.module,shortdesc:thunderbird.module_meta_information
+msgid "Thunderbird Interface"
+msgstr "Interfaccia Thunderbird"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,sender:0
+msgid "Sender"
+msgstr "Mittente"

From 57125a1002f15acdc61a9882a94156e371ef2767 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Wed, 3 Feb 2010 11:53:04 +0530
Subject: [PATCH 53/68] [FIX]: oncrease a size of the name filed to take max
 subject size See http://www.rfc-editor.org/rfc/rfc2822.txt about email
 messages and http://www.rfc-editor.org/rfc/rfc2821.txt about SMTP.

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

bzr revid: mga@tinyerp.com-20100203062304-y9z4xrs4gopde87m
---
 addons/crm/crm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index d9d4c6e6c9d..5d656585cb5 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -313,7 +313,7 @@ class crm_case(osv.osv):
 
     _columns = {
         'id': fields.integer('ID', readonly=True),
-        'name': fields.char('Description',size=64,required=True),
+        'name': fields.char('Description', size=1024, required=True),
         'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the case without removing it."),
         'description': fields.text('Your action'),
         'section_id': fields.many2one('crm.case.section', 'Section', select=True, help='Section to which Case belongs to. Define Responsible user and Email account for mail gateway.'),

From 4afe47f01eb3a9f2dbdd74acac6931b58144b0d2 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Wed, 3 Feb 2010 13:35:22 +0530
Subject: [PATCH 54/68] [FIX]: remove line 'certificate': '', which is not
 descrive any certificates

bzr revid: mga@tinyerp.com-20100203080522-a02ad07nb10nq1dn
---
 addons/board_hr/__terp__.py      | 1 -
 addons/crm_hr/__terp__.py        | 1 -
 addons/point_of_sale/__terp__.py | 3 +--
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/addons/board_hr/__terp__.py b/addons/board_hr/__terp__.py
index 80b00961dbe..182cd36e1ec 100644
--- a/addons/board_hr/__terp__.py
+++ b/addons/board_hr/__terp__.py
@@ -37,6 +37,5 @@ This module implements a dashboard for human resource management that includes:
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_hr/__terp__.py b/addons/crm_hr/__terp__.py
index a4715123679..71ef7da908e 100644
--- a/addons/crm_hr/__terp__.py
+++ b/addons/crm_hr/__terp__.py
@@ -48,6 +48,5 @@
     ],
     'installable': True,
     'active': False,
-    'certificate': '',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/__terp__.py b/addons/point_of_sale/__terp__.py
index 0610144ca87..794793e3baa 100644
--- a/addons/point_of_sale/__terp__.py
+++ b/addons/point_of_sale/__terp__.py
@@ -49,7 +49,7 @@ Main features :
         'pos_data.xml',
         'pos_workflow.xml',
         'statement_view.xml',
-        'statement_report.xml', 
+        'statement_report.xml',
         'statement_data.xml',
         'statement_wizard.xml'
     ],
@@ -66,6 +66,5 @@ Main features :
     ],
     'demo_xml': ['pos_demo.xml','singer_statement_demo.xml','multi_company_stock_data.xml'],
     'installable': True,
-    'certificate': '',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 58c63b17913e55a3b10547933c7915df184b4318 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Wed, 3 Feb 2010 14:03:15 +0530
Subject: [PATCH 55/68] [IMP] crm_project: use one object for bug and future
 request

bzr revid: hmo@tinyerp.com-20100203083315-ruarlm13tszo9nyo
---
 addons/crm_project/__init__.py                |   3 +-
 addons/crm_project/__terp__.py                |   6 +-
 addons/crm_project/crm_bug_wizard.xml         |  12 ++
 addons/crm_project/crm_bugs_data.xml          |  19 +-
 addons/crm_project/crm_bugs_demo.xml          |  36 ++--
 addons/crm_project/crm_bugs_menu.xml          |  37 +---
 addons/crm_project/crm_bugs_view.xml          |  35 ++--
 addons/crm_project/crm_feature_menu.xml       |  37 +---
 addons/crm_project/crm_feature_view.xml       | 191 ------------------
 addons/crm_project/crm_project_bug.py         |  20 +-
 addons/crm_project/crm_project_feature.py     |  82 --------
 .../security/crm_project_security.xml         |  12 +-
 .../crm_project/security/ir.model.access.csv  |   1 -
 addons/crm_project/wizard/__init__.py         |  25 +++
 addons/crm_project/wizard/crm_bug_wizard.py   |  98 +++++++++
 15 files changed, 201 insertions(+), 413 deletions(-)
 create mode 100644 addons/crm_project/crm_bug_wizard.xml
 delete mode 100644 addons/crm_project/crm_feature_view.xml
 delete mode 100644 addons/crm_project/crm_project_feature.py
 create mode 100644 addons/crm_project/wizard/__init__.py
 create mode 100644 addons/crm_project/wizard/crm_bug_wizard.py

diff --git a/addons/crm_project/__init__.py b/addons/crm_project/__init__.py
index a646cf81ad9..fd6e45fcf00 100644
--- a/addons/crm_project/__init__.py
+++ b/addons/crm_project/__init__.py
@@ -22,7 +22,6 @@
 
 
 import crm_project_bug
-import crm_project_feature
-
 import report
+import wizard
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_project/__terp__.py b/addons/crm_project/__terp__.py
index 7a63ce1d1f4..c55a302f9da 100644
--- a/addons/crm_project/__terp__.py
+++ b/addons/crm_project/__terp__.py
@@ -22,7 +22,7 @@
 
 
 {
-    'name': 'CRM Stuff in Project Management',
+    'name': 'Bug Reporting in Project Management',
     'version': '1.0',
     'category': 'Generic Modules/CRM & SRM',
     'description': """
@@ -35,9 +35,9 @@
         'crm_bugs_data.xml'
     ],
     'update_xml': [
+        'crm_bug_wizard.xml',
         'crm_bugs_view.xml',
-        'crm_bugs_menu.xml',
-        'crm_feature_view.xml',
+        'crm_bugs_menu.xml',        
         'crm_feature_menu.xml',
         'report_crm_project_bug_view.xml',
         'security/crm_project_security.xml',
diff --git a/addons/crm_project/crm_bug_wizard.xml b/addons/crm_project/crm_bug_wizard.xml
new file mode 100644
index 00000000000..a62606e52a6
--- /dev/null
+++ b/addons/crm_project/crm_bug_wizard.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <wizard
+            id="wizard_crm_bug_task_set"
+            keyword="client_action_multi"
+            model="crm.bug"
+            name="crm.bug.task_set"
+            multi="True"
+            string="Convert To Task"/>
+    </data>
+</openerp>
diff --git a/addons/crm_project/crm_bugs_data.xml b/addons/crm_project/crm_bugs_data.xml
index ca891949499..2a8729e49c2 100644
--- a/addons/crm_project/crm_bugs_data.xml
+++ b/addons/crm_project/crm_bugs_data.xml
@@ -6,17 +6,12 @@
     -->
          <!--    For Bugs    -->
          
-    <record model="crm.case.categ" id="categ1">
+    <record model="crm.case.categ" id="bug_categ">
         <field name="name">Bugs</field>
         <field name="section_id" ref="crm.section_sales_department"/>
 		<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>         
-    </record>
-    <record model="crm.case.categ" id="categ2">
-        <field name="name">Patches</field>
-        <field name="section_id" ref="crm.section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>        
-    </record>
-    <record model="crm.case.categ" id="categ3">
+    </record>    
+    <record model="crm.case.categ" id="feature_request_categ">
         <field name="name">Feature Requests</field>
         <field name="section_id" ref="crm.section_sales_department"/>
 		<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>        
@@ -71,12 +66,6 @@
         <field name="name">Works For Me</field>
         <field name="section_id" ref="crm.section_sales_department"/>
 		<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>         
-    </record>    
-    <record model="crm.case.stage" id="stage7">
-        <field name="name">Future</field>
-        <field name="section_id" ref="crm.section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>         
-    </record>    
-
+    </record>
 </data>
 </openerp>
diff --git a/addons/crm_project/crm_bugs_demo.xml b/addons/crm_project/crm_bugs_demo.xml
index da1bdbdab21..2bda6099685 100644
--- a/addons/crm_project/crm_bugs_demo.xml
+++ b/addons/crm_project/crm_bugs_demo.xml
@@ -15,7 +15,7 @@
 		<field eval="&quot;open&quot;" name="state"/>
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
-		<field name="categ_id" ref="categ1"/>
+		<field name="categ_id" ref="bug_categ"/>
 		<field name="stage_id" ref="stage1"/>
 		<field eval="15.0" name="duration"/>
 		<field eval="&quot;Bug in Accounts module&quot;" name="name"/>
@@ -40,7 +40,7 @@
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
 		<field eval="3.5" name="duration"/>
-		<field name="categ_id" ref="categ1"/>
+		<field name="categ_id" ref="bug_categ"/>
 		<field name="stage_id" ref="stage2"/>
 		<field eval="&quot;Program not giving proper output&quot;" name="name"/>
 	</record>
@@ -56,7 +56,7 @@
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
 		<field eval="2.3" name="duration"/>
-		<field name="categ_id" ref="categ1"/>
+		<field name="categ_id" ref="bug_categ"/>
 		<field name="stage_id" ref="stage3"/>
 		<field eval="&quot;Output incorrect&quot;" name="name"/>
 	</record>
@@ -72,7 +72,7 @@
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
 		<field eval="4.0" name="duration"/>
-		<field name="categ_id" ref="categ1"/>
+		<field name="categ_id" ref="bug_categ"/>
 		<field name="stage_id" ref="stage4"/>
 		<field eval="&quot;Problem loading page&quot;" name="name"/>
 	</record>
@@ -87,7 +87,7 @@
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
 		<field eval="1.0" name="duration"/>
-		<field name="categ_id" ref="categ1"/>
+		<field name="categ_id" ref="bug_categ"/>
 		<field name="stage_id" ref="stage5"/>
 		<field eval="&quot;Page not Found&quot;" name="name"/>
 	</record>
@@ -103,7 +103,7 @@
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
 		<field eval="4.0" name="duration"/>
-		<field name="categ_id" ref="categ1"/>
+		<field name="categ_id" ref="bug_categ"/>
 		<field name="stage_id" ref="stage6"/>
 		<field eval="&quot;Programming Error&quot;" name="name"/>
 	</record>
@@ -119,8 +119,8 @@
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
 		<field eval="2.0" name="duration"/>
-		<field name="categ_id" ref="categ1"/>
-		<field name="stage_id" ref="stage7"/>
+		<field name="categ_id" ref="bug_categ"/>
+		<field name="stage_id" ref="stage6"/>
 		<field eval="&quot;Logical Error in Program&quot;" name="name"/>
 	</record>
 
@@ -135,7 +135,7 @@
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
 		<field eval="7.3" name="duration"/>
-		<field name="categ_id" ref="categ1"/>
+		<field name="categ_id" ref="bug_categ"/>
 		<field name="stage_id" ref="stage5"/>
 		<field eval="&quot;Constraint Error&quot;" name="name"/>
 	</record>
@@ -150,7 +150,7 @@
 		<field eval="&quot;open&quot;" name="state"/>
 		<field eval="1" name="active"/>
 		<field eval="1.3" name="duration"/>
-		<field name="categ_id" ref="categ2"/>
+		<field name="categ_id" ref="feature_request_categ"/>
 		<field name="stage_id" ref="stage5"/>
 		<field eval="&quot;Error in Program&quot;" name="name"/>
 	</record>
@@ -166,7 +166,7 @@
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
 		<field eval="13.0" name="duration"/>
-		<field name="categ_id" ref="categ2"/>
+		<field name="categ_id" ref="feature_request_categ"/>
 		<field name="stage_id" ref="stage5"/>
 		<field eval="&quot;Patches Error in Program&quot;" name="name"/>
 	</record>
@@ -182,7 +182,7 @@
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
 		<field eval="3.2" name="duration"/>
-		<field name="categ_id" ref="categ3"/>
+		<field name="categ_id" ref="feature_request_categ"/>
 		<field name="stage_id" ref="stage1"/>
 		<field eval="&quot;New Features To Be Added&quot;" name="name"/>
 	</record>
@@ -198,7 +198,7 @@
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
 		<field eval="3.0" name="duration"/>
-		<field name="categ_id" ref="categ3"/>
+		<field name="categ_id" ref="feature_request_categ"/>
 		<field name="stage_id" ref="stage2"/>
 		<field eval="&quot;Add menus to the module&quot;" name="name"/>
 		<field eval="&quot;info@opensides.be&quot;" name="email_from"/>
@@ -215,7 +215,7 @@
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
 		<field eval="2.0" name="duration"/>
-		<field name="categ_id" ref="categ3"/>
+		<field name="categ_id" ref="feature_request_categ"/>
 		<field name="stage_id" ref="stage3"/>
 		<field eval="&quot;Include Attendance sheet in Project&quot;" name="name"/>
 		<field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
@@ -234,7 +234,7 @@
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
 		<field eval="2.45" name="duration"/>
-		<field name="categ_id" ref="categ3"/>
+		<field name="categ_id" ref="feature_request_categ"/>
 		<field name="stage_id" ref="stage5"/>
 		<field eval="&quot;Create new object&quot;" name="name"/>
 	</record>
@@ -250,8 +250,8 @@
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
 		<field eval="15.0" name="duration"/>
-		<field name="categ_id" ref="categ3"/>
-		<field name="stage_id" ref="stage7"/>
+		<field name="categ_id" ref="feature_request_categ"/>
+		<field name="stage_id" ref="stage6"/>
 		<field eval="&quot;Improve Reports in HRMS&quot;" name="name"/>
 	</record>
 	
@@ -266,7 +266,7 @@
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
 		<field eval="06.15" name="duration"/>
-		<field name="categ_id" ref="categ3"/>
+		<field name="categ_id" ref="feature_request_categ"/>
 		<field name="stage_id" ref="stage5"/>
 		<field eval="&quot;Improve Reports in PMS&quot;" name="name"/>
 	</record>
diff --git a/addons/crm_project/crm_bugs_menu.xml b/addons/crm_project/crm_bugs_menu.xml
index 627fab57aba..2518993fa08 100644
--- a/addons/crm_project/crm_bugs_menu.xml
+++ b/addons/crm_project/crm_bugs_menu.xml
@@ -1,38 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-<data noupdate="1">
-
-
-    <record model="crm.case.categ" id="categ1">
-        <field name="name">Bugs</field>
-        <field name="section_id" ref="crm.section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>           
-    </record>
-    <record model="crm.case.categ" id="categ2">
-        <field name="name">Patches</field>
-        <field name="section_id" ref="crm.section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>           
-    </record>
-    <record model="crm.case.categ" id="categ3">
-        <field name="name">Feature Requests</field>
-        <field name="section_id" ref="crm.section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>           
-    </record>
-    <record model="crm.case.stage" id="stage2">
-        <field name="name">Fixed</field>
-        <field name="section_id" ref="crm.section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>           
-    </record>
-    <record model="crm.case.stage" id="stage5">
-        <field name="name">Awaiting Response</field>
-        <field name="section_id" ref="crm.section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>           
-    </record>    
-    <record model="crm.case.stage" id="stage7">
-        <field name="name">Future</field>
-        <field name="section_id" ref="crm.section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>   
-    </record>       
+<data noupdate="1">   
     
 
     ######################## BUG TRACKING (menu) ###########################
@@ -40,11 +8,12 @@
         ALL BUGS
     -->
     <record model="ir.actions.act_window" id="crm_case_categ_act0">
-        <field name="name">Bugs</field>
+        <field name="name">Issues</field>
         <field name="res_model">crm.project.bug</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_tree_view"/>
+        <field name="domain" eval="[('categ_id','=',ref('bug_categ'))]"/>
         <field name="context" eval="{'default_state':'open'}"/>
         <field name="search_view_id" ref="view_crm_case_bugs_filter"/>
     </record>
diff --git a/addons/crm_project/crm_bugs_view.xml b/addons/crm_project/crm_bugs_view.xml
index 7c17d1e6320..b193e6f4bd1 100644
--- a/addons/crm_project/crm_bugs_view.xml
+++ b/addons/crm_project/crm_bugs_view.xml
@@ -36,25 +36,30 @@
         <field name="arch" type="xml">
             <form string="Bug Tracker Form">
                 <group colspan="4" col="6">
-                  	<field name="project_id" required="True"/>
                     <field name="name" string="Title" colspan="2"/>
-                    <field name="section_id" colspan="1" widget="selection"/>
-                        <label string="Resolution: " align="1.0"/>
-                        <group colspan="1" col="2">
-                            <field name="stage_id" select="1" nolabel="1"/>
-                            <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
-                        </group>
                     <field name="date"/>
-                    <field name="user_id" />
+                  	<field name="project_id" required="True"/>  
+                    <field name="categ_id"  on_change="onchange_categ_id(categ_id)" widget="selection" required="1" domain="[('object_id.model', '=', 'crm.project.bug')]"/>
+                    <label string="Resolution: " align="1.0"/>
+                    <group colspan="1" col="2">
+                        <field name="stage_id" select="1" nolabel="1"/>
+                        <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
+                    </group>
+                    <label string="Related Task: " align="1.0"/>
+                    <group colspan="1" col="2">
+                        <field name="task_id"  nolabel="1"/>
+                        <button string="Convert To Task" name="%(wizard_crm_bug_task_set)d" icon="gtk-index" type="action"  attrs="{'invisible':[('task_id','!=',False)]}"/>
+                    </group>                                     
+                    
                 </group>
                 <notebook colspan="4">
                 <page string="General">
                     <field name="partner_id"  on_change="onchange_partner_id(partner_id, email_from)" colspan="2"/>
                     <field name="partner_address_id"  string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
                     <field name="email_from" colspan="2"/>
+                    <field name="user_id" />
                     <separator colspan="4"/>
-                    <field name="type_id" string="Version"/>
-                    <field name="categ_id"  on_change="onchange_categ_id(categ_id)"/>
+                    <field name="type_id" string="Version"/>                    
                     <field name="priority" string="Severity"/>
                     <newline/>
                     <separator string= "Description" colspan="4"/>
@@ -159,6 +164,10 @@
         <field name="arch" type="xml">
             <search string="Search Bugs">
                <group col="7" colspan="1">
+                   <filter icon="gtk-media-forward" string="Accepted Bugs"
+                   	domain="[('stage_id.name','=','Accepted as Bug')]"
+                   	separator="1" help="All Accepted Bugs"
+                   /> 
                    <filter icon="gtk-apply" string="Fixed Bugs"
                    	domain="[('stage_id.name','=','Fixed')]"
                    	separator="1" help="All Fixed Bugs"
@@ -166,11 +175,7 @@
                    <filter icon="gtk-media-pause" string="Waiting Bugs"
                    	domain="[('stage_id.name','=','Awaiting Response')]"
                    	separator="1" help="All Waiting Bugs"
-                   />
-                   <filter icon="gtk-media-forward" string="Future Bugs"
-                   	domain="[('stage_id.name','=','Future')]"
-                   	separator="1" help="All Future Bugs"
-                   />
+                   />                   
                    <separator orientation="vertical"/>
                    <filter icon="gtk-home" string="   Today   "
                    	separator="1"
diff --git a/addons/crm_project/crm_feature_menu.xml b/addons/crm_project/crm_feature_menu.xml
index 299c441e0cf..af22b8a9845 100644
--- a/addons/crm_project/crm_feature_menu.xml
+++ b/addons/crm_project/crm_feature_menu.xml
@@ -1,55 +1,36 @@
 <?xml version="1.0"?>
 <openerp>
-<data noupdate="1">   
-
-    
-    <record model="crm.case.categ" id="future_patch_categ">
-        <field name="name">Patches</field>
-        <field name="section_id" ref="crm.section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.project.future')]" model="ir.model"/>          
-    </record>
-    <record model="crm.case.stage" id="future_fixed_categ">
-        <field name="name">Fixed</field>
-        <field name="section_id" ref="crm.section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.project.future')]" model="ir.model"/>           
-    </record>
-    <record model="crm.case.stage" id="future_awaiting_categ">
-        <field name="name">Awaiting Response</field>
-        <field name="section_id" ref="crm.section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.project.future')]" model="ir.model"/>           
-    </record>  
-    
+<data noupdate="1">
     
 
     ######################## Future Request (menu) ###########################
-    <!--
-        ALL BUGS
-    -->
+    
     <record model="ir.actions.act_window" id="action_crm_case_future">
         <field name="name">Future Requests</field>
-        <field name="res_model">crm.project.future</field>
+        <field name="res_model">crm.project.bug</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,calendar</field>
-        <field name="view_id" ref="crm_case_future_tree_view"/>
+        <field name="view_id" ref="crm_case_tree_view"/>
+        <field name="domain" eval="[('categ_id','=',ref('feature_request_categ'))]"/>
         <field name="context" eval="{'default_state':'open'}"/>
-        <field name="search_view_id" ref="view_crm_case_future_filter"/>
+        <field name="search_view_id" ref="view_crm_case_bugs_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_future_tree_view0">
         <field name="sequence" eval="1"/>
         <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_future_tree_view"/>
+        <field name="view_id" ref="crm_case_tree_view"/>
         <field name="act_window_id" ref="action_crm_case_future"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_future_calendar_view0">
         <field name="sequence" eval="2"/>
         <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_future_calendar_view"/>
+        <field name="view_id" ref="crm_case_calendar_view"/>
         <field name="act_window_id" ref="action_crm_case_future"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_future_form_view0">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
-        <field name="view_id" ref="crm_case_future_form_view"/>
+        <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="action_crm_case_future"/>
     </record>
 
diff --git a/addons/crm_project/crm_feature_view.xml b/addons/crm_project/crm_feature_view.xml
deleted file mode 100644
index 30f330fe891..00000000000
--- a/addons/crm_project/crm_feature_view.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-<!--    <menuitem name="CRM &amp; SRM" icon="terp-crm" id="menu_crm1"/>    -->
-
-    # ------------------------------------------------------
-    # Future Request
-    # ------------------------------------------------------
-
-
-    <record model="ir.ui.view" id="crm_case_future_form_view">
-        <field name="name">CRM - Future Request Form</field>
-        <field name="model">crm.project.future</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Future Request Form">
-                <group colspan="4" col="6">
-                  	<field name="project_id" required="True"/>
-                    <field name="name" string="Title" colspan="2"/>
-                    <field name="section_id" colspan="1" widget="selection"/>
-                        <label string="Resolution: " align="1.0"/>
-                        <group colspan="1" col="2">
-                            <field name="stage_id" select="1" nolabel="1"/>
-                            <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
-                        </group>
-                    <field name="date"/>
-                    <field name="user_id" />
-                </group>
-                <notebook colspan="4">
-                <page string="General">
-                    <field name="partner_id"  on_change="onchange_partner_id(partner_id, email_from)" colspan="2"/>
-                    <field name="partner_address_id"  string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
-                    <field name="email_from" colspan="2"/>
-                    <separator colspan="4"/>
-                    <field name="type_id" string="Version"/>
-                    <field name="categ_id"  on_change="onchange_categ_id(categ_id)"/>
-                    <field name="priority" string="Severity"/>
-                    <newline/>
-                    <separator string= "Description" colspan="4"/>
-                    <field name="description" nolabel="1" colspan="4"/>
-                    <separator colspan="4"/>
-                    <group col="8" colspan="4">
-                        <field name="state" />
-                        <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
-                        <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                        <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
-                        <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
-                        <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
-                        <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
-                    </group>
-                </page>
-                <page string="History">
-                    <field name="id" select="1"/>
-                    <field name="active" />
-                    <separator colspan="4" string="Dates"/>
-                    <field name="create_date"/>
-                    <field name="date_closed"/>
-                    <field name="date_action_last"/>
-                    <field name="date_action_next"/>
-                    <separator colspan="4" string="Estimates"/>
-                    <field name="planned_revenue"/>
-                    <field name="planned_cost"/>
-                    <field name="probability"/>
-                    <separator colspan="4" string="References"/>
-                    <field name="ref" colspan="4"/>
-                    <field name="ref2" colspan="4"/>
-                    <field name="log_ids" nolabel="1" colspan="4">
-                        <form string="Actions">
-                            <separator string="Action Information" colspan="4"/>
-                            <field name="name" colspan="4"/>
-                            <field name="date" />
-                            <field name="user_id" />
-                            <field name="som" />
-                            <field name="canal_id"/>
-                        </form>
-                    </field>
-                </page>
-                <page string="Emails">
-                   <group colspan="4">
-                       <field colspan="4" name="email_cc" string="CC"/>
-                   </group>
-                    <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
-                        <form string="Communication history">
-                            <group col="7" colspan="4">
-                                <field name="date"/>
-                                <field name="email"/>
-                                <field name="canal_id"/>
-                                <button
-								   string="Add a CC"
-								    name="%(crm.action_view_crm_email_add_cc_wizard)d"
-								    icon="gtk-add" type="action"/>
-                            </group>
-                            <newline/>
-                            <field name="description" colspan="4" nolabel="1"/>
-                           <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-undo" type="action"/>
-                           </form>
-                           <tree string="Communication history">
-                               <field name="description"/>
-                               <field name="email"/>
-                               <field name="date"/>
-                           </tree>
-                       </field>
-                       <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
-                 </page>
-                </notebook>
-            </form>
-        </field>
-    </record>
-    <record model="ir.ui.view" id="crm_case_future_tree_view">
-        <field name="name">CRM - Future Request Tree</field>
-        <field name="model">crm.project.future</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Bugs Tree"  colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
-                <field name="id"/>
-                <field name="name" string="Title"/>
-                <field name="partner_id"/>
-                <field name="priority" string="Severity"/>
-                <field name="categ_id"/>
-                <field name="stage_id" string="Resolution"/>
-                <field name="type_id" string="Version"/>
-                <field name="user_id"/>
-                <field name="state"/>
-                <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
-                <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
-                <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
-                <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
-                <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="view_crm_case_future_filter" model="ir.ui.view">
-        <field name="name">CRM - Future Request Search</field>
-        <field name="model">crm.project.future</field>
-        <field name="type">search</field>
-        <field name="arch" type="xml">
-            <search string="Search Future Requests">
-               <group col="7" colspan="1">
-                   <filter icon="gtk-apply" string="Fixed Future Requests"
-                   	domain="[('stage_id.name','=','Fixed')]"
-                   	separator="1" help="All Fixed Future Requests"
-                   />
-                   <filter icon="gtk-media-pause" string="Waiting Response"
-                   	domain="[('stage_id.name','=','Awaiting Response')]"
-                   	separator="1" help="All Future Requests which are Waiting for Response"
-                   />                   
-                   <separator orientation="vertical"/>
-                   <filter icon="gtk-home" string="   Today   "
-                   	separator="1"
-                   	domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"
-                   	help="Todays's Future Requests"
-                   />
-                   <filter icon="gtk-media-rewind"
-                   	string="    7 Days    " separator="1"
-                   	domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                   	help="Future Requests during last 7 days"
-                   />
-               </group>
-               <separator orientation="vertical"/>
-               <group col="4" colspan="2">
-               		<field name="name" select='1' string="Subject"/>
-                   <field name="user_id" select="1" widget="selection">
-                   	<filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Future Requests" default="1"/>
-                   </field>
-					<field name="section_id" select="1" widget="selection" string="Section" default="context.get('section_id', False)">
-							<filter icon="terp-crm"
-                               domain="[('section_id','=',context.get('section_id',False))]"
-                               help="My section"
-                           />
-                    </field>       
-               </group>
-            </search>
-         </field>
-    </record>    
-
-     <record model="ir.ui.view" id="crm_case_future_calendar_view">
-        <field name="name">CRM - Future Request Calendar</field>
-        <field name="model">crm.project.future</field>
-        <field name="type">calendar</field>
-        <field name="priority" eval="2"/>
-        <field name="arch" type="xml">
-            <calendar string="Bugs" date_start="date" color="user_id" date_delay="duration">
-                <field name="name"/>
-                <field name="partner_id"/>
-            </calendar>
-        </field>
-    </record>
-    </data>
-</openerp>
diff --git a/addons/crm_project/crm_project_bug.py b/addons/crm_project/crm_project_bug.py
index 6e56e0e3746..8f01dc51d08 100644
--- a/addons/crm_project/crm_project_bug.py
+++ b/addons/crm_project/crm_project_bug.py
@@ -51,34 +51,28 @@ class crm_project_bug(osv.osv):
         'som': fields.many2one('res.partner.som', 'State of Mind', help="The minds states allow to define a value scale which represents" \
                                                                        "the partner mentality in relation to our services.The scale has" \
                                                                        "to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."),
-        'categ_id': fields.many2one('crm.case.categ','Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.project.bug')]"),
+        'categ_id': fields.many2one('crm.case.categ','Category', domain="[('object_id.model', '=', 'crm.project.bug')]"),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
-        'type_id': fields.many2one('crm.case.resource.type', 'Bug Type', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.project.bug')]"),
+        'type_id': fields.many2one('crm.case.resource.type', 'Bug Type', domain="[('object_id.model', '=', 'crm.project.bug')]"),
 
         'partner_name': fields.char("Employee's Name", size=64),
         'partner_mobile': fields.char('Mobile', size=32),
         'partner_phone': fields.char('Phone', size=32),
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.project.bug')]"),
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('object_id.model', '=', 'crm.project.bug')]"),
         'project_id':fields.many2one('project.project', 'Project'),
-        'duration': fields.float('Duration') ,
+        'duration': fields.float('Duration'),        
         'probability': fields.float('Probability (%)'),
+        'task_id': fields.many2one('project.task', 'Task', domain="[('project_id','=',project_id)]")
     }
 
     def _get_project(self, cr, uid, context):
        user = self.pool.get('res.users').browse(cr,uid,uid, context=context)
        if user.context_project_id:
            return user.context_project_id
-       return False
+       return False    
 
     _defaults = {
-          'project_id':_get_project
+          'project_id':_get_project,          
           }
-    def onchange_categ_id(self, cr, uid, ids, categ, context={}):
-        if not categ:
-            return {'value':{}}
-        cat = self.pool.get('crm.case.categ').browse(cr, uid, categ, context).probability
-        return {'value':{'probability':cat}}
-
-
 crm_project_bug()
 
diff --git a/addons/crm_project/crm_project_feature.py b/addons/crm_project/crm_project_feature.py
deleted file mode 100644
index 77314ec32de..00000000000
--- a/addons/crm_project/crm_project_feature.py
+++ /dev/null
@@ -1,82 +0,0 @@
- #-*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import time
-import re
-import os
-
-import mx.DateTime
-import base64
-
-from tools.translate import _
-
-import tools
-from osv import fields,osv,orm
-from osv.orm import except_orm
-
-from crm import crm
-
-class crm_project_future_request(osv.osv):
-    _name = "crm.project.future"
-    _description = "Project Future Request"
-    _order = "id desc"
-    _inherit = 'crm.case'
-    _columns = {
-        'date_closed': fields.datetime('Closed', readonly=True),
-        'ref' : fields.reference('Reference', selection=crm._links_get, size=128),
-        'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128),
-        'canal_id': fields.many2one('res.partner.canal', 'Channel',help="The channels represent the different communication modes available with the customer." \
-                                                                        " With each commercial opportunity, you can indicate the canall which is this opportunity source."),
-        'planned_revenue': fields.float('Planned Revenue'),
-        'planned_cost': fields.float('Planned Costs'),
-        'som': fields.many2one('res.partner.som', 'State of Mind', help="The minds states allow to define a value scale which represents" \
-                                                                       "the partner mentality in relation to our services.The scale has" \
-                                                                       "to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."),
-        'categ_id': fields.many2one('crm.case.categ','Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.project.future')]"),
-        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
-        'type_id': fields.many2one('crm.case.resource.type', 'Bug Type', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.project.future')]"),
-
-        'partner_name': fields.char("Employee's Name", size=64),
-        'partner_mobile': fields.char('Mobile', size=32),
-        'partner_phone': fields.char('Phone', size=32),
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.project.future')]"),
-        'project_id':fields.many2one('project.project', 'Project'),
-        'duration': fields.float('Duration') ,
-        'probability': fields.float('Probability (%)'),
-    }
-    def _get_project(self, cr, uid, context):
-       user = self.pool.get('res.users').browse(cr,uid,uid, context=context)
-       if user.context_project_id:
-           return user.context_project_id
-       return False
-
-    _defaults = {
-          'project_id':_get_project
-          }
-    def onchange_categ_id(self, cr, uid, ids, categ, context={}):
-        if not categ:
-            return {'value':{}}
-        cat = self.pool.get('crm.case.categ').browse(cr, uid, categ, context).probability
-        return {'value':{'probability':cat}}
-
-
-crm_project_future_request()
-
diff --git a/addons/crm_project/security/crm_project_security.xml b/addons/crm_project/security/crm_project_security.xml
index f730e20db29..5789be5d41d 100644
--- a/addons/crm_project/security/crm_project_security.xml
+++ b/addons/crm_project/security/crm_project_security.xml
@@ -12,17 +12,7 @@
  	<record id="crm_project_bug_rule" model="ir.rule">
         <field name="domain_force">['|',('project_id','=',False),('project_id','=',user.context_project_id)]</field>
         <field name="rule_group" ref="crm_project_bug_rule_group"/>
-    </record>
-
-    <record model="ir.rule.group" id="crm_project_feature_rule_group">
-        <field name="name">crm.project.feature.rule.group</field>
-        <field name="model_id" search="[('model','=','crm.project.future')]" model="ir.model"/>
-        <field name="global" eval="True"/>
-    </record>
- 	<record id="crm_project_feature_rule" model="ir.rule">
-        <field name="domain_force">['|',('project_id','=',False),('project_id','=',user.context_project_id)]</field>
-        <field name="rule_group" ref="crm_project_feature_rule_group"/>
-    </record>
+    </record>    
 
   </data>
 </openerp>
diff --git a/addons/crm_project/security/ir.model.access.csv b/addons/crm_project/security/ir.model.access.csv
index 189470f765f..a29e29c027b 100644
--- a/addons/crm_project/security/ir.model.access.csv
+++ b/addons/crm_project/security/ir.model.access.csv
@@ -1,6 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_crm_project_bug","crm.project.bug","model_crm_project_bug","crm.group_crm_manager",1,1,1,1
-"access_crm_project_future","crm.project.future","model_crm_project_future","crm.group_crm_manager",1,1,1,1
 "access_report_crm_project_bug_user","report.crm.project.bug.user","model_report_crm_project_bug_user","crm.group_crm_manager",1,0,0,0
 "access_report_crm_project_bug_categ","report.crm.project.bug.categ","model_report_crm_project_bug_categ","crm.group_crm_manager",1,0,0,0
 "access_repor_crm_project_bug_section","report.crm.project.bug.section","model_report_crm_project_bug_section","crm.group_crm_manager",1,0,0,0
diff --git a/addons/crm_project/wizard/__init__.py b/addons/crm_project/wizard/__init__.py
new file mode 100644
index 00000000000..dcdf345b08a
--- /dev/null
+++ b/addons/crm_project/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 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/>.
+#
+##############################################################################
+
+
+import crm_bug_wizard
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_project/wizard/crm_bug_wizard.py b/addons/crm_project/wizard/crm_bug_wizard.py
new file mode 100644
index 00000000000..c328e65e91e
--- /dev/null
+++ b/addons/crm_project/wizard/crm_bug_wizard.py
@@ -0,0 +1,98 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from mx.DateTime import now
+
+import wizard
+import netsvc
+import ir
+import pooler
+from tools.translate import _
+
+class bug2task(wizard.interface):    
+    
+    def _check_state(self, cr, uid, data, context):
+        pool = pooler.get_pool(cr.dbname)
+        case_obj = pool.get('crm.project.bug')
+        for case in case_obj.browse(cr, uid, data['ids']):
+            if case.state != 'open':
+                raise wizard.except_wizard(_('Warning !'),
+                    _('Bugs or Feature Requests should be in \'Open\' state before converting into Task.'))
+        return {}
+
+    def _makeTask(self, cr, uid, data, context):
+        pool = pooler.get_pool(cr.dbname)
+        data_obj = pool.get('ir.model.data')
+        result = data_obj._get_id(cr, uid, 'project', 'view_task_search_form')
+        res = data_obj.read(cr, uid, result, ['res_id'])
+        
+
+        id2 = data_obj._get_id(cr, uid, 'project', 'view_task_form2')
+        id3 = data_obj._get_id(cr, uid, 'project', 'view_task_tree2')
+        if id2:
+            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+        if id3:
+            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+
+        bug_case_obj = pool.get('crm.project.bug')
+        task_obj = pool.get('project.task')        
+        for bug in bug_case_obj.browse(cr, uid, data['ids']):                
+            new_task_id = task_obj.create(cr, uid, {            
+                'name': bug.name,                
+                'partner_id': bug.partner_id.id,                
+                'description':bug.description,
+                'date': bug.date,
+                'project_id':bug.project_id.id, 
+                'priority':bug.priority,    
+                'user_id':bug.user_id.id,  
+                'planned_hours': 0.0,        
+            })       
+            
+            new_task = task_obj.browse(cr, uid, new_task_id)
+            
+            vals = {
+                'task_id': new_task_id,                
+                }            
+
+            bug_case_obj.write(cr, uid, [bug.id], vals)           
+        
+        value = {            
+            'name': _('Tasks'),
+            'view_type': 'form',
+            'view_mode': 'form,tree',
+            'res_model': 'project.task',
+            'res_id': int(new_task_id),
+            'view_id': False,
+            'views': [(id2,'form'),(id3,'tree'),(False,'calendar'),(False,'graph')],
+            'type': 'ir.actions.act_window',
+            'search_view_id': res['res_id'] 
+        }
+        return value    
+
+    states = {
+        'init': {
+            'actions': [_check_state],
+            'result': {'type': 'action', 'action': _makeTask, 'state':'end' }
+        }        
+    }
+
+bug2task('crm.bug.task_set')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From e0c47c2c8775df89866acbebe22fe17db71256e2 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Wed, 3 Feb 2010 14:05:53 +0530
Subject: [PATCH 56/68] [IMP]:survey,hr_evaluation.(Ref-YSA,APA). Fixed:
 -Survey analysis report error. -Table contain not display. -Create question
 type= drop down menu... then error menu choice not exists. -Status change in
 survey.response. finished and not finished. -Remove button in
 survey.response. -Response display page wise. -Evaluation data changed.

bzr revid: apa@tinyerp.com-20100203083553-th7b1jq7ksskitjo
---
 addons/hr_evaluation/hr_evaluation_data.xml   | 124 +++++++++++++++++-
 .../survey/report/survey_analysis_report.py   |  15 ++-
 .../survey/report/survey_browse_response.py   |  28 +++-
 addons/survey/report/survey_form.py           |   8 ++
 addons/survey/survey.py                       |  34 +++--
 addons/survey/survey_demo.xml                 |   2 +-
 addons/survey/survey_view.xml                 |   9 +-
 7 files changed, 185 insertions(+), 35 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation_data.xml b/addons/hr_evaluation/hr_evaluation_data.xml
index 2a3d72d3ccd..d2223e45fb2 100644
--- a/addons/hr_evaluation/hr_evaluation_data.xml
+++ b/addons/hr_evaluation/hr_evaluation_data.xml
@@ -41,9 +41,31 @@
 			<field name="title">EMPLOYEE PERFORMANCE IN KEY AREAS</field>
 			<field name="survey_id" ref="survey_2"/>
 			<field eval="3" name="sequence"/>
+			<field name="note">The appraiser should rate the employee’s major work accomplishments and performance according to the metric provided below :
+				1 - Significantly exceeds standards and expectations required of the position
+				2 - Exceeds standards and expectations
+				3 - Meet standards and expectations
+				4 - Did not meet standards and expectations
+				5 - Significantly below standards and expectations  </field>
 		</record>
 	</data>
 
+	<data>
+		<record id="survey_page_16" model="survey.page">
+			<field name="title">PROFESSIONAL DEVELOPMENT AND PERFORMANCE PLAN (optional)</field>
+			<field name="survey_id" ref="survey_2"/>
+			<field eval="4" name="sequence"/>
+			<field name="note">Identify professional, performance, or project objectives you recommend for employee’s continued career development over the coming year. </field>
+		</record>
+	</data>
+
+	<data>
+		<record id="survey_page_26" model="survey.page">
+			<field name="title">EMPLOYEE COMMENTS</field>
+			<field name="survey_id" ref="survey_2"/>
+			<field eval="5" name="sequence"/>
+		</record>
+	</data>
 
 	<data>
 		<record id="survey_page_10" model="survey.page">
@@ -519,7 +541,14 @@ Once the form had been filled, the employee send it to his supervisor.
 			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
 			<field name="descriptive_text">* His direct reports will be invited through OpenERP to express a feedback on their supervisor's leadership and to give their opinion about their own engagement and effectiveness, the continuous improvement and openness in action in the company, ...
 
-* The employees will send back their anonymous answers to OpenERP. The data will be handled by the HR manager and a  brief summary of the data will be sent to the concerned supervisor, to his team and to the supervisor's supervisor.</field>
+* The employees will send back their anonymous answers to OpenERP. The data will be handled by the HR manager and a  brief summary of the data will be sent to the concerned supervisor, to his team and to the supervisor's supervisor.
+* The appraiser should rate the employee’s major work accomplishments and 	performance according to the metric provided below :
+
+	1 - Significantly exceeds standards and expectations required of the position
+	2 - Exceeds standards and expectations
+	3 - Meet standards and expectations
+	4 - Did not meet standards and expectations
+	5 - Significantly below standards and expectations</field>
 			<field eval="0" name="make_comment_field"/>
 			<field eval="1" name="in_visible_menu_choice"/>
 			<field name="page_id" ref="survey_page_2"/>
@@ -573,8 +602,101 @@ Once the form had been filled, the employee send it to his supervisor.
 		</record>
 	</data-->
 
+	<data>
+		<record id="survey_question_17_1" model="survey.question">
+			<field name="validation_type">do_not_validate</field>
+			<field name="comment_valid_type">do_not_validate</field>
+			<field name="make_comment_field_err_msg">Please enter a comment.</field>
+			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+			<field eval="0" name="comment_column"/>
+			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field name="req_error_msg">This question requires an answer.</field>
+			<field eval="2" name="sequence"/>
+			<field name="question">PROFESSIONAL DEVELOPMENT OBJECTIVES </field>
+			<field eval="0" name="is_require_answer"/>
+			<field name="type">comment</field>
+			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="make_comment_field"/>
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="page_id" ref="survey_page_16"/>
+			<field name="comment_label">Other</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field eval="0" name="allow_comment"/>
+		</record>
+	</data>
 
+	<data>
+		<record id="survey_question_17_2" model="survey.question">
+			<field name="validation_type">do_not_validate</field>
+			<field name="comment_valid_type">do_not_validate</field>
+			<field name="make_comment_field_err_msg">Please enter a comment.</field>
+			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+			<field eval="0" name="comment_column"/>
+			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field name="req_error_msg">This question requires an answer.</field>
+			<field eval="2" name="sequence"/>
+			<field name="question">PERSONAL PERFORMANCE OBJECTIVES</field>
+			<field eval="0" name="is_require_answer"/>
+			<field name="type">comment</field>
+			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="make_comment_field"/>
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="page_id" ref="survey_page_16"/>
+			<field name="comment_label">Other</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field eval="0" name="allow_comment"/>
+		</record>
+	</data>
 
+	<data>
+		<record id="survey_question_17_3" model="survey.question">
+			<field name="validation_type">do_not_validate</field>
+			<field name="comment_valid_type">do_not_validate</field>
+			<field name="make_comment_field_err_msg">Please enter a comment.</field>
+			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+			<field eval="0" name="comment_column"/>
+			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field name="req_error_msg">This question requires an answer.</field>
+			<field eval="4" name="sequence"/>
+			<field name="question">PROJECT OBJECTIVES</field>
+			<field eval="0" name="is_require_answer"/>
+			<field name="type">comment</field>
+			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="make_comment_field"/>
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="page_id" ref="survey_page_16"/>
+			<field name="comment_label">Other</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field eval="0" name="allow_comment"/>
+		</record>
+	</data>
+
+	<data>
+		<record id="survey_question_17_2_12" model="survey.question">
+			<field name="validation_type">do_not_validate</field>
+			<field name="comment_valid_type">do_not_validate</field>
+			<field name="make_comment_field_err_msg">Please enter a comment.</field>
+			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+			<field eval="0" name="comment_column"/>
+			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field name="req_error_msg">This question requires an answer.</field>
+			<field eval="5" name="sequence"/>
+			<field name="question">Use the following space to make any comments regarding the above performance evaluation.</field>
+			<field eval="0" name="is_require_answer"/>
+			<field name="type">comment</field>
+			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="make_comment_field"/>
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="page_id" ref="survey_page_26"/>
+			<field name="comment_label">Other</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field eval="0" name="allow_comment"/>
+		</record>
+	</data>
 	<data>
 		<record id="survey_question_column_heading_4" model="survey.question.column.heading">
 			<field eval="0" name="in_visible_menu_choice"/>
diff --git a/addons/survey/report/survey_analysis_report.py b/addons/survey/report/survey_analysis_report.py
index 069488034d8..b9c74ebbc2d 100755
--- a/addons/survey/report/survey_analysis_report.py
+++ b/addons/survey/report/survey_analysis_report.py
@@ -167,7 +167,7 @@ class survey_analysis(report_rml):
                                     if cal['answer'] == matrix_ans[mat_col]:
                                         cal_count = cal['count']
                                 if tot_res:
-                                    percantage = float(cal_count)*100 / tot_res
+                                    percantage = round(float(cal_count)*100 / tot_res,2)
                                 if percantage:
                                     rml += """<td color="#FFF435"><para style="answer_bold">""" + tools.ustr(percantage) +"% (" + tools.ustr(cal_count) + """)</para></td>"""
                                 else:
@@ -257,14 +257,17 @@ class survey_analysis(report_rml):
                                         sqc.question_id = sr.question_id  and sra.answer_id = %d and sqc.title ='%s'\
                                         group by sra.answer_id,sqc.rating_weight" % (ans.id,matrix_ans[mat_col]))
                                 col_weight =  cr.fetchone()
-                                if not col_weight :
+                                
+                                if not col_weight:
                                     col_weight= (0,0)
+                                elif not col_weight[1]:
+                                    col_weight = (col_weight[0],0)
                                 res_count = col_weight[0]
-                                if tot_res:
-                                    rating_weight_sum += col_weight[1] * tot_res
+                                if tot_res and res_count:
+                                    rating_weight_sum += int(col_weight[1]) * tot_res
                                     tot_per = round((float(tot_res) * 100) / int(res_count), 2)
                                 else:
-                                    tot_res = 0
+                                    tor_res = 0
                                     tot_per = 0.0
                                 if tot_res:
                                     rml += """<td><para style="answer_bold">""" + tools.ustr(tot_per) + "%(" + tools.ustr(tot_res) + """)</para></td>"""
@@ -309,7 +312,7 @@ class survey_analysis(report_rml):
                                             calc = per['count']
                                     percantage = 0.00
                                     if calc and response:
-                                        percantage = (float(calc)* 100) / response
+                                        percantage = round((float(calc)* 100) / response,2)
                                     if calc:
                                         rml+="""<td><para style="answer_bold">""" +tools.ustr(percantage)+"% (" +  tools.ustr(calc) + """)</para></td>"""
                                     else:
diff --git a/addons/survey/report/survey_browse_response.py b/addons/survey/report/survey_browse_response.py
index 6e26f21e5b3..a1e07cd0d3a 100644
--- a/addons/survey/report/survey_browse_response.py
+++ b/addons/survey/report/survey_browse_response.py
@@ -51,6 +51,10 @@ class survey_browse_response(report_rml):
                       <blockValign value="TOP"/>
                       <lineStyle kind="LINEBELOW" colorName="#e6e6e6"/>
                     </blockTableStyle>
+                    <blockTableStyle id="note_table">
+                      <blockAlignment value="LEFT"/>
+                      <blockValign value="TOP"/>
+                    </blockTableStyle>
                     <blockTableStyle id="Table2">
                       <blockAlignment value="LEFT"/>
                       <blockValign value="TOP"/>
@@ -139,11 +143,11 @@ class survey_browse_response(report_rml):
             response_id = surv_resp_obj.search(cr, uid, [('survey_id','in',ids)])
         surv_resp_line_obj = pooler.get_pool(cr.dbname).get('survey.response.line')
         surv_obj = pooler.get_pool(cr.dbname).get('survey')
-        for response in surv_resp_obj.browse(cr,uid, response_id): 
+        for response in surv_resp_obj.browse(cr,uid, response_id):
             for survey in surv_obj.browse(cr, uid, [response.survey_id.id]):
-                status = "Skip"
+                status = "Not Finished"
                 if response.state == "done":
-                    status = "Complete"
+                    status = "Finished"
                 rml += """<blockTable colWidths="230.0,120.0,100.0,50" style="Table_heading">
                           <tr>
                             <td>
@@ -183,6 +187,13 @@ class survey_browse_response(report_rml):
                                     <td><para style="page">Page :- """ + to_xml(tools.ustr(page.title)) + """</para></td>
                                   </tr>
                                </blockTable>"""
+                    if page.note:
+                        rml += """<para style="P2"></para>
+                             <blockTable colWidths="500" style="note_table">
+                                  <tr>
+                                    <td><para style="response">""" + to_xml(tools.ustr(page.note)) + """</para></td>
+                                  </tr>
+                               </blockTable>"""
                     for que in page.question_ids:
                         rml += """<para style="P2"></para>
                                 <blockTable colWidths="500" style="Table5">
@@ -213,11 +224,14 @@ class survey_browse_response(report_rml):
                                     rml +="""<blockTable colWidths=" """ + str(colWidths) + """ " style="Table51"><tr>"""
                                     table_data = col_heading.browse(cr, uid, col_heading.search(cr, uid, [('response_table_id', '=', answer[0].id),('name','=',row)]))
                                     for column in matrix_ans:
-                                        value = """<font color="white"> </font>"""
+                                        value = False
                                         for col in table_data:
                                             if column == col.column_id.title:
                                                 value = col.value
-                                        rml += """<td> <para style="terp_default_9">""" + to_xml(tools.ustr(value)) +"""</para></td>"""
+                                        if value:
+                                            rml += """<td> <para style="terp_default_9">""" + to_xml(tools.ustr(value)) +"""</para></td>"""
+                                        else:
+                                            rml += """<td><para style="terp_default_9"><font color ="white"> </font></para></td>"""
                                     rml += """</tr></blockTable>"""
                             else:
                                 rml +="""<blockTable colWidths="500" style="Table1">
@@ -354,8 +368,8 @@ class survey_browse_response(report_rml):
                                 rml +="""<blockTable colWidths="500" style="Table1">
                                  <tr>  <td> <para style="response">No Response</para></td> </tr>
                                 </blockTable>"""
-                
-                rml += """<pageBreak/>"""
+
+                    rml += """<pageBreak/>"""
         rml += """</story></document>"""
         report_type = datas.get('report_type', 'pdf')
         create_doc = self.generators[report_type]
diff --git a/addons/survey/report/survey_form.py b/addons/survey/report/survey_form.py
index 725e2134f76..0cdc9194c2a 100644
--- a/addons/survey/report/survey_form.py
+++ b/addons/survey/report/survey_form.py
@@ -102,6 +102,10 @@ class survey_form(report_rml):
               <blockValign value="TOP"/>
               <lineStyle kind="LINEBELOW" colorName="#8f8f8f" start="0,-1" stop="1,-1"/>
             </blockTableStyle>
+            <blockTableStyle id="note_table">
+              <blockAlignment value="LEFT"/>
+              <blockValign value="TOP"/>
+            </blockTableStyle>
             <blockTableStyle id="Table4">
               <blockAlignment value="LEFT"/>
               <blockValign value="TOP"/>
@@ -147,6 +151,10 @@ class survey_form(report_rml):
                 <blockTable colWidths='"""+_tbl_widths+"""' style="page_tbl">
                     <tr><td><para style="page">"""+ tools.ustr(seq) + """. """ + to_xml(tools.ustr(page.title)) + """</para></td></tr>
                 </blockTable>"""
+                if page.note:
+                    rml += """<para style="P2"></para><blockTable colWidths='"""+_tbl_widths+"""' style="note_table">
+                                <tr><td><para style="descriptive_text">""" + to_xml(tools.ustr(page.note or '')) + """</para></td></tr>
+                            </blockTable>"""
                 for que in page.question_ids:
                     cols_widhts=[]
                     rml +="""
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 632f4c768ef..8f3f8224465 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -331,9 +331,9 @@ class survey_question(osv.osv):
                         raise osv.except_osv(_('Error !'),_("Maximum Required Answer is greater than Minimum Required Answer"))
             if question['type'] ==  'matrix_of_drop_down_menus' and vals.has_key('column_heading_ids'):
                 for col in vals['column_heading_ids']:
-                    if col[2] and  col[2].has_key('menu_choice') and not col[2]['menu_choice']:
+                    if not col[2] or not col[2].has_key('menu_choice') or not col[2]['menu_choice']:
                         raise osv.except_osv(_('Error !'),_("You must enter one or more menu choices in column heading"))
-                    elif col[2] and col[2].has_key('menu_choice') and col[2]['menu_choice'].strip() == '':
+                    elif not col[2] or not col[2].has_key('menu_choice') or col[2]['menu_choice'].strip() == '':
                         raise osv.except_osv(_('Error !'),_("You must enter one or more menu choices in column heading (white spaces not allowed)"))
         return super(survey_question, self).write(cr, uid, ids, vals, context=context)
 
@@ -361,9 +361,9 @@ class survey_question(osv.osv):
                     raise osv.except_osv(_('Error !'),_("Maximum Required Answer is greater than Minimum Required Answer"))
         if vals['type'] ==  'matrix_of_drop_down_menus':
             for col in vals['column_heading_ids']:
-                if not col[2]['menu_choice']:
+                if not col[2] or not col[2].has_key('menu_choice') or not col[2]['menu_choice']:
                     raise osv.except_osv(_('Error !'),_("You must enter one or more menu choices in column heading"))
-                elif col[2]['menu_choice'].strip() == '':
+                elif not col[2] or not col[2].has_key('menu_choice') or col[2]['menu_choice'].strip() == '':
                     raise osv.except_osv(_('Error !'),_("You must enter one or more menu choices in column heading (white spaces not allowed)"))
         res = super(survey_question, self).create(cr, uid, vals, context)
         return res
@@ -479,18 +479,11 @@ class survey_response(osv.osv):
         'user_id' : fields.many2one('res.users', 'User'),
         'response_type' : fields.selection([('manually', 'Manually'), ('link', 'Link')], 'Response Type', required=1),
         'question_ids' : fields.one2many('survey.response.line', 'response_id', 'Response Answer'),
-        'state' : fields.selection([('done', 'Completed '),('skip', 'Skiped')], 'Status', readonly=True),
+        'state' : fields.selection([('done', 'Finished '),('skip', 'Not Finished')], 'Status', readonly=True),
     }
     _defaults = {
         'state' : lambda * a: "skip",
     }
-    def response_done(self, cr, uid, ids, arg):
-        self.write(cr, uid, ids, { 'state' : 'done' })
-        return True
-
-    def response_skip(self, cr, uid, ids, arg):
-        self.write(cr, uid, ids, { 'state' : 'skip' })
-        return True
 
 survey_response()
 
@@ -765,9 +758,20 @@ class survey_question_wiz(osv.osv_memory):
                                     fields[tools.ustr(que) + "_" + tools.ustr(row['id'])  + "_" + tools.ustr(col['title'])] = {'type':'selection', 'string': col['title'], 'selection':selection}
                         elif que_rec['type'] == 'multiple_textboxes':
                             xml_group = etree.SubElement(xml_group, 'group', {'col': '1', 'colspan': '4'})
+                            type = "char"
+                            if que_rec['is_validation_require']:
+                                if que_rec['validation_type'] in ['must_be_whole_number']:
+                                    type = "integer"
+                                elif que_rec['validation_type'] in ['must_be_decimal_number']:
+                                    type = "float"
+                                elif que_rec['validation_type'] in ['must_be_date']:
+                                    type = "date"
                             for ans in ans_ids:
                                 etree.SubElement(xml_group, 'field', {'name': tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"})
-                                fields[tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"] = {'type':'char', 'size':255, 'string':ans['answer']}
+                                if type == "char" :
+                                    fields[tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"] = {'type':'char', 'size':255, 'string':ans['answer']}
+                                else:
+                                    fields[tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"] = {'type': str(type), 'string':ans['answer']}
                         elif que_rec['type'] == 'numerical_textboxes':
                             xml_group = etree.SubElement(xml_group, 'group', {'col': '2', 'colspan': '2'})
                             for ans in ans_ids:
@@ -969,6 +973,7 @@ class survey_question_wiz(osv.osv_memory):
                     comment_value = False
                     response_list = []
                     for key1, val1 in vals.items():
+                        print "FOR::::::::::",key1,val1
                         if val1 and key1.split('_')[1] == "table" and key1.split('_')[0] == que_id:
                             surv_tbl_column_obj.create(cr, uid, {'response_table_id' : resp_id,'column_id':key1.split('_')[2], 'name':key1.split('_')[3], 'value' : val1})
                             sur_name_read['store_ans'][resp_id].update({key1:val1})
@@ -1069,10 +1074,13 @@ class survey_question_wiz(osv.osv_memory):
                             select_count += 1
                             numeric_sum += int(val1)
                         elif val1 and que_id == key1.split('_')[0] and len(key1.split('_')) == 3:
+                            print "V:::::::::::::::::",key1, val1
                             if type(val1) == type('') or type(val1) == type(u''):
+                                print "VA:::::::::::::::::::DROP DOWN::::::::"
                                 ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':key1.split('_')[1], 'answer' : key1.split('_')[2], 'value_choice' : val1})
                                 sur_name_read['store_ans'][resp_id].update({key1:val1})
                             else:
+                                print ":A:::::::::::::multiple answer :::"
                                 ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':key1.split('_')[1], 'answer' : key1.split('_')[2]})
                                 sur_name_read['store_ans'][resp_id].update({key1:True})
                             matrix_list.append(key1.split('_')[0] + '_' + key1.split('_')[1])
diff --git a/addons/survey/survey_demo.xml b/addons/survey/survey_demo.xml
index 88f632a5032..03ac38d8b74 100644
--- a/addons/survey/survey_demo.xml
+++ b/addons/survey/survey_demo.xml
@@ -416,7 +416,7 @@
         <record id="survey_question_partners_on_which_subjects" model="survey.question">
             <field name="question">In your opinion, how could Tiny better communicate with partners and on which subjects?</field>
             <field name="page_id" ref="survey_page_communication" />
-            <field name="type">single_textbox</field>
+            <field name="type">comment</field>
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
             <field eval="4" name="sequence"/>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 5085ed4986d..5c84eb6d1e4 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -903,13 +903,7 @@
                     <field name="user_id" select="1"/>
                     <field name="response_type" select="1"/>
                     <field name="question_ids" nolabel="1" colspan="4" />
-                    <group col="5" colspan="4">
-                        <field name="state"/>
-                        <button name="response_done" string="Done"
-                            states="skip" type="object" icon="gtk-go-forward"/>
-                        <button name="response_skip" string="Skip"
-                            states="done" type="object" icon="gtk-close"/>
-                    </group>
+                    <field name="state" select="1"/>
                 </form>
             </field>
         </record>
@@ -924,6 +918,7 @@
                     <field name="date_create" select="1"/>
                     <field name="user_id" select="1"/>
                     <field name="response_type" select="1"/>
+                    <field name="state" select="1"/>
                 </tree>
             </field>
         </record>

From 01d5847e8a89baa950136f62a516b98c4ad17467 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Wed, 3 Feb 2010 14:14:06 +0530
Subject: [PATCH 57/68] [IMP]:survey:remove print

bzr revid: apa@tinyerp.com-20100203084406-nmx5xoxe41eytx01
---
 addons/survey/survey.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 8f3f8224465..07fa3fcd9f0 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -973,7 +973,6 @@ class survey_question_wiz(osv.osv_memory):
                     comment_value = False
                     response_list = []
                     for key1, val1 in vals.items():
-                        print "FOR::::::::::",key1,val1
                         if val1 and key1.split('_')[1] == "table" and key1.split('_')[0] == que_id:
                             surv_tbl_column_obj.create(cr, uid, {'response_table_id' : resp_id,'column_id':key1.split('_')[2], 'name':key1.split('_')[3], 'value' : val1})
                             sur_name_read['store_ans'][resp_id].update({key1:val1})
@@ -1074,13 +1073,10 @@ class survey_question_wiz(osv.osv_memory):
                             select_count += 1
                             numeric_sum += int(val1)
                         elif val1 and que_id == key1.split('_')[0] and len(key1.split('_')) == 3:
-                            print "V:::::::::::::::::",key1, val1
                             if type(val1) == type('') or type(val1) == type(u''):
-                                print "VA:::::::::::::::::::DROP DOWN::::::::"
                                 ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':key1.split('_')[1], 'answer' : key1.split('_')[2], 'value_choice' : val1})
                                 sur_name_read['store_ans'][resp_id].update({key1:val1})
                             else:
-                                print ":A:::::::::::::multiple answer :::"
                                 ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':key1.split('_')[1], 'answer' : key1.split('_')[2]})
                                 sur_name_read['store_ans'][resp_id].update({key1:True})
                             matrix_list.append(key1.split('_')[0] + '_' + key1.split('_')[1])

From 3466698ef342ffea293b921f1fc3b99e33b45a8f Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Wed, 3 Feb 2010 15:20:19 +0530
Subject: [PATCH 58/68] [IMP] crm_project: Improved search and form view

bzr revid: hmo@tinyerp.com-20100203095019-yoefnt42ufirljyu
---
 addons/crm_project/crm_bugs_view.xml  | 45 +++++++++++----------------
 addons/crm_project/crm_project_bug.py |  2 +-
 2 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/addons/crm_project/crm_bugs_view.xml b/addons/crm_project/crm_bugs_view.xml
index b193e6f4bd1..0d84723f11e 100644
--- a/addons/crm_project/crm_bugs_view.xml
+++ b/addons/crm_project/crm_bugs_view.xml
@@ -36,10 +36,10 @@
         <field name="arch" type="xml">
             <form string="Bug Tracker Form">
                 <group colspan="4" col="6">
-                    <field name="name" string="Title" colspan="2"/>
-                    <field name="date"/>
+                    <field name="name" string="Title" colspan="2"/>                    
                   	<field name="project_id" required="True"/>  
                     <field name="categ_id"  on_change="onchange_categ_id(categ_id)" widget="selection" required="1" domain="[('object_id.model', '=', 'crm.project.bug')]"/>
+                    <field name="user_id" />
                     <label string="Resolution: " align="1.0"/>
                     <group colspan="1" col="2">
                         <field name="stage_id" select="1" nolabel="1"/>
@@ -56,8 +56,7 @@
                 <page string="General">
                     <field name="partner_id"  on_change="onchange_partner_id(partner_id, email_from)" colspan="2"/>
                     <field name="partner_address_id"  string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
-                    <field name="email_from" colspan="2"/>
-                    <field name="user_id" />
+                    <field name="email_from" colspan="2"/>                    
                     <separator colspan="4"/>
                     <field name="type_id" string="Version"/>                    
                     <field name="priority" string="Severity"/>
@@ -163,20 +162,7 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Bugs">
-               <group col="7" colspan="1">
-                   <filter icon="gtk-media-forward" string="Accepted Bugs"
-                   	domain="[('stage_id.name','=','Accepted as Bug')]"
-                   	separator="1" help="All Accepted Bugs"
-                   /> 
-                   <filter icon="gtk-apply" string="Fixed Bugs"
-                   	domain="[('stage_id.name','=','Fixed')]"
-                   	separator="1" help="All Fixed Bugs"
-                   />
-                   <filter icon="gtk-media-pause" string="Waiting Bugs"
-                   	domain="[('stage_id.name','=','Awaiting Response')]"
-                   	separator="1" help="All Waiting Bugs"
-                   />                   
-                   <separator orientation="vertical"/>
+               <group col="3" colspan="1">                   
                    <filter icon="gtk-home" string="   Today   "
                    	separator="1"
                    	domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"
@@ -186,20 +172,25 @@
                    	string="    7 Days    " separator="1"
                    	domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                    	help="Bugs during last 7 days"
-                   />
+                   />                   
+                   
                </group>
                <separator orientation="vertical"/>
-               <group col="4" colspan="2">
+               <group col="5" colspan="2">
                		<field name="name" select='1' string="Subject"/>
-                   <field name="user_id" select="1" widget="selection">
-                   	<filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Bugs" default="1"/>
-                   </field>
-					<field name="section_id" select="1" widget="selection" string="Section" default="context.get('section_id', False)">
+                    <field name="user_id" select="1" widget="selection">
+                   	    <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Bugs" default="1"/>
+                    </field>
+                    <field name="state" select="1">
+                       <filter icon="gtk-new" domain="[('state','in',('open','draft'))]" help="Current Bugs" default="1"/>
+                       <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Bugs"/>
+                    </field>                   
+					<field name="project_id" select="1" widget="selection" string="Project" default="context.get('project_id', False)">
 							<filter icon="terp-crm"
-                               domain="[('section_id','=',context.get('section_id',False))]"
-                               help="My section"
+                               domain="[('project_id','=',context.get('project_id',False))]"
+                               help="My Project"
                            />
-                 </field>
+                    </field>
                </group>
             </search>
          </field>
diff --git a/addons/crm_project/crm_project_bug.py b/addons/crm_project/crm_project_bug.py
index 8f01dc51d08..45f03321b50 100644
--- a/addons/crm_project/crm_project_bug.py
+++ b/addons/crm_project/crm_project_bug.py
@@ -38,7 +38,7 @@ from crm import crm
 class crm_project_bug(osv.osv):
     _name = "crm.project.bug"
     _description = "Project Bug Cases"
-    _order = "id desc"
+    _order = "priority, id desc"
     _inherit = 'crm.case'
     _columns = {
         'date_closed': fields.datetime('Closed', readonly=True),

From 8dda2cc02372cc28ebb3d689b399fd90c5a2568e Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 3 Feb 2010 15:35:41 +0530
Subject: [PATCH 59/68] [IMP] mrp: set the colors in list view

bzr revid: sbh@tinyerp.com-20100203100541-52fce5zafbmrjm5t
---
 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 ad0e6b95935..29146b78edb 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -669,7 +669,7 @@
             <field name="model">mrp.procurement</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Procurement Lines">
+                <tree string="Procurement Lines" colors="red:state=='draft';black:state=='running';green:state=='confirmed';gray:state=='done'">
                     <field name="name"/>
                     <field name="product_id"/>
                     <field name="product_qty"/>

From 45b7289189c2f58b31d08b9a101c03ff843c9ecf Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Wed, 3 Feb 2010 15:54:56 +0530
Subject: [PATCH 60/68] [IMP]:improved groupby date format to Today, and (month
 year) wise eg: Today,January 2010, February 2010

bzr revid: nch@tinyerp.com-20100203102456-lz4uqqnstsblcoo7
---
 bin/osv/orm.py | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 4d874824196..9975cf1e5a3 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1831,23 +1831,17 @@ class orm(orm_template):
             alldata[r['id']] = r
             del r['id']
 
-        today = ''
-        if fget.has_key(groupby) and fget[groupby]['type'] in ('date','datetime'):
-            today = datetime.date.today()
-            yesterday = (today - datetime.timedelta(days=1)).strftime('%Y-%m-%d')
-
         data = self.read(cr, uid, alldata.keys(), [groupby], context=context)
         for d in data:
             if fget.has_key(groupby):
                 if fget[groupby]['type'] == 'many2one':
                     d[groupby] = d[groupby] and d[groupby][1] or ''
-            if today:
-                if d[groupby][:10] == str(today):
-                    d[groupby] = 'Today'
-                elif d[groupby][:10] == yesterday:
-                    d[groupby] = 'Yesterday'
-                else:
-                    d[groupby] = 'Old'
+                if fget[groupby]['type'] in ('date','datetime'):
+                   today = datetime.date.today()
+                   if d[groupby][:10] == str(today):
+                       d[groupby] = 'Today'
+                   else:
+                       d[groupby] = datetime.datetime.strptime(d[groupby][:10],'%Y-%m-%d').strftime('%B %Y')
             d['__domain'] = [(groupby,'=',alldata[d['id']][groupby] or False)] + domain
             del alldata[d['id']][groupby]
             d.update(alldata[d['id']])

From 7a031b3646edf66bfde0f28429018bada65456b2 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 3 Feb 2010 15:57:18 +0530
Subject: [PATCH 61/68] [IMP] mrp: set the colors for cancel state  in list
 view

bzr revid: sbh@tinyerp.com-20100203102718-mlkgt1wjyetofd51
---
 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 29146b78edb..e9ff640c635 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -669,7 +669,7 @@
             <field name="model">mrp.procurement</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Procurement Lines" colors="red:state=='draft';black:state=='running';green:state=='confirmed';gray:state=='done'">
+                <tree string="Procurement Lines" colors="red:state=='draft';black:state=='running';green:state=='confirmed';gray:state in ['done','cancel']">
                     <field name="name"/>
                     <field name="product_id"/>
                     <field name="product_qty"/>

From 4f9107a9d6a4859321ee2f42521b8188e0ea3010 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Wed, 3 Feb 2010 16:13:25 +0530
Subject: [PATCH 62/68] [CHNGE]: beter view for the dashboard for project
 module

bzr revid: mga@tinyerp.com-20100203104325-hz4wfzctode5j70m
---
 addons/board_project/board_project_manager_view.xml | 4 ++--
 addons/board_project/board_project_view.xml         | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/board_project/board_project_manager_view.xml b/addons/board_project/board_project_manager_view.xml
index 3f805115fd4..3baca91bce6 100644
--- a/addons/board_project/board_project_manager_view.xml
+++ b/addons/board_project/board_project_manager_view.xml
@@ -55,9 +55,9 @@
                         <child1>
                           <!--  <action colspan="4" height="220" name="%(act_my_project)d" string="My projects" width="510"/>-->
 
-                            <action colspan="4" height="150" name="%(act_my_account)d" string="My accounts to invoice"/>
+                            <action colspan="4" height="150" name="%(act_my_account)d" string="My accounts to invoice" width="510"/>
 
-                            <action colspan="4" height="150" name="%(act_hr_timesheet_sheet)d" string="User's timesheets"/>
+                            <action colspan="4" height="150" name="%(act_hr_timesheet_sheet)d" string="User's timesheets" width="510"/>
 
                         </child1>
                         <child2>
diff --git a/addons/board_project/board_project_view.xml b/addons/board_project/board_project_view.xml
index f1e27da0839..e602b54d982 100644
--- a/addons/board_project/board_project_view.xml
+++ b/addons/board_project/board_project_view.xml
@@ -92,11 +92,12 @@
                     <hpaned>
                         <child1>
                             <action colspan="4" height="220" name="%(action_view_task_tree)d" string="My Open Tasks" width="510"/>
-                            <action colspan="4" height="150" name="%(action_view_project_member_tree)d" string="Members list of project"/>
+                            <action colspan="4" name="%(crm_project.crm_case_categ_act0)d" string="Issues"/>
+                            
                          </child1>
                         <child2>
+                             <action colspan="4" height="150" name="%(action_view_project_member_tree)d" string="Members list of project"/>
                              <action colspan="4" name="%(action_view_project_editable_messages_tree)d" string="Messages"/>
-                             <action colspan="4" name="%(crm_project.crm_case_categ_act0)d" string="Issues"/>
                         </child2>
                     </hpaned>
                 </form>

From 1bb30ecef0776c0f51f47c81ced3dcdd4a67596d Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Wed, 3 Feb 2010 16:16:24 +0530
Subject: [PATCH 63/68] [IMP]: caldav: Attendee Invitation improvement *
 Improved information+formating of mail to send on invitation * Implemented
 email gateway functions that updates attendees's response by mail reply

bzr revid: rpa@openerp.co.in-20100203104624-hs3t7kk2966s90e4
---
 addons/caldav/caldav.py       | 132 +++++++++++++++++++++++++++-------
 addons/caldav/caldav_view.xml |  19 ++---
 2 files changed, 114 insertions(+), 37 deletions(-)

diff --git a/addons/caldav/caldav.py b/addons/caldav/caldav.py
index 1e2aa15b77a..fa4b811fa2b 100644
--- a/addons/caldav/caldav.py
+++ b/addons/caldav/caldav.py
@@ -67,52 +67,106 @@ def _links_get(self, cr, uid, context={}):
     return [(r['object'], r['name']) for r in res]
 
 html_invitation = """
+<html>
 <head>
 <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
 <title>%(name)s</title>
 </head>
-<div>
-<table cellspacing="0" cellpadding="0" border=3D "1" summary=3D"">
-    <tr align="center">
+<body>
+<table border="0" cellspacing="10" cellpadding="0" width="100%%"
+    style="font-family: Arial, Sans-serif; font-size: 14">
+    <tr>
+        <td width="100%%">Hello,</td>
+    </tr>
+    <tr>
+        <td width="100%%">You are invited for OpenERP Event.</td>
+    </tr>
+    <tr>
+        <td width="100%%">Below are the details of event :</td>
+    </tr>
+</table>
+
+<table cellspacing="0" cellpadding="5" border="0" summary=""
+    style="width: 90%%; font-family: Arial, Sans-serif; border: 1px Solid #ccc; background-color: #f6f6f6">
+    <tr valign="center" align="center">
         <td bgcolor="DFDFDF">
         <h3>%(name)s</h3>
         </td>
     </tr>
     <tr>
         <td>
-        <table cellpadding="8" cellspacing="0" border=3D "0" summary=3D
-            "Eventdetails" bgcolor="f6f6f6">
+        <table cellpadding="8" cellspacing="0" border="0"
+            style="font-size: 14" summary="Eventdetails" bgcolor="f6f6f6"
+            width="90%%">
             <tr>
-                <td>
-                <div><b><i>Start Date</i></b></div>
+                <td width="21%%">
+                <div><b>Start Date</b></div>
                 </td>
-                <td>%(start_date)s</td>
-                <td>
-                <div><b><i>End Date</i></b></div>
+                <td><b>:</b> %(start_date)s</td>
+                <td width="15%%">
+                <div><b>End Date</b></div>
                 </td>
-                <td>%(end_date)s</td>
+                <td><b>:</b> %(end_date)s</td>
             </tr>
             <tr>
-                <td><b><i>Description</i></b></td>
-                <td colspan="3">%(description)s</td>
+                <td><b>Description</b></td>
+                <td colspan="3"><b>:</b> %(description)s</td>
             </tr>
             <tr>
                 <td>
-                <div><b><i>Location</i></b></div>
+                <div><b>Location</b></div>
                 </td>
-                <td colspan="3">%(location)s</td>
+                <td colspan="3"><b>:</b> %(location)s</td>
             </tr>
             <tr>
                 <td>
-                <div><b><i>Event Attendees</i></b></div>
+                <div><b>Event Attendees</b></div>
                 </td>
                 <td colspan="3">
                 <div>
-                <div>%(attendees)s</div>
+                <div><b>:</b> %(attendees)s</div>
                 </div>
                 </td>
             </tr>
-        </table>"""
+            <td><b>Are you coming?</b></td>
+            <td colspan="3">
+            <UL>
+                <LI>
+                YES
+                <LI>
+                NO
+                <LI>
+                MAYBE
+            </UL>
+            </td>
+            <tr>
+        </table>
+        </td>
+    </tr>
+</table>
+<table border="0" cellspacing="10" cellpadding="0" width="100%%"
+    style="font-family: Arial, Sans-serif; font-size: 14">
+    <tr>
+        <td width="100%%"><b>Note:</b> If you are interested please reply this
+        mail and keep only your response from options <i>YES, NO</i>
+        and <i>MAYBE</i>.</td>
+    </tr>
+    <tr>
+        <td width="100%%">From:</td>
+    </tr>
+    <tr>
+        <td width="100%%">%(user)s</td>
+    </tr>
+    <tr valign="top">
+        <td width="100%%">-<font color="a7a7a7">-------------------------</font></td>
+    </tr>
+    <tr>
+        <td width="100%%"> <font color="a7a7a7">%(sign)s</font></td>
+    </tr>
+</table>
+</body>
+</html>
+"""
 
 class calendar_attendee(osv.osv):
     _name = 'calendar.attendee'
@@ -253,6 +307,30 @@ request was delegated to"),
     _defaults = {
         'state':  lambda *x: 'needs-action', 
     }
+    
+    response_re = response_re = re.compile("Are you coming\?.*(YES|NO|MAYBE).*", re.UNICODE)
+    
+    def msg_new(self, cr, uid, msg):        
+        return False
+        
+    def msg_act_get(self, msg):
+        mailgate_obj = self.pool.get('mail.gateway')
+        body = mailgate_obj.msg_body_get(msg)
+        actions = {}
+        res = self.response_re.findall(body['body'])
+        if res:
+                actions['state'] = res[0]
+        return actions
+
+    def msg_update(self, cr, uid, ids, msg, data={}, default_act='None'):
+        msg_actions = self.msg_act_get(msg)
+        if msg_actions.get('state'):
+            if msg_actions['state'] in ['YES','NO','MAYBE']:
+                mapping = {'YES': 'accepted', 'NO': 'declined', 'MAYBE': 'tentative'}
+                status = mapping[msg_actions['state']]
+                print 'Got response for invitation id: %s as %s'  % (ids, status)
+                self.write(cr, uid, ids, {'state': status})
+        return True
 
     def onchange_user_id(self, cr, uid, ids, user_id, *args, **argv):
         if not user_id:
@@ -278,7 +356,7 @@ request was delegated to"),
             vals['cn'] = vals.get("cn")
         res = super(calendar_attendee, self).create(cr, uid, vals, context)
         return res
-
+    
 calendar_attendee()
 
 class res_alarm(osv.osv):
@@ -457,7 +535,7 @@ or contains the text to be used for display"""),
                       %s
 
                 """  % (alarm.name, alarm.trigger_date, alarm.description, \
-                    alarm.user_id.name, alarm.user_id.sign)
+                    alarm.user_id.name, alarm.user_id.signature)
                 mail_to = [alarm.user_id.address_id.email]
                 for att in alarm.attendee_ids:
                     mail_to.append(att.user_id.address_id.email)
@@ -1113,23 +1191,27 @@ class invite_attendee_wizard(osv.osv_memory):
             vals.update({'email': datas['email']})
             att_id = att_obj.create(cr, uid, vals)
             obj.write(cr, uid, res_obj.id, {'attendee_ids': [(4, att_id)]})
-
-            sub = '[OpenERP Invitation] %s'  % (res_obj.name)
+            sign = res_obj.user_id and res_obj.user_id.signature or ''
+            sign = '<br>'.join(sign and sign.split('\n') or [])
+            sub = '[%d] %s'  % (att_id, res_obj.name)
             body_vals = {'name': res_obj.name, 
                         'start_date': res_obj.date, 
                         'end_date': res_obj.date_deadline or None, 
                         'description': res_obj.description, 
                         'location': res_obj.location or '-', 
-                        'attendees': '-' #Todo
+                        'attendees': '-',  #Todo
+                        'user': res_obj.user_id and res_obj.user_id.name or 'OpenERP User', 
+                        'sign': sign
             }
             body = html_invitation % body_vals
             mail_to = [datas['email']]
             tools.email_send(
-                    res_obj.user_id.name, 
+                    tools.config.get('email_from',False), 
                     mail_to, 
                     sub, 
                     body, 
-                    subtype='html'
+                    subtype='html', 
+                    reply_to=tools.config.get('email_from',False), 
                 )
 
         elif  type == 'partner':
diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index 4d10b9529f5..2d3a59892c7 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -95,21 +95,16 @@
             		<group col="6" colspan="4">
 	                        <field name="state" select="2" />
 	                        <button name="do_tentative"
-	                        	string="Uncertain"
-	                        	states="needs-action" type="object"
+	                        	string="Uncertain" type="object"
 	                        	icon="terp-crm" />
-	                        <button name="do_accept"
-	                        	string="Accept"
-	                        	states="needs-action" type="object"
-	                        	icon="gtk-apply" />
-	                        <button name="do_decline"
-	                        	string="Decline"
-	                        	states="needs-action" type="object"
-	                        	icon="gtk-cancel" />
+	                        <button name="do_accept" string="Accept"
+	                        	type="object" icon="gtk-apply" />
+	                        <button name="do_decline" string="Decline"
+	                        	type="object" icon="gtk-cancel" />
 	                        <button
 	                        	name="%(caldav.action_view_calendar_invite_attendee_wizard)d"
-	                        	states="needs-action" string="Delegate"
-	                        	type="action" icon="gtk-sort-descending"
+	                        	string="Delegate" type="action"
+	                        	icon="gtk-sort-descending"
 	                        	context="{'model' : 'calendar.attendee', 'state' : 'delegated'}" />
             		</group>
             	</form>

From 75a5d84b4a364fb95722b78314a7ae02250f8535 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Wed, 3 Feb 2010 16:26:48 +0530
Subject: [PATCH 64/68] [IMP]: caldav: Improvement for proper attendee and
 company information

bzr revid: rpa@openerp.co.in-20100203105648-mwt3wyf8tu85q6b0
---
 addons/caldav/caldav.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/addons/caldav/caldav.py b/addons/caldav/caldav.py
index fa4b811fa2b..4bd0e496303 100644
--- a/addons/caldav/caldav.py
+++ b/addons/caldav/caldav.py
@@ -325,7 +325,7 @@ request was delegated to"),
     def msg_update(self, cr, uid, ids, msg, data={}, default_act='None'):
         msg_actions = self.msg_act_get(msg)
         if msg_actions.get('state'):
-            if msg_actions['state'] in ['YES','NO','MAYBE']:
+            if msg_actions['state'] in ['YES', 'NO', 'MAYBE']:
                 mapping = {'YES': 'accepted', 'NO': 'declined', 'MAYBE': 'tentative'}
                 status = mapping[msg_actions['state']]
                 print 'Got response for invitation id: %s as %s'  % (ids, status)
@@ -541,7 +541,7 @@ or contains the text to be used for display"""),
                     mail_to.append(att.user_id.address_id.email)
 
                 tools.email_send(
-                    tools.confirm['from_mail'], 
+                    tools.config.get('email_from',False), 
                     mail_to, 
                     sub, 
                     body
@@ -1189,17 +1189,23 @@ class invite_attendee_wizard(osv.osv_memory):
 
         elif  type == 'external' and datas.get('email'):
             vals.update({'email': datas['email']})
+            company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.name
+            att_infos = []
+            for att in res_obj.attendee_ids:
+                att_infos.append(((att.user_id and att.user_id.name) or \
+                             (att.partner_id and att.partner_id.name) or \
+                                att.email) +  ' - Status: ' + att.state.title())
             att_id = att_obj.create(cr, uid, vals)
             obj.write(cr, uid, res_obj.id, {'attendee_ids': [(4, att_id)]})
             sign = res_obj.user_id and res_obj.user_id.signature or ''
             sign = '<br>'.join(sign and sign.split('\n') or [])
-            sub = '[%d] %s'  % (att_id, res_obj.name)
+            sub = '[%s Invitation][%d] %s'  % (company, att_id, res_obj.name)
             body_vals = {'name': res_obj.name, 
                         'start_date': res_obj.date, 
                         'end_date': res_obj.date_deadline or None, 
                         'description': res_obj.description, 
                         'location': res_obj.location or '-', 
-                        'attendees': '-',  #Todo
+                        'attendees': '<br>'.join(att_infos),  #Todo
                         'user': res_obj.user_id and res_obj.user_id.name or 'OpenERP User', 
                         'sign': sign
             }
@@ -1211,7 +1217,7 @@ class invite_attendee_wizard(osv.osv_memory):
                     sub, 
                     body, 
                     subtype='html', 
-                    reply_to=tools.config.get('email_from',False), 
+                    reply_to=tools.config.get('email_from',False)
                 )
 
         elif  type == 'partner':

From 710e784e382d1ea47c264de20e71da812ae274db Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Wed, 3 Feb 2010 16:29:32 +0530
Subject: [PATCH 65/68] [IMP]: loading transaltion files with language name if
 it does not found with real name

bzr revid: mra@tinyerp.com-20100203105932-0hdesvu73lc2o4ay
---
 bin/addons/base/module/module.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py
index a6967773ac2..f06f6fcc24e 100644
--- a/bin/addons/base/module/module.py
+++ b/bin/addons/base/module/module.py
@@ -196,7 +196,7 @@ class module(osv.osv):
             return True
         if isinstance(ids, (int, long)):
             ids = [ids]
-        mod_names = []    
+        mod_names = []
         for mod in self.read(cr, uid, ids, ['state','name'], context):
             if mod['state'] in ('installed', 'to upgrade', 'to remove', 'to install'):
                 raise orm.except_orm(_('Error'),
@@ -204,7 +204,7 @@ class module(osv.osv):
             mod_names.append(mod['name'])
         #Removing the entry from ir_model_data
         ids_meta = self.pool.get('ir.model.data').search(cr, uid, [('name', '=', 'module_meta_information'), ('module', 'in', mod_names)])
-        
+
         if ids_meta:
             self.pool.get('ir.model.data').unlink(cr, uid, ids_meta, context)
 
@@ -476,6 +476,9 @@ class module(osv.osv):
             for lang in filter_lang:
                 iso_lang = tools.get_iso_codes(lang)
                 f = os.path.join(modpath, 'i18n', iso_lang + '.po')
+                if not os.path.exists(f) and iso_lang.find('_') != -1:
+                    f = os.path.join(modpath, 'i18n', iso_lang.split('_')[0] + '.po')
+                    iso_lang = iso_lang.split('_')[0]
                 if os.path.exists(f):
                     logger.notifyChannel("i18n", netsvc.LOG_INFO, 'module %s: loading translation file for language %s' % (mod.name, iso_lang))
                     tools.trans_load(cr.dbname, f, lang, verbose=False)

From f1c3bbe555401828611faa184b77a41cbf360cbd Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Wed, 3 Feb 2010 16:37:32 +0530
Subject: [PATCH 66/68] [CHANGE]: improve view for the account move

bzr revid: mga@tinyerp.com-20100203110732-8c3jhpmjuve64lee
---
 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 8be310245ac..709009f8481 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -873,7 +873,7 @@
                     <field name="partner_id" invisible="1" select="1"/>
                     <field name="amount" invisible="1" select="1"/>
 
-                    <field colspan="4" name="line_id" nolabel="1" widget="one2many_list" default_get="{'lines':line_id ,'journal':journal_id }">
+                    <field colspan="4" height="250" name="line_id" nolabel="1" widget="one2many_list" default_get="{'lines':line_id ,'journal':journal_id }">
                         <form string="Account Entry Line">
                             <separator colspan="4" string="General Information"/>
                             <field name="name" select="1"/>

From 2f352b933502c5136777c1f2d8a6724eb94b9b5a Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Wed, 3 Feb 2010 16:38:28 +0530
Subject: [PATCH 67/68] [FIX]: fix a problem for the browse object
 crm.case->crm.lead

bzr revid: mga@tinyerp.com-20100203110828-gsh3j1g6b3a5xxeh
---
 addons/crm/wizard/wizard_crm_new_send_email.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/addons/crm/wizard/wizard_crm_new_send_email.py b/addons/crm/wizard/wizard_crm_new_send_email.py
index 6e9951ad328..0a4780ba692 100644
--- a/addons/crm/wizard/wizard_crm_new_send_email.py
+++ b/addons/crm/wizard/wizard_crm_new_send_email.py
@@ -110,13 +110,18 @@ def _mass_mail_send(self, cr, uid, data, context):
 def _get_info(self, cr, uid, data, context):
     if not data['id']:
         return {}
+        
     pool = pooler.get_pool(cr.dbname)
-    case = pool.get('crm.case').browse(cr,uid,data['ids'])[0]
-    #if not case.email_from:
-    #    raise wizard.except_wizard(_('Error'),_('You must put a Partner eMail to use this action!'))
+    case = pool.get('crm.lead').browse(cr, uid, data['id'])
+
     if not case.user_id:
         raise wizard.except_wizard(_('Error'),_('You must define a responsible user for this case in order to use this action!'))
-    return {'to': case.email_from,'subject': case.name,'cc': case.email_cc or ''}
+        
+    return {
+        'to': case.email_from, 
+        'subject': case.name, 
+        'cc': case.email_cc or ''
+    }
     
 class wizard_send_mail(wizard.interface):
     states = {

From 6ed7e4ca628406c9b1d6ea4d501012c632de12a8 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 3 Feb 2010 16:54:57 +0530
Subject: [PATCH 68/68] [Fix] crm: set the name of model in send_mail

bzr revid: sbh@tinyerp.com-20100203112457-skbfxvag02yldp1l
---
 addons/crm/wizard/wizard_crm_new_send_email.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/wizard/wizard_crm_new_send_email.py b/addons/crm/wizard/wizard_crm_new_send_email.py
index 0a4780ba692..583915a75b7 100644
--- a/addons/crm/wizard/wizard_crm_new_send_email.py
+++ b/addons/crm/wizard/wizard_crm_new_send_email.py
@@ -70,7 +70,7 @@ def _mass_mail_send(self, cr, uid, data, context):
     attach = map(lambda x: x and ('Attachment'+str(attach.index(x)+1), base64.decodestring(x)), attach)
 
     pool = pooler.get_pool(cr.dbname)
-    case_pool=pool.get('crm.case')
+    case_pool=pool.get(data['model'])
 
     case = case_pool.browse(cr,uid,data['ids'])[0]
     case_pool.write(cr, uid, [case.id], {
@@ -112,7 +112,7 @@ def _get_info(self, cr, uid, data, context):
         return {}
         
     pool = pooler.get_pool(cr.dbname)
-    case = pool.get('crm.lead').browse(cr, uid, data['id'])
+    case = pool.get(data['model']).browse(cr, uid, data['id'])
 
     if not case.user_id:
         raise wizard.except_wizard(_('Error'),_('You must define a responsible user for this case in order to use this action!'))