From 71fa00182f57194f53dc81ca12cae327b2579fc3 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@tinyerp.com>
Date: Wed, 19 Nov 2008 13:28:18 +0100
Subject: [PATCH 01/12] [FIX] Use the text widget

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

bzr revid: stephane@tinyerp.com-20081119122818-vyxta3giajk406tn
---
 bin/addons/base/res/partner/wizard/wizard_spam.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/res/partner/wizard/wizard_spam.py b/bin/addons/base/res/partner/wizard/wizard_spam.py
index 030283bbe44..52b70d29b1b 100644
--- a/bin/addons/base/res/partner/wizard/wizard_spam.py
+++ b/bin/addons/base/res/partner/wizard/wizard_spam.py
@@ -36,7 +36,7 @@ email_send_form = '''<?xml version="1.0"?>
 email_send_fields = {
     'from': {'string':"Sender's email", 'type':'char', 'size':64, 'required':True},
     'subject': {'string':'Subject', 'type':'char', 'size':64, 'required':True},
-    'text': {'string':'Message', 'type':'text_tag', 'required':True}
+    'text': {'string':'Message', 'type':'text', 'required':True}
 }
 
 # this sends an email to ALL the addresses of the selected partners.

From 09a5faf5817b0018d500b59db0ed4c9281092874 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 19 Nov 2008 21:22:44 +0100
Subject: [PATCH 02/12] improved

bzr revid: fp@tinyerp.com-20081119202244-5sn9ogmlnzg5yz5r
---
 bin/addons/base/res/res_user.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index d9f84a0d29d..058233400da 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -96,7 +96,7 @@ class users(osv.osv):
     _columns = {
         'name': fields.char('Name', size=64, required=True, select=True),
         'login': fields.char('Login', size=64, required=True),
-        'password': fields.char('Password', size=64, invisible=True),
+        'password': fields.char('Password', size=64, invisible=True, help="Keep empty if you don't want the user to be able to connect on the system."),
         'signature': fields.text('Signature', size=64),
         'address_id': fields.many2one('res.partner.address', 'Address'),
         'active': fields.boolean('Active'),

From 6359bdddeb115304a5a4ac4d8c3f61e80ffdfa8f Mon Sep 17 00:00:00 2001
From: Christophe Simonis <christophe@tinyerp.com>
Date: Thu, 20 Nov 2008 10:32:28 +0100
Subject: [PATCH 03/12] improvement

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

bzr revid: christophe@tinyerp.com-20081120093228-yeph80d4cpr56fn1
---
 bin/addons/base/module/wizard/wizard_import_lang.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/addons/base/module/wizard/wizard_import_lang.py b/bin/addons/base/module/wizard/wizard_import_lang.py
index 27e5eff26d8..82b67ab2ae4 100644
--- a/bin/addons/base/module/wizard/wizard_import_lang.py
+++ b/bin/addons/base/module/wizard/wizard_import_lang.py
@@ -34,8 +34,10 @@ view_form="""<?xml version="1.0"?>
         <field name="name"/>
         <field name="code"/>
         <field name="data" colspan="3"/>
-        <label string="You have to import a .CSV file wich is encoded in UTF-8.\nPlease check that the first line of your file is:" colspan="4" align="0.0"/>
+        <label string="You have to import a .CSV file wich is encoded in UTF-8.\n
+Please check that the first line of your file is:" colspan="4" align="0.0"/>
         <label string="type,name,res_id,src,value" colspan="4"/>
+        <label string="You can also import .po files." colspan="4" align="0.0"/>
     </group>
 </form>"""
 

From ed2d3d58a3da0dbc290128bee00fdf8d253bcaa9 Mon Sep 17 00:00:00 2001
From: apa-tiny <patelamit2003@gmail.com>
Date: Thu, 20 Nov 2008 17:17:39 +0530
Subject: [PATCH 04/12] changes in print screen report-vir

bzr revid: patelamit2003@gmail.com-20081120114739-92bz2d6rnjcof8yr
---
 bin/addons/base/report/custom_new.xsl | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/bin/addons/base/report/custom_new.xsl b/bin/addons/base/report/custom_new.xsl
index 2788c4d2ed9..d9f815be0df 100644
--- a/bin/addons/base/report/custom_new.xsl
+++ b/bin/addons/base/report/custom_new.xsl
@@ -14,19 +14,21 @@
 
 	<xsl:template name="stylesheet">
 		<paraStyle name="title" fontName="Helvetica-Bold" fontSize="22" alignment="center"/>
-		
+
 		<blockTableStyle id="products">
-			<blockBackground colorName="grey" start="0,0" stop="-1,0"/>
+			<!--<blockBackground colorName="grey" start="0,0" stop="-1,0"/> -->
+			<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
 			<blockValign value="TOP"/>
 			 <blockAlignment value="RIGHT"/>
-			 <lineStyle kind="GRID" colorName="black"/>
+			 <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/>
+			<!-- <lineStyle kind="GRID" colorName="black"/> -->
 		</blockTableStyle>
 	</xsl:template>
 
 	<xsl:template name="story">
 		<xsl:apply-templates select="report"/>
 	</xsl:template>
-	
+
 	<xsl:template match="report">
 		<xsl:apply-templates select="config"/>
 		<!--<setNextTemplate name="other_pages"/>-->
@@ -36,7 +38,7 @@
 				 <xsl:value-of select="./config/tableSize"/>
 			</xsl:attribute>
 		</xsl:if>
-		
+
 		<xsl:apply-templates select="header"/>
 		<xsl:apply-templates select="lines"/>
 		</blockTable>
@@ -53,8 +55,8 @@
 		<tr>
 		<xsl:for-each select="field">
 			<td>
-			<para>
-			<xsl:value-of select="."/>
+			<para><font fontName="Helvetica-Bold" fontSize="9">
+			<xsl:value-of select="."/></font>
 			</para>
 			</td>
 		</xsl:for-each>
@@ -79,12 +81,16 @@
 						<xsl:when test="@tree='yes'">
 							<para>
 								<xsl:attribute name="leftIndent"><xsl:value-of select="@space"/></xsl:attribute>
+								<font fontName="Helvetica" fontSize="9">
 								<xsl:value-of select="."/>
+								</font>
 							</para>
 						</xsl:when>
 						<xsl:otherwise>
 							<para>
+								<font fontName="Helvetica" fontSize="9">
 								<xsl:value-of select="."/>
+								</font>
 							</para>
 						</xsl:otherwise>
 					</xsl:choose>

From 66f62129d60dad00de11e9d1253452840ea911a9 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <christophe@tinyerp.com>
Date: Thu, 20 Nov 2008 13:12:43 +0100
Subject: [PATCH 05/12] [FIX] error when getting zip module names

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

bzr revid: christophe@tinyerp.com-20081120121243-z94tvq1gztg5xkmr
---
 bin/addons/__init__.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index 6f9a3d85850..332bb6cc490 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -152,12 +152,15 @@ def get_module_resource(module, *args):
 def get_modules():
     """Returns the list of module names
     """
+    def listdir(dir):
+        def clean(name):
+            name = os.path.basename(name)
+            if name[-4:] == '.zip':
+                name = name[:-4]
+            return name
+        return map(clean, os.listdir(dir))
 
-    module_list = os.listdir(ad)
-    module_names = [os.path.basename(m) for m in module_list]
-    module_list += [m for m in os.listdir(_ad) if m not in module_names]
-
-    return module_list
+    return list(set(listdir(ad) + listdir(_ad)))
 
 def create_graph(module_list, force=None):
     if not force:
@@ -166,8 +169,6 @@ def create_graph(module_list, force=None):
     packages = []
 
     for module in module_list:
-        if module[-4:]=='.zip':
-            module = module[:-4]
         try:
             mod_path = get_module_path(module)
             if not mod_path:

From 746d472cc16d679fccc5d1c2b44231ffb850b517 Mon Sep 17 00:00:00 2001
From: Jay Vora <jvo@tinyerp.com>
Date: Thu, 20 Nov 2008 17:52:29 +0530
Subject: [PATCH 06/12] Mass Mailing wizard:Reverted the type of Message field
 to text_tag

bzr revid: jvo@tinyerp.com-20081120122229-yn90fb7w1tmvwo2c
---
 bin/addons/base/res/partner/wizard/wizard_spam.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/res/partner/wizard/wizard_spam.py b/bin/addons/base/res/partner/wizard/wizard_spam.py
index 52b70d29b1b..030283bbe44 100644
--- a/bin/addons/base/res/partner/wizard/wizard_spam.py
+++ b/bin/addons/base/res/partner/wizard/wizard_spam.py
@@ -36,7 +36,7 @@ email_send_form = '''<?xml version="1.0"?>
 email_send_fields = {
     'from': {'string':"Sender's email", 'type':'char', 'size':64, 'required':True},
     'subject': {'string':'Subject', 'type':'char', 'size':64, 'required':True},
-    'text': {'string':'Message', 'type':'text', 'required':True}
+    'text': {'string':'Message', 'type':'text_tag', 'required':True}
 }
 
 # this sends an email to ALL the addresses of the selected partners.

From b54f7619985953805ccdc7a154e6e8e0f862a978 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 20 Nov 2008 18:06:42 +0100
Subject: [PATCH 07/12] improvement_report

bzr revid: fp@tinyerp.com-20081120170642-0b356j36hjk93gac
---
 bin/addons/base/base_data.xml | 11 ++++++++---
 bin/report/report_sxw.py      |  2 +-
 bin/tools/misc.py             |  1 +
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/bin/addons/base/base_data.xml b/bin/addons/base/base_data.xml
index db9c548a9af..30b3464eb9a 100644
--- a/bin/addons/base/base_data.xml
+++ b/bin/addons/base/base_data.xml
@@ -220,10 +220,15 @@
             <field name="name">Costa Rica</field>
             <field name="code">cr</field>
         </record>
-        <record id="cs" model="res.country">
-            <field name="name">Serbia and Montenegro</field>
-            <field name="code">cs</field>
+        <record id="rs" model="res.country">
+            <field name="name">Serbia</field>
+            <field name="code">rs</field>
         </record>
+        <record id="me" model="res.country">
+            <field name="name">Montenegro</field>
+            <field name="code">me</field>
+        </record>
+
         <record id="cu" model="res.country">
             <field name="name">Cuba</field>
             <field name="code">cu</field>
diff --git a/bin/report/report_sxw.py b/bin/report/report_sxw.py
index 67f93fdb811..a776e4ee6c3 100644
--- a/bin/report/report_sxw.py
+++ b/bin/report/report_sxw.py
@@ -385,7 +385,7 @@ class rml_parse(object):
     def _eval(self, expr):
         try:
             res = eval(expr, self.localcontext)
-            if not res:
+            if (res is None) or (res=='') or (res is False):
                 res = ''
         except Exception,e:
             import traceback, sys
diff --git a/bin/tools/misc.py b/bin/tools/misc.py
index af765d58a7f..934bdd7a236 100644
--- a/bin/tools/misc.py
+++ b/bin/tools/misc.py
@@ -659,6 +659,7 @@ def get_languages():
         'ro_RO': 'Romanian',
         'ru_RU': 'Russian',
         'sv_SE': 'Swedish',
+        'ca_ES': 'Català',
     }
     return languages
 

From a101ca492b6015cb06cbeea98ca6e2c6a2aff6f9 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <christophe@tinyerp.com>
Date: Thu, 20 Nov 2008 18:16:29 +0100
Subject: [PATCH 08/12] [IMP] display the list of unmet dependencies

bzr revid: christophe@tinyerp.com-20081120171629-v30gaho2xopkpwuj
---
 bin/addons/__init__.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index 332bb6cc490..a5115deccc5 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -185,8 +185,9 @@ def create_graph(module_list, force=None):
                 raise
             if info.get('installable', True):
                 packages.append((module, info.get('depends', []), info))
-
-    current,later = Set([p for p, dep, data in packages]), Set()
+    
+    dependencies = dict([(p, deps) for p, deps, data in packages])
+    current, later = Set([p for p, dep, data in packages]), Set()
     while packages and current > later:
         package, deps, datas = packages[0]
 
@@ -207,9 +208,10 @@ def create_graph(module_list, force=None):
             later.add(package)
             packages.append((package, deps, datas))
         packages.pop(0)
-
+    
     for package in later:
-        logger.notifyChannel('init', netsvc.LOG_ERROR, 'addon:%s:Unmet dependency' % package)
+        unmet_deps = filter(lambda p: p not in graph, dependencies[package])
+        logger.notifyChannel('init', netsvc.LOG_ERROR, 'addon:%s:Unmet dependencies: %s' % (package, ', '.join(unmet_deps)))
 
     return graph
 

From 940da1038c33cec8ec814850d9990d5ec54404e0 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 21 Nov 2008 00:08:51 +0100
Subject: [PATCH 09/12] bugfix

bzr revid: fp@tinyerp.com-20081120230851-a7sew9y9rfs5vgvk
---
 bin/addons/base/module/report/ir_module_reference.rml    | 6 +++---
 .../base/module/report/ir_module_reference_print.py      | 9 ++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/bin/addons/base/module/report/ir_module_reference.rml b/bin/addons/base/module/report/ir_module_reference.rml
index e8237f0937d..472c8d7427c 100644
--- a/bin/addons/base/module/report/ir_module_reference.rml
+++ b/bin/addons/base/module/report/ir_module_reference.rml
@@ -136,7 +136,7 @@
           </td>
         </tr>
       </blockTable>
-      <para style="P6">[[ module.description ]]</para>
+      <para style="P6">[[ format(module.description or '') ]]</para>
       <section>
         <para style="Standard">[[ repeatIn(findobj(module.name) ,'object') ]]</para>
         <blockTable colWidths="510.0" repeatRows="1" style="Tableau3">
@@ -144,14 +144,14 @@
             <td>
               <para style="P10">Object: [[ object.model ]]</para>
               <para style="P11">Description : [[ object.name ]]</para>
-              <para style="P5">[[ objdoc(object.model) ]]</para>
+              <para style="P5">[[ format(objdoc(object.model)) ]]</para>
             </td>
           </tr>
         </blockTable>
         <blockTable colWidths="113.0,397.0" repeatRows="1" style="Tableau4">
           <tr>
             <td>
-              <para style="P7">[[ repeatIn(findflds(object.model), 'field') ]] [[ field[0] ]]</para>
+              <para style="P7">[[ repeatIn(findflds(object.model), 'field') ]] <i>[[ field[0] ]]</i></para>
             </td>
             <td>
               <para style="P8">[[ field[1].get('string', 'Unknown') ]], [[ field[1]['type'] ]] [[field[1].get('required',False) and ', required']] [[field[1].get('readonly',False) and ', readonly']] </para>
diff --git a/bin/addons/base/module/report/ir_module_reference_print.py b/bin/addons/base/module/report/ir_module_reference_print.py
index b5c3468a0b3..47235430eff 100644
--- a/bin/addons/base/module/report/ir_module_reference_print.py
+++ b/bin/addons/base/module/report/ir_module_reference_print.py
@@ -37,12 +37,11 @@ class ir_module_reference_print(report_sxw.rml_parse):
         return modobj.__doc__
 
     def _object_find(self, module):
+        ids2 = self.pool.get('ir.model.data').search(self.cr, self.uid, [('module','=',module), ('model','=','ir.model')])
+        ids = []
+        for mod in self.pool.get('ir.model.data').browse(self.cr, self.uid, ids2):
+            ids.append(mod.res_id)
         modobj = self.pool.get('ir.model')
-        if module=='base':
-            ids = modobj.search(self.cr, self.uid, [('model','=like','res%')])
-            ids += modobj.search(self.cr, self.uid, [('model','=like','ir%')])
-        else:
-            ids = modobj.search(self.cr, self.uid, [('model','=like',module+'%')])
         return modobj.browse(self.cr, self.uid, ids)
 
     def _fields_find(self, obj):

From 75e0a841d78edf8864fb172c82f830ead7bf2841 Mon Sep 17 00:00:00 2001
From: Jay Vora <jvo@tinyerp.com>
Date: Fri, 21 Nov 2008 14:06:24 +0530
Subject: [PATCH 10/12] Added the use of ref(xml_id) in act_window ,to be
 passed into context.Example:cci_crm:act_window:Open a New RSF

bzr revid: jvo@tinyerp.com-20081121083624-wt78ufuwmdpfvbsx
---
 bin/tools/convert.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/bin/tools/convert.py b/bin/tools/convert.py
index 557c1486516..7640f0dcce1 100644
--- a/bin/tools/convert.py
+++ b/bin/tools/convert.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution	
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
@@ -375,6 +375,14 @@ form: module.record_id""" % (xml_id,)
                 and rec.getAttribute('auto_refresh').encode('utf-8')
 #        groups_id = rec.hasAttribute('groups') and rec.getAttribute('groups').encode('utf-8')
 
+        # def ref() added because , if context has ref('id') eval wil use this ref
+
+#        active_id='active_id' # for further reference in client/bin/tools/__init__.py,not implemented yet.
+
+        def ref(str_id):
+            return self.id_get(cr, None, str_id)
+        context=eval(context)
+
         res = {
             'name': name,
             'type': type,
@@ -582,7 +590,7 @@ form: module.record_id""" % (xml_id,)
         rec_src = rec.getAttribute("search").encode('utf8')
         rec_src_count = rec.getAttribute("count")
 
-        severity = rec.getAttribute("severity").encode('ascii') or netsvc.LOG_ERROR 
+        severity = rec.getAttribute("severity").encode('ascii') or netsvc.LOG_ERROR
 
         rec_string = rec.getAttribute("string").encode('utf8') or 'unknown'
 

From 6db3d8bf54b09b92ebb2e371249951258256a410 Mon Sep 17 00:00:00 2001
From: Jay Vora <jvo@tinyerp.com>
Date: Fri, 21 Nov 2008 14:41:31 +0530
Subject: [PATCH 11/12] Added active_id usage for act_window's context

bzr revid: jvo@tinyerp.com-20081121091131-tfck9pxroymb2o4v
---
 bin/tools/convert.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/tools/convert.py b/bin/tools/convert.py
index 7640f0dcce1..f8207bcc585 100644
--- a/bin/tools/convert.py
+++ b/bin/tools/convert.py
@@ -377,7 +377,7 @@ form: module.record_id""" % (xml_id,)
 
         # def ref() added because , if context has ref('id') eval wil use this ref
 
-#        active_id='active_id' # for further reference in client/bin/tools/__init__.py,not implemented yet.
+        active_id=str("active_id") # for further reference in client/bin/tools/__init__.py
 
         def ref(str_id):
             return self.id_get(cr, None, str_id)

From 3e749e93cc3a470d520fdb76ea254a6f042c8641 Mon Sep 17 00:00:00 2001
From: "hda@tinyerp.com" <>
Date: Fri, 21 Nov 2008 17:00:22 +0530
Subject: [PATCH 12/12] added employee group as default in users

bzr revid: hda@tinyerp.com-20081121113022-08dt9x4t06htws3a
---
 bin/addons/base/res/res_user.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index 058233400da..a26e7ec6ede 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution	
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
@@ -138,6 +138,10 @@ class users(osv.osv):
         ids = self.pool.get('ir.actions.act_window').search(cr, uid, [('usage','=','menu')])
         return ids and ids[0] or False
 
+    def _get_group(self,cr, uid, context={}):
+        ids = self.pool.get('res.groups').search(cr, uid, [('name','=','Employee')])
+        return ids or False
+
     _defaults = {
         'password' : lambda obj,cr,uid,context={} : '',
         'context_lang': lambda *args: 'en_US',
@@ -145,6 +149,7 @@ class users(osv.osv):
         'menu_id': _get_menu,
         'action_id': _get_menu,
         'company_id': _get_company,
+        'groups_id': _get_group,
     }
     def company_get(self, cr, uid, uid2):
         company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id