From 09f8a07df60eb665921bea1544bfdf3e6aaaa44a Mon Sep 17 00:00:00 2001
From: Amit Mendapara <ame@tinyerp.com>
Date: Tue, 7 Oct 2008 15:22:52 +0530
Subject: [PATCH 01/12] Updated form view of ir_field

bzr revid: ame@tinyerp.com-20081007095252-eojj5w687f1l5p8d
---
 bin/addons/base/ir/ir.xml | 47 +++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 11358c788ce..3a9ed475901 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -714,33 +714,36 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Fields">
-                    <group colspan="4" col="6">
+                    <group colspan="4" col="4">
                         <field name="name" select="1"/>
-                        <field colspan="4" name="field_description" select="2"/>
                         <field name="model_id" readonly="1"/>
+                        <field colspan="4" name="field_description" select="2"/>
                     </group>
 
-                    <group colspan="2" col="2">
-                        <separator string="Field Type" colspan="2"/>
-                        <field name="ttype" select="2"/>
-                        <field name="relation" select="2"/>
-                        <field name="selection"/>
-                        <field name="size"/>
-                        <field name="state"/>
-                        <field name="domain"/>
-                    </group>
+                    <notebook>
+                        <page string="Properties">
+                            <group colspan="2" col="2">
+                                <field name="ttype" select="2"/>
+                                <field name="relation" select="2"/>
+                                <field name="selection"/>
+                                <field name="size"/>
+                                <field name="state"/>
+                                <field name="domain"/>
+                            </group>
 
-                    <group colspan="2" col="2">
-                        <separator string="Properties" colspan="2"/>
-                        <field name="required" select="2"/>
-                        <field name="readonly" select="2"/>
-                        <field name="select_level"/>
-                        <field name="translate"/>
-                        <field name="relate"/>
-                        <field name="on_delete"/>
-                    </group>
-                    <separator string="Security on Groups" colspan="4"/>
-                    <field name="groups" colspan="4" nolabel="1"/>
+                            <group colspan="2" col="2">
+                                <field name="required" select="2"/>
+                                <field name="readonly" select="2"/>
+                                <field name="select_level"/>
+                                <field name="translate"/>
+                                <field name="relate"/>
+                                <field name="on_delete"/>
+                            </group>
+                        </page>
+                        <page string="Security on Groups" colspan="4">
+                            <field name="groups" colspan="4" nolabel="1"/>
+                        </page>
+                    </notebook>
                 </form>
             </field>
         </record>

From 650cb5c5a682c926e5365ab9fb018e9355be2d35 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 7 Oct 2008 14:34:52 +0200
Subject: [PATCH 02/12] betterview

bzr revid: fp@tinyerp.com-20081007123452-fdd70egxzhifji3f
---
 addons/mrp/mrp_view.xml                                   | 3 +--
 addons/report_analytic_line/report_analytic_line_view.xml | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 189a36f2f2c..b14d62339f4 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -255,9 +255,8 @@
             <field name="field_parent">bom_lines</field>
             <field name="arch" type="xml">
                 <tree string="BoM Structure">
-                    <field name="name"/>
-                    <field name="code"/>
                     <field name="product_id"/>
+                    <field name="code"/>
                     <field name="product_qty"/>
                     <field name="product_uom"/>
                     <field name="date_start"/>
diff --git a/addons/report_analytic_line/report_analytic_line_view.xml b/addons/report_analytic_line/report_analytic_line_view.xml
index 90e31c99d93..f0f2311f703 100644
--- a/addons/report_analytic_line/report_analytic_line_view.xml
+++ b/addons/report_analytic_line/report_analytic_line_view.xml
@@ -57,9 +57,7 @@
             <field name="view_mode">tree,graph</field>
         </record>
         <menuitem action="action_account_analytic_line_to_invoice" id="account_analytic_lines_to_invoice_report" parent="account.next_id_42"/>
-        
-        <act_window domain="[('product_id', '=', active_id)]" id="act_product_product_2_report_acc_analytic_line_to_invoice" name="Analytic Lines to Invoice" res_model="report.account.analytic.line.to.invoice" src_model="product.product"/>
-        
+
         <act_window domain="[('account_id', '=', active_id),('invoice_id','=',False),('to_invoice','&lt;&gt;',False)]" id="act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice" name="Lines to Invoice" res_model="account.analytic.line" src_model="account.analytic.account"/>
         
     </data>

From de0e74fa4a69af6a20fe97ad674b3c42eea64cb6 Mon Sep 17 00:00:00 2001
From: apa-tiny <patelamit2003@gmail.com>
Date: Tue, 7 Oct 2008 18:06:55 +0530
Subject: [PATCH 03/12] third_party_ledger- Balance totals are not
 printed.--solved

bzr revid: patelamit2003@gmail.com-20081007123655-emo7emndg304m4t3
---
 addons/account/report/third_party_ledger.rml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/account/report/third_party_ledger.rml b/addons/account/report/third_party_ledger.rml
index b8967de5d2c..0bddb226e95 100755
--- a/addons/account/report/third_party_ledger.rml
+++ b/addons/account/report/third_party_ledger.rml
@@ -165,13 +165,13 @@
 	        	<para style="Balance">Balance brought forward</para>
 	        </td>
 	        <td>
-	        	<para style="P8"><u>[[ (sum_debit(data)) ]]</u></para>
+	        	<para style="P8"><u>[[ (sum_debit(data)) or '0.0' ]]</u></para>
 	        </td>
 	        <td>
-	        	<para style="P8"><u>[[ (sum_credit(data)) ]]</u></para>
+	        	<para style="P8"><u>[[ (sum_credit(data)) or '0.0' ]]</u></para>
 	        </td>
 	        <td>
-	        	<para style="P8"><u>[[ (sum_debit(data) - sum_credit(data)) ]]</u></para>
+	        	<para style="P8"><u>[[ (sum_debit(data) - sum_credit(data)) or '0.0' ]]</u></para>
 	        </td>
 	     </tr>
 	    </blockTable>
@@ -192,13 +192,13 @@
 			        <para style="total"></para>
 		        </td>
 		        <td>
-		            <para style="P9b"><u>[[ (sum_debit_partner(p,data)) ]]</u></para>
+		            <para style="P9b"><u>[[ (sum_debit_partner(p,data)) or '0.0' ]]</u></para>
 		        </td>
 		        <td>
-		            <para style="P9b"><u>[[ (sum_credit_partner(p,data)) ]]</u></para>
+		            <para style="P9b"><u>[[ (sum_credit_partner(p,data)) or '0.0' ]]</u></para>
 		        </td>
 		        <td>
-		            <para style="P9b"><u>[[ (sum_debit_partner(p,data) - sum_credit_partner(p,data)) ]]</u></para>
+		            <para style="P9b"><u>[[ (sum_debit_partner(p,data) - sum_credit_partner(p,data)) or '0.0' ]]</u></para>
 		        </td>
 		     </tr>
 		    </blockTable>

From 9420ba80afc930f798e576b99ae721157bd94ab9 Mon Sep 17 00:00:00 2001
From: qdp <qdp@tinyerp.com>
Date: Tue, 7 Oct 2008 14:51:22 +0200
Subject: [PATCH 04/12] *improvement and bugfixes

bzr revid: qdp@tinyerp.com-20081007125122-bcyr6lv1uxd36sp5
---
 addons/event/event.py                       | 18 ++++++++++--------
 addons/event/event_view.xml                 |  6 ++++--
 addons/event/wizard/confirm_registration.py |  3 +--
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 05b9033d488..407c86a4d93 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -203,18 +203,20 @@ class event_registration(osv.osv):
         return True
 
     def create(self, cr, uid, *args, **argv):
-        args[0]['section_id']= self.pool.get('event.event').browse(cr, uid, args[0]['event_id'], None).section_id.id
-        args[0]['date_deadline']= self.pool.get('event.event').browse(cr, uid, args[0]['event_id'], None).date_begin
-        args[0]['description']= self.pool.get('event.event').browse(cr, uid, args[0]['event_id'], None).mail_confirm
+        event = self.pool.get('event.event').browse(cr, uid, args[0]['event_id'], None)
+        args[0]['section_id']= event.section_id.id
+        args[0]['date_deadline']= event.date_begin
+        args[0]['description']= event.mail_confirm
         res = super(event_registration, self).create(cr, uid, *args, **argv)
         self._history(cr, uid,self.browse(cr, uid, [res]), 'Created', history=True)
         return res
 
     def write(self, cr, uid, *args, **argv):
         if 'event_id' in args[1]:
-            args[1]['section_id']= self.pool.get('event.event').browse(cr, uid, args[1]['event_id'], None).section_id.id
-            args[1]['date_deadline']= self.pool.get('event.event').browse(cr, uid, args[1]['event_id'], None).date_begin
-            args[1]['description']= self.pool.get('event.event').browse(cr, uid, args[1]['event_id'], None).mail_confirm
+            event = self.pool.get('event.event').browse(cr, uid, args[1]['event_id'], None)
+            args[1]['section_id']= event.section_id.id
+            args[1]['date_deadline']= event.date_begin
+            args[1]['description']= event.mail_confirm
         return super(event_registration, self).write(cr, uid, *args, **argv)
 
     def mail_user_confirm(self,cr,uid,ids):
@@ -242,7 +244,7 @@ class event_registration(osv.osv):
                     if reg_id.event_id.state in ['draft', 'fixed', 'open','confirm','running'] and reg_id.event_id.mail_auto_registr:
                         tools.email_send(src, dest,'Auto Registration: '+'['+str(reg_id.id)+']'+' '+reg_id.name, reg_id.event_id.mail_registr, tinycrm = str(reg_id.case_id.id))
                     if (reg_id.event_id.state in ['confirm','running']) and reg_id.event_id.mail_auto_confirm:
-                        tools.email_send(src, dest,'Auto Confirmation: '+'['+str(reg_id.id)+']'+' '+reg_id.name, reg_id.event_id.description, tinycrm = str(reg_id.case_id.id))
+                        tools.email_send(src, dest,'Auto Confirmation: '+'['+str(reg_id.id)+']'+' '+reg_id.name, reg_id.event_id.mail_confirm, tinycrm = str(reg_id.case_id.id))
                 if not src:
                     raise osv.except_osv(_('Error!'), _('You must define a reply-to address in order to mail the participant. You can do this in the Mailing tab of your event. Note that this is also the place where you can configure your event to not send emails automaticly while registering'))
         return False
@@ -309,7 +311,7 @@ class event_registration(osv.osv):
         return {'value':{'unit_price' : False,'invoice_label' : False}}
 
 
-    def onchange_partner_id(self, cr, uid, ids, part, event_id):
+    def onchange_partner_id(self, cr, uid, ids, part, event_id, email=False):
         data={}
         data['badge_partner'] = data['contact_id'] = data['partner_invoice_id'] = data['email_from'] = data['badge_title'] = data['badge_name'] = False
         if not part:
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index ff729ada1cd..708d99d3896 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -203,7 +203,10 @@
 					<group col="6" colspan="4">
 						<field name="event_id" select="1" on_change="onchange_event(event_id, partner_invoice_id)" domain="[('state','in',('draft','confirm'))]"/>
 						<field name="nb_register"/>
-						<field name="user_id" select="1"/>
+						<group colspan="2">
+							<field name="user_id" select="1"/>
+							<button name="remind_user" string="Send Reminder" states="open,pending" type="object" colspan="2"/>
+						</group>
 						<field name="partner_id" required="1" select="1" on_change="onchange_partner_id(partner_id,event_id)" />
 						<field name="partner_invoice_id" on_change="onchange_partner_invoice_id(event_id, partner_invoice_id)"/>
 						<field name="unit_price" select="2"/>
@@ -213,7 +216,6 @@
 						<field name="contact_id" select="2" on_change="onchange_contact_id(contact_id, partner_id)" /><newline/>
 						<field name="email_from" select="2"/>
 						<button name="remind_partner" string="Send Reminder" states="open,pending" type="object" colspan="2"/>
-						<button name="remind_user" string="Send Reminder" states="open,pending" type="object" colspan="2"/>
 						<newline/>
 						<separator string="Badge" colspan="4"/>
 						<field name="badge_title" select="2"/>
diff --git a/addons/event/wizard/confirm_registration.py b/addons/event/wizard/confirm_registration.py
index c1871e45c6a..dc327075ea2 100644
--- a/addons/event/wizard/confirm_registration.py
+++ b/addons/event/wizard/confirm_registration.py
@@ -45,7 +45,7 @@ def _confirm(self, cr, uid, data, context):
     current_registration = registration_obj.browse(cr, uid, [data['id']])[0]
 
     total_confirmed = current_registration.event_id.register_current + current_registration.nb_register
-    if total_confirmed <= current_registration.event_id.register_max:
+    if total_confirmed <= current_registration.event_id.register_max or current_registration.event_id.register_max == 0:
         return 'confirm'
     return 'split'
 
@@ -53,7 +53,6 @@ def _confirm(self, cr, uid, data, context):
 def _check_confirm(self, cr, uid, data, context):
     registration_obj = pooler.get_pool(cr.dbname).get('event.registration')
     registration_obj.write(cr, uid, [data['id']], {'state':'open',})
-    reg = registration_obj.browse(cr, uid, [data['id']])
     registration_obj._history(cr, uid, reg, 'Open', history=True)
     registration_obj.mail_user(cr,uid,[data['id']])
     return {}

From 17fa5c7a07027562e9b513b51f5a70032ceba29c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 7 Oct 2008 15:28:51 +0200
Subject: [PATCH 05/12] Improved User View

bzr revid: fp@tinyerp.com-20081007132851-b6opi13860l8o6mo
---
 bin/addons/base/base_data.xml   |  9 ++++-----
 bin/addons/base/base_update.xml | 32 ++++++++++++++++++++++----------
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/bin/addons/base/base_data.xml b/bin/addons/base/base_data.xml
index 9073be04ed5..db9c548a9af 100644
--- a/bin/addons/base/base_data.xml
+++ b/bin/addons/base/base_data.xml
@@ -12,7 +12,6 @@
             </field>
             <field name="field_parent">child_id</field>
         </record>
-        
         <record id="action_menu_admin" model="ir.actions.act_window">
             <field name="name">Menu</field>
             <field name="usage">menu</field>
@@ -22,13 +21,13 @@
             <field name="view_type">tree</field>
             <field eval="'[(\'parent_id\',\'=\',False)]'" name="domain"/>
         </record>
-        
+
         <record id="lang_en" model="res.lang">
             <field name="code">en_US</field>
-			<field name="name">English</field>
-			<field name="translatable">True</field>
+            <field name="name">English</field>
+            <field name="translatable">True</field>
         </record>
-        
+
         <record id="ad" model="res.country">
             <field name="name">Andorra, Principality of</field>
             <field name="code">ad</field>
diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index b16fb508ecb..94e37dfd8cb 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -182,18 +182,30 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Configure User">
-                    <separator col="4" colspan="4" string="Define a New User"/>
+                    <separator string="Define New Users" colspan="4"/>
                     <field name="name" select="1"/>
-                    <newline/>
+                    <field name="active" select="1"/>
                     <field name="login" select="1"/>
-                    <newline/>
-                    <field name="password" required="1" password="True" />
-                    <field colspan="4" name="signature"/>
-                    <separator string="Assign Groups to Define Access Rights" colspan="4"/>
-                    <field colspan="4" name="groups_id" nolabel="1"/>
-                    <separator string="" colspan="4"/>
-                    <label string="" colspan="1"/>
-                    <group col="3" colspan="2">
+                    <field name="password" password="True"/>
+                    <notebook colspan="4">
+                        <page string="User">
+                            <field name="address_id"/>
+                            <field name="company_id" required="1"/>
+                            <field name="action_id" required="True"/>
+                            <field domain="[('usage','=','menu')]" name="menu_id" required="True"/>
+                            <field name="context_lang"/>
+                            <field name="context_tz"/>
+                            <field colspan="4" name="signature"/>
+                        </page>
+                        <page string="Groups">
+                            <field colspan="4" nolabel="1" name="groups_id"/>
+                        </page>
+                        <page string="Roles">
+                            <field colspan="4" nolabel="1" name="roles_id"/>
+                        </page>
+                    </notebook>
+                    <label string="" colspan="2"/>
+                    <group col="2" colspan="2">
                         <button icon='gtk-cancel' special="cancel" name="action_next" type='object' string='Close'/>
                         <button name='action_new' icon='gtk-ok' type='object' string='Add User'/>
                     </group>

From 8379882d99096d3a65d83600be8c713c03902a58 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <christophe@tinyerp.com>
Date: Tue, 7 Oct 2008 16:11:34 +0200
Subject: [PATCH 06/12] fix bug occuring in module update

bzr revid: christophe@tinyerp.com-20081007141134-b6urv2dy7riex3j8
---
 addons/account_analytic_analysis/account_analytic_analysis.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 212cdbbe8d4..15db30b6a4b 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -638,7 +638,8 @@ class account_analytic_account_summary_month(osv.osv):
         'month': fields.char('Month', size=25, readonly=True),
     }
     def init(self, cr):
-        cr.execute('CREATE OR REPLACE VIEW account_analytic_analysis_summary_month AS (' \
+        cr.execute('DROP VIEW IF EXISTS account_analytic_analysis_summary_month')
+        cr.execute('CREATE VIEW account_analytic_analysis_summary_month AS (' \
                 'SELECT ' \
                     '(TO_NUMBER(TO_CHAR(d.month, \'YYYYMM\'), \'999999\') + (d.account_id  * 1000000))::integer AS id, ' \
                     'd.account_id AS account_id, ' \

From bc0fe1d26534e7ebf553938af219effaa3b502b5 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <christophe@tinyerp.com>
Date: Tue, 7 Oct 2008 16:13:26 +0200
Subject: [PATCH 07/12] set security on audittrail module

bzr revid: christophe@tinyerp.com-20081007141326-64yjery59ftkpkwm
---
 addons/audittrail/__terp__.py                      |  5 ++++-
 addons/audittrail/security/audittrail_security.xml | 10 ++++++++++
 addons/audittrail/security/ir.model.access.csv     |  4 ++++
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 addons/audittrail/security/audittrail_security.xml
 create mode 100644 addons/audittrail/security/ir.model.access.csv

diff --git a/addons/audittrail/__terp__.py b/addons/audittrail/__terp__.py
index a91f827cb73..08249693e48 100644
--- a/addons/audittrail/__terp__.py
+++ b/addons/audittrail/__terp__.py
@@ -11,7 +11,10 @@
     "init_xml" : [],
     "description": "Allows the administrator to track every user operations on all objects of the system.",
     "category" : "Generic Modules/Others",
-    "update_xml" : ["audittrail_view.xml"],
+    "update_xml" : ["audittrail_view.xml", 
+                    "security/ir.model.access.csv",
+                    "security/audittrail_security.xml",
+                   ],
     "demo_xml" : ["audittrail_demo.xml"],
     "active" : False,
     "installable": True
diff --git a/addons/audittrail/security/audittrail_security.xml b/addons/audittrail/security/audittrail_security.xml
new file mode 100644
index 00000000000..8b1f17aa939
--- /dev/null
+++ b/addons/audittrail/security/audittrail_security.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<openerp>
+	<data noupdate="0">
+		<!-- Set access to menu -->
+		<record id="menu_action_audittrail" model="ir.ui.menu">
+			<field eval="[(6,0,[ref('base.group_system')])]" name="groups_id"/>
+		</record>
+	</data>
+</openerp>
+
diff --git a/addons/audittrail/security/ir.model.access.csv b/addons/audittrail/security/ir.model.access.csv
new file mode 100644
index 00000000000..90895f202c4
--- /dev/null
+++ b/addons/audittrail/security/ir.model.access.csv
@@ -0,0 +1,4 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_audittrail_rule_group_system","audittrail rule system","model_audittrail_rule","base.group_system",1,1,1,1
+"access_audittrail_log_group_system","audittrail log system","model_audittrail_log","base.group_system",1,1,1,1
+"access_audittrail_logline_group_system","audittrail log line system","model_audittrail_log_line","base.group_system",1,1,1,1

From f565d96c7770dbac98b5822e8c01cb959818d9c7 Mon Sep 17 00:00:00 2001
From: Olivier Laurent <olt@tinyerp.com>
Date: Tue, 7 Oct 2008 16:19:11 +0200
Subject: [PATCH 08/12] pep8

bzr revid: olt@tinyerp.com-20081007141911-y534o95uoc8qu5jt
---
 bin/osv/fields.py | 108 +++++++++++++++++++++++-----------------------
 1 file changed, 55 insertions(+), 53 deletions(-)

diff --git a/bin/osv/fields.py b/bin/osv/fields.py
index b3baa648b0b..f655ca01d8b 100644
--- a/bin/osv/fields.py
+++ b/bin/osv/fields.py
@@ -230,6 +230,7 @@ class binary(_column):
 
     get = get_memory
 
+
 class selection(_column):
     _type = 'selection'
 
@@ -331,7 +332,7 @@ class many2one(_column):
             context = {}
         obj = obj_src.pool.get(self._obj)
         self._table = obj_src.pool.get(self._obj)._table
-        if type(values)==type([]):
+        if type(values) == type([]):
             for act in values:
                 if act[0] == 0:
                     id_new = obj.create(cr, act[2])
@@ -495,7 +496,7 @@ class many2many(_column):
 
         d1, d2 = obj.pool.get('ir.rule').domain_get(cr, user, obj._name)
         if d1:
-            d1 = ' and '+d1
+            d1 = ' and ' + d1
 
         cr.execute('SELECT '+self._rel+'.'+self._id2+','+self._rel+'.'+self._id1+' \
                 FROM '+self._rel+' , '+obj._table+' \
@@ -531,7 +532,7 @@ class many2many(_column):
 
                 d1, d2 = obj.pool.get('ir.rule').domain_get(cr, user, obj._name)
                 if d1:
-                    d1 = ' and '+d1
+                    d1 = ' and ' + d1
                 cr.execute('delete from '+self._rel+' where '+self._id1+'=%d AND '+self._id2+' IN (SELECT '+self._rel+'.'+self._id2+' FROM '+self._rel+', '+obj._table+' WHERE '+self._rel+'.'+self._id1+'=%d AND '+self._rel+'.'+self._id2+' = '+obj._table+'.id '+ d1 +')', [id, id]+d2)
 
                 for act_nbr in act[2]:
@@ -638,92 +639,93 @@ class function(_column):
 class related(function):
 
     def _fnct_search(self, tobj, cr, uid, obj=None, name=None, context=None):
-        where_flag=0
-        where=" where"
-        query = "select %s.id from %s"%(obj._table,obj._table)
-        relation_child=obj._name
-        relation=obj._name
+        where_flag = 0
+        where = " where"
+        query = "select %s.id from %s" % (obj._table, obj._table)
+        relation_child = obj._name
+        relation = obj._name
         for i in range(len(self._arg)):
-            field_detail=self._field_get(cr,uid,obj,relation,self._arg[i])
-            relation=field_detail[0]
-            if field_detail[1] in ('one2many','many2many'):
-                obj_child=obj.pool.get(field_detail[2][self._arg[i]]['relation'])
-                field_detail_child=obj_child.fields_get(cr,uid,)
+            field_detail = self._field_get(cr, uid, obj, relation, self._arg[i])
+            relation = field_detail[0]
+            if field_detail[1] in ('one2many', 'many2many'):
+                obj_child = obj.pool.get(field_detail[2][self._arg[i]]['relation'])
+                field_detail_child = obj_child.fields_get(cr, uid,)
 
-                fields_filter = dict(filter(lambda x:x[1].get('relation',False)
+                fields_filter = dict(filter(lambda x: x[1].get('relation', False)
                                        and x[1].get('relation') == relation_child
-                                       and x[1].get('type')=='many2one',field_detail_child.items()))
-                query +=" inner join %s on %s.id = %s.%s"%(obj_child._table,obj._table,obj_child._table,fields_filter.keys()[0])
-                relation_child=relation
+                                       and x[1].get('type')=='many2one', field_detail_child.items()))
+                query += " inner join %s on %s.id = %s.%s" % (obj_child._table, obj._table, obj_child._table, fields_filter.keys()[0])
+                relation_child = relation
             elif field_detail[1] in ('many2one'):
-                obj_child=obj.pool.get(field_detail[2][self._arg[i]]['relation'])
-                obj_child2=obj.pool.get(relation_child)
-                if obj_child._name==obj_child2._name:
+                obj_child = obj.pool.get(field_detail[2][self._arg[i]]['relation'])
+                obj_child2 = obj.pool.get(relation_child)
+                if obj_child._name == obj_child2._name:
 #                     select res_partner.id from res_partner where res_partner.parent_id in(select id from res_partner where res_partner.date >= '2008-10-01');
 #                    where +=" %s.id = %s.%s in (select id from %s where %s.%s %s %s"%(obj_child._table,obj_child2._table,self._arg[i])
                     pass
                 else:
-                    query +=" inner join %s on %s.id = %s.%s"%(obj_child._table,obj_child._table,obj_child2._table,self._arg[i])
-                relation_child=field_detail[0]
+                    query += " inner join %s on %s.id = %s.%s" % (obj_child._table, obj_child._table, obj_child2._table, self._arg[i])
+                relation_child = field_detail[0]
                 if i == (len(self._arg)-1):
                     if obj_child._inherits:
-                        obj_child_inherits=obj.pool.get(obj_child._inherits.keys()[0])
-                        query +=" inner join %s on %s.id = %s.%s"%(obj_child_inherits._table,obj_child_inherits._table,obj_child._table,obj_child._inherits.values()[0])
-                        obj_child=obj_child_inherits
-                    where +=" %s.%s %s '%%%s%%' and"%(obj_child._table,obj_child._rec_name,context[0][1],context[0][2])
+                        obj_child_inherits = obj.pool.get(obj_child._inherits.keys()[0])
+                        query += " inner join %s on %s.id = %s.%s" % (obj_child_inherits._table, obj_child_inherits._table, obj_child._table, obj_child._inherits.values()[0])
+                        obj_child = obj_child_inherits
+                    where += " %s.%s %s '%%%s%%' and" % (obj_child._table, obj_child._rec_name, context[0][1], context[0][2])
             else:
-                obj_child=obj.pool.get(relation_child)
+                obj_child = obj.pool.get(relation_child)
                 if field_detail[1] in ('char'):
-                    where +=" %s.%s %s '%%%s%%' and"%(obj_child._table,self._arg[i],context[0][1],context[0][2])
+                    where += " %s.%s %s '%%%s%%' and" % (obj_child._table, self._arg[i], context[0][1], context[0][2])
                 if field_detail[1] in ('date'):
-                    where +=" %s.%s %s '%s' and"%(obj_child._table,self._arg[i],context[0][1],context[0][2])
-                if field_detail[1] in ['integer','long','float']:
-                    where +=" %s.%s %s '%d' and"%(obj_child._table,self._arg[i],context[0][1],context[0][2])
-        query+=where.rstrip('and')
+                    where += " %s.%s %s '%s' and" % (obj_child._table, self._arg[i], context[0][1], context[0][2])
+                if field_detail[1] in ['integer', 'long', 'float']:
+                    where += " %s.%s %s '%d' and" % (obj_child._table, self._arg[i], context[0][1], context[0][2])
+        query += where.rstrip('and')
         cr.execute(query)
-        ids=[]
+        ids = []
         for id in cr.fetchall():
             ids.append(id[0])
-        return [('id','in',ids)]
+        return [('id', 'in', ids)]
 
 #    def _fnct_write(self,obj,cr, uid, ids,values, field_name, args, context=None):
 #        raise 'Not Implemented Yet'
 
-    def _fnct_read(self,obj,cr, uid, ids, field_name, args, context=None):
+    def _fnct_read(self, obj, cr, uid, ids, field_name, args, context=None):
         if not ids: return {}
-        relation=obj._name
-        res={}
-        objlst = obj.browse(cr,uid,ids)
+        relation = obj._name
+        res = {}
+        objlst = obj.browse(cr, uid, ids)
         for data in objlst:
-            t_data=data
-            relation=obj._name
+            t_data = data
+            relation = obj._name
             for i in range(len(self.arg)):
-                field_detail=self._field_get(cr,uid,obj,relation,self.arg[i])
-                relation=field_detail[0]
+                field_detail = self._field_get(cr, uid, obj, relation, self.arg[i])
+                relation = field_detail[0]
                 if not t_data[self.arg[i]]:
                     t_data = False
                     break
-                if field_detail[1] in ('one2many','many2many'):
-                    t_data=t_data[self.arg[i]][0]
+                if field_detail[1] in ('one2many', 'many2many'):
+                    t_data = t_data[self.arg[i]][0]
                 else:
-                    t_data=t_data[self.arg[i]]
+                    t_data = t_data[self.arg[i]]
             if type(t_data) == type(objlst[0]):
-                res[data.id]=t_data.id
+                res[data.id] = t_data.id
             else:
-                res[data.id]=t_data
+                res[data.id] = t_data
         return res
 
-    def __init__(self,*arg,**args):
+    def __init__(self, *arg, **args):
         self.arg = arg
-        super(related, self).__init__(self._fnct_read, arg, fnct_inv_arg=arg,method=True, fnct_search=self._fnct_search,**args)
+        super(related, self).__init__(self._fnct_read, arg, fnct_inv_arg=arg, method=True, fnct_search=self._fnct_search, **args)
 
     # TODO: call field_get on the object, not in the DB
     def _field_get(self, cr, uid, obj, model_name, prop):
-        fields=obj.pool.get(model_name).fields_get(cr,uid,)
-        if fields.get(prop,False):
-            return(fields[prop].get('relation',False),fields[prop].get('type',False),fields)
+        fields = obj.pool.get(model_name).fields_get(cr, uid,)
+        if fields.get(prop, False):
+            return(fields[prop].get('relation', False), fields[prop].get('type', False), fields)
         else:
-            raise 'Field %s not exist in %s'%(prop,model_name)
+            raise 'Field %s not exist in %s' % (prop, model_name)
+
 
 # ---------------------------------------------------------
 # Serialized fields

From 00faaadc2e68267e18efa939fffb156044482e70 Mon Sep 17 00:00:00 2001
From: Olivier Laurent <olt@tinyerp.com>
Date: Tue, 7 Oct 2008 16:51:30 +0200
Subject: [PATCH 09/12] pep8

bzr revid: olt@tinyerp.com-20081007145130-qmmogf0zbxirjv4m
---
 bin/osv/expression.py | 28 ++++++++++++++--------------
 bin/osv/osv.py        | 26 ++++++++++++++++----------
 2 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/bin/osv/expression.py b/bin/osv/expression.py
index 44658f33b96..1e21443d7ab 100644
--- a/bin/osv/expression.py
+++ b/bin/osv/expression.py
@@ -59,8 +59,8 @@ class expression(object):
                 doms = []
                 for o in table.browse(cr, uid, ids, context=context):
                     if doms:
-                        doms.insert(0,'|')
-                    doms += ['&',('parent_left','<',o.parent_right),('parent_left','>=',o.parent_left)]
+                        doms.insert(0, '|')
+                    doms += ['&', ('parent_left', '<', o.parent_right), ('parent_left', '>=', o.parent_left)]
                 if prefix:
                     return [(left, 'in', table.search(cr, uid, doms, context=context))]
                 return doms
@@ -69,14 +69,14 @@ class expression(object):
                     if not ids:
                         return []
                     ids2 = table.search(cr, uid, [(parent, 'in', ids)], context=context)
-                    return ids+rg(ids2, table, parent)
+                    return ids + rg(ids2, table, parent)
                 return [(left, 'in', rg(ids, table, parent))]
 
         self.__main_table = table
 
         i = -1
-        while i+1<len(self.__exp):
-            i+=1
+        while i + 1<len(self.__exp):
+            i += 1
             e = self.__exp[i]
             if self._is_operator(e) or e == self.__DUMMY_LEAF:
                 continue
@@ -114,19 +114,19 @@ class expression(object):
                         self.__exp[i] = self.__DUMMY_LEAF
                     else:
                         subexp = field.search(cr, uid, table, left, [self.__exp[i]])
-                        # we assume that the expression is valid 
+                        # we assume that the expression is valid
                         # we create a dummy leaf for forcing the parsing of the resulting expression
                         self.__exp[i] = '&'
                         self.__exp.insert(i + 1, self.__DUMMY_LEAF)
                         for j, se in enumerate(subexp):
                             self.__exp.insert(i + 2 + j, se)
-                
+
                 # else, the value of the field is store in the database, so we search on it
 
 
             elif field._type == 'one2many':
                 if isinstance(right, basestring):
-                    ids2 = [x[0] for x in field_obj.name_search(cr, uid, right, [], operator,limit=None)]
+                    ids2 = [x[0] for x in field_obj.name_search(cr, uid, right, [], operator, limit=None)]
                 else:
                     ids2 = list(right)
                 if not ids2:
@@ -138,7 +138,7 @@ class expression(object):
                 #FIXME
                 if operator == 'child_of':
                     if isinstance(right, basestring):
-                        ids2 = [x[0] for x in field_obj.name_search(cr, uid, right, [], 'like',limit=None)]
+                        ids2 = [x[0] for x in field_obj.name_search(cr, uid, right, [], 'like', limit=None)]
                     else:
                         ids2 = list(right)
 
@@ -146,7 +146,7 @@ class expression(object):
                         if field_obj == table:
                             return ids
                         return self.__execute_recursive_in(cr, field._id1, field._rel, field._id2, ids)
-                    
+
                     dom = _rec_get(ids2, field_obj, working_table._parent_name)
                     ids2 = field_obj.search(cr, uid, dom, context=context)
                     self.__exp[i] = ('id', 'in', _rec_convert(ids2))
@@ -159,7 +159,7 @@ class expression(object):
             elif field._type == 'many2one':
                 if operator == 'child_of':
                     if isinstance(right, basestring):
-                        ids2 = [x[0] for x in field_obj.name_search(cr, uid, right, [], 'like',limit=None)]
+                        ids2 = [x[0] for x in field_obj.name_search(cr, uid, right, [], 'like', limit=None)]
                     else:
                         ids2 = list(right)
 
@@ -171,7 +171,7 @@ class expression(object):
                     self.__exp = self.__exp[:i] + dom + self.__exp[i+1:]
                 else:
                     if isinstance(right, basestring):
-                        res_ids = field_obj.name_search(cr, uid, right, [], operator,limit=None)
+                        res_ids = field_obj.name_search(cr, uid, right, [], operator, limit=None)
                         right = map(lambda x: x[0], res_ids)
                         self.__exp[i] = (left, 'in', right)
             else:
@@ -204,7 +204,7 @@ class expression(object):
 
     def __leaf_to_sql(self, leaf, table):
         if leaf == self.__DUMMY_LEAF:
-            return ('(1=1)',[])
+            return ('(1=1)', [])
         left, operator, right = leaf
 
         if operator == 'inselect':
@@ -288,7 +288,7 @@ class expression(object):
                     q1 = stack.pop()
                     q2 = stack.pop()
                     stack.append('(%s %s %s)' % (q1, ops[e], q2,))
-        
+
         query = ' AND '.join(reversed(stack))
         joins = ' AND '.join(map(lambda j: j[0], self.__joins))
         if joins:
diff --git a/bin/osv/osv.py b/bin/osv/osv.py
index 6f883444fef..ecc8f5af27f 100644
--- a/bin/osv/osv.py
+++ b/bin/osv/osv.py
@@ -45,12 +45,14 @@ module_list = []
 module_class_list = {}
 class_pool = {}
 
+
 class except_osv(Exception):
     def __init__(self, name, value, exc_type='warning'):
         self.name = name
         self.exc_type = exc_type
         self.value = value
-        self.args = (exc_type,name)
+        self.args = (exc_type, name)
+
 
 class osv_pool(netsvc.Service):
 
@@ -71,9 +73,9 @@ class osv_pool(netsvc.Service):
         self.exportMethod(self.execute_cr)
 
     def init_set(self, cr, mode):
-        if mode<>self._init:
+        if mode <> self._init:
             if mode:
-                self._init_parent={}
+                self._init_parent = {}
             if not mode:
                 for o in self._init_parent:
                     self.get(o)._parent_store_compute(cr)
@@ -87,7 +89,7 @@ class osv_pool(netsvc.Service):
             if not object:
                 self.abortResponse(1, 'Object Error', 'warning',
                 'Object %s doesn\'t exist' % str(obj))
-            return getattr(object,method)(cr, uid, *args, **kw)
+            return getattr(object, method)(cr, uid, *args, **kw)
         except orm.except_orm, inst:
             self.abortResponse(1, inst.name, 'warning', inst.value)
         except except_osv, inst:
@@ -147,7 +149,7 @@ class osv_pool(netsvc.Service):
     # adds a new object instance to the object pool.
     # if it already existed, the instance is replaced
     def add(self, name, obj_inst):
-        if self.obj_pool.has_key(name):
+        if name in self.obj_pool:
             del self.obj_pool[name]
         self.obj_pool[name] = obj_inst
 
@@ -171,6 +173,7 @@ class osv_pool(netsvc.Service):
             res.append(klass.createInstance(self, module, cr))
         return res
 
+
 class osv_memory(orm.orm_memory):
     #__metaclass__ = inheritor
     def __new__(cls):
@@ -190,7 +193,7 @@ class osv_memory(orm.orm_memory):
     #       put objects in the pool var
     #
     def createInstance(cls, pool, module, cr):
-        name = hasattr(cls,'_name') and cls._name or cls._inherit
+        name = hasattr(cls, '_name') and cls._name or cls._inherit
         parent_name = hasattr(cls, '_inherit') and cls._inherit
         if parent_name:
             print 'Inherit not supported in osv_memory object !'
@@ -237,7 +240,7 @@ class osv(orm.orm):
                 else:
                     new.extend(cls.__dict__.get(s, []))
                 nattr[s] = new
-            name = hasattr(cls,'_name') and cls._name or cls._inherit
+            name = hasattr(cls, '_name') and cls._name or cls._inherit
             cls = type(name, (cls, parent_class), nattr)
         obj = object.__new__(cls)
         obj.__init__(pool, cr)
@@ -249,6 +252,7 @@ class osv(orm.orm):
         self.pool = pool
         orm.orm.__init__(self, cr)
 
+
 class Cacheable(object):
 
     _cache = UpdateableDict()
@@ -270,6 +274,7 @@ class Cacheable(object):
         self._cache.clear()
         self._items = []
 
+
 def filter_dict(d, fields):
     res = {}
     for f in fields + ['id']:
@@ -277,6 +282,7 @@ def filter_dict(d, fields):
             res[f] = d[f]
     return res
 
+
 class cacheable_osv(osv, Cacheable):
 
     _relevant = ['lang']
@@ -286,9 +292,9 @@ class cacheable_osv(osv, Cacheable):
 
     def read(self, cr, user, ids, fields=None, context=None, load='_classic_read'):
         if not fields:
-            fields=[]
+            fields = []
         if not context:
-            context={}
+            context = {}
         fields = fields or self._columns.keys()
         ctx = [context.get(x, False) for x in self._relevant]
         result, tofetch = [], []
@@ -330,7 +336,7 @@ class cacheable_osv(osv, Cacheable):
 
     def write(self, cr, user, ids, values, context=None):
         if not context:
-            context={}
+            context = {}
         for id in ids:
             self.invalidate((self._name, id))
         return super(cacheable_osv, self).write(cr, user, ids, values, context)

From cf9fa4629d4a45b914a6e2decf6ce18df1646c12 Mon Sep 17 00:00:00 2001
From: qdp <qdp@tinyerp.com>
Date: Tue, 7 Oct 2008 17:06:40 +0200
Subject: [PATCH 10/12] *bugfix

bzr revid: qdp@tinyerp.com-20081007150640-kuue7phau5gmwit1
---
 addons/base_contact/base_contact_view.xml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index 182a6e862bc..817135a8571 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -75,17 +75,6 @@
 
 
     <!-- Views for Partners -->
-    <record model="ir.ui.view" id="view_partner_tree_inherited1">
-        <field name="name">Partner tree inherited</field>
-        <field name="model">res.partner</field>
-        <field name="inherit_id" ref="base.view_partner_tree"/>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <field name="address" position="replace">
-                <field name='address' string='# of Addresses'/>
-            </field>
-        </field>
-    </record>
 
     <record model="ir.ui.view" id="view_partner_form_inherit">
         <field name="name">Partner form inherited</field>

From e926aa339079f081cf4d3bfa4f10fbfe703e896d Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 7 Oct 2008 22:04:23 +0200
Subject: [PATCH 11/12] improvement in view

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

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 5ae50b2f539..4aaa2ece59f 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -52,7 +52,7 @@
         <field name="type">tree</field>
         <field name="field_parent">child_ids</field>
         <field name="arch" type="xml">
-            <tree string="Directories">
+            <tree string="Directories" toolbar="1">
                 <field name="name"/>
                 <field name="type"/>
                 <field name="user_id"/>

From 7725c67a76aa869ce4f35d421af2fdfddb7ab609 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@tinyerp.com>
Date: Wed, 8 Oct 2008 10:59:16 +0530
Subject: [PATCH 12/12] event bug fix

bzr revid: mra@tinyerp.com-20081008052916-6cnvyt3ao9alfznl
---
 addons/event/event.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 407c86a4d93..ffddaa8574d 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -137,7 +137,7 @@ class event(osv.osv):
         #change the description of the registration linked to this event
         if 'mail_auto_confirm' in vals:
             if vals['mail_auto_confirm']:
-                if 'mail_confirm' not in vals: 
+                if 'mail_confirm' not in vals:
                     for eve in self.browse(cr, uid, ids):
                         vals['mail_confirm'] = eve.mail_confirm
             else:
@@ -288,8 +288,9 @@ class event_registration(osv.osv):
         data['badge_title'] = contact_id.title
         if partner:
             partner_addresses = self.pool.get('res.partner.address').search(cr, uid, [('partner_id','=',partner)])
-            job_id = self.pool.get('res.partner.job').search(cr, uid, [('contact_id','=',contact),('address_id','in',partner_addresses)])[0]
-            data['email_from'] = self.pool.get('res.partner.job').browse(cr, uid, job_id).email
+            job_ids = self.pool.get('res.partner.job').search(cr, uid, [('contact_id','=',contact),('address_id','in',partner_addresses)])
+            if job_ids:
+                data['email_from'] = self.pool.get('res.partner.job').browse(cr, uid, job_ids[0]).email
         d = self.onchange_badge_name(cr, uid, ids,data['badge_name'])
         data.update(d['value'])