From 784867992a3620ad3a8ef707a2fe2ddb84aace49 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 26 Nov 2008 22:30:04 +0100
Subject: [PATCH 01/12] improvement

bzr revid: fp@tinyerp.com-20081126213004-jwue5h2fgbzjbumm
---
 bin/addons/base/maintenance/maintenance.py    | 14 +++++-----
 .../base/maintenance/maintenance_view.xml     | 28 ++++++++++++++++---
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/bin/addons/base/maintenance/maintenance.py b/bin/addons/base/maintenance/maintenance.py
index 589bd18354c..98c42cc47f9 100755
--- a/bin/addons/base/maintenance/maintenance.py
+++ b/bin/addons/base/maintenance/maintenance.py
@@ -40,15 +40,15 @@ class maintenance_contract(osv.osv):
     _name = "maintenance.contract"
     _description = "Maintenance Contract"
     _columns = {
-    'name' : fields.char('Name', size=256),
-    'contract_date' : fields.date('Date'),
-    'password' : fields.char('password', size=64, invisible=True),
-        }
-
+        'name' : fields.char('Contract ID', size=256, required=True),
+        'password' : fields.char('password', size=64, invisible=True, required=True),
+        'date_start' : fields.date('Starting Date', readonly=True),
+        'date_stop' : fields.date('Ending Date', readonly=True),
+        'modules': fields.text('Covered Modules')
+    }
     _defaults = {
         'password' : lambda obj,cr,uid,context={} : '',
-        'contract_date':lambda *a: time.strftime('%Y-%m-%d'),
-              }
+    }
     def _test_maintenance(self, cr, uid, ids, context):
         remote_db='trunk'
         remote_server='localhost'
diff --git a/bin/addons/base/maintenance/maintenance_view.xml b/bin/addons/base/maintenance/maintenance_view.xml
index 3122e8c3bf6..81af7270f71 100755
--- a/bin/addons/base/maintenance/maintenance_view.xml
+++ b/bin/addons/base/maintenance/maintenance_view.xml
@@ -9,7 +9,8 @@
             <field name="arch" type="xml">
                 <tree string="Maintenance Contract">
                     <field name="name"/>
-                    <field name="contract_date"/>
+                    <field name="date_start"/>
+                    <field name="date_stop"/>
                 </tree>
             </field>
         </record>
@@ -20,22 +21,41 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Maintenance Contract">
+                    <separator string="Information" colspan="4"/>
                     <field name="name" select="1"/>
                     <field name="password" password="True"/>
-                    <field name="contract_date" select="1"/>
+                    <field name="date_start" select="1"/>
+                    <field name="date_stop" select="1"/>
                     <button name="_test_maintenance" string="Check Maintenance" type="object" colspan="2"/>
+                    <separator string="Covered Modules" colspan="4"/>
+                    <field name="modules" nolabel="1" colspan="4"/>
                 </form>
             </field>
         </record>
 
         <record id="action_maintenance_contract_form" model="ir.actions.act_window">
-            <field name="name">Maintenance Contract</field>
+            <field name="name">Your Maintenance Contracts</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">maintenance.contract</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_maintenance_contract_form" id="menu_maintenance_contract" parent="base.menu_management"/>
+        <record id="action_maintenance_contract_form" model="ir.actions.act_window">
+            <field name="name">Encode a New Maintenance Contract</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">maintenance.contract</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+        </record>
+        <menuitem
+            string="Maintenance"
+            id="maintenance"
+            parent="base.menu_administration"/>
+
+        <menuitem
+            action="action_maintenance_contract_form"
+            id="menu_maintenance_contract"
+            parent="maintenance"/>
 
     </data>
 </openerp>

From b8fe8289c091162a7e35492d60a3dee65ad869a2 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 27 Nov 2008 00:52:20 +0100
Subject: [PATCH 02/12] improved_actions

bzr revid: fp@tinyerp.com-20081126235220-jkgzn4ih87ko3xmp
---
 bin/addons/base/ir/ir.xml        |  3 ++-
 bin/addons/base/ir/ir_actions.py | 30 ++++++++----------------------
 bin/workflow/workitem.py         |  6 ++++++
 3 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 187e8edc9e9..5a846254ba8 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -1160,7 +1160,7 @@
                             <field name="sms" colspan="4" attrs="{'readonly':[('state','=','python'), ('state','=','email'), ('state','=','dummy'),('state','=','trigger'), ('state','=','object_create'), ('state','=','object_write'), ('state','=','client_action'), ('state','=','other')]}"/>
                             <field name="message" select="2" colspan="4" attrs="{'readonly':[('state','=','python'), ('state','=','dummy'),('state','=','trigger'), ('state','=','object_create'), ('state','=','object_write'), ('state','=','sms'), ('state','=','client_action'), ('state','=','other')]}" />
                             <newline/>
-                            <label colspan="4" string="Access all the fields related to the current object easily just by defining name of the attribute, i.e. [[partner_id.name]] for Invoice Object"/>
+                            <label colspan="4" string="Access all the fields related to the current object using expression in double brackets, i.e. [[ object.partner_id.name ]]" align="0.0"/>
                         </page>
                         
                         <page string="Create / Write" attrs="{'invisible':[('state','=','python'),('state','=','dummy'),('state','=','trigger'), ('state','=','sms'), ('state','=','email'), ('state','=','client_action'), ('state','=','other')]}">
@@ -1179,6 +1179,7 @@
                                     <field name="value" colsapan="4"/>
                                 </form>
                             </field>
+                            <label colspan="4" string="If you use a formula type, use a python expression using the variable 'object'." align="0.0"/>
                         </page>
                         
                         <page string="Other Actions" attrs="{'invisible':[('state','!=','other')]}">
diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index c520291fba2..08f4398fb9f 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -438,26 +438,12 @@ class actions_server(osv.osv):
     def merge_message(self, cr, uid, keystr, action, context):
         logger = netsvc.Logger()
         def merge(match):
-
             obj_pool = self.pool.get(action.model_id.model)
             id = context.get('active_id')
             obj = obj_pool.browse(cr, uid, id)
+            return eval(match[2:-2], {'object':obj, 'context': context,'time':time})
 
-            field = match.group()
-            field = field.replace('[','')
-            field = field.replace(']','')
-            field = field.strip()
-
-            fields = field.split('.')
-            for field in fields:
-                try:
-                    obj = getattr(obj, field)
-                except Exception,e :
-                    logger.notifyChannel('Workflow', netsvc.LOG_ERROR, 'Failed to parse : %s' % (match.group()))
-
-            return str(obj)
-
-        com = re.compile('\[\[(.+?)\]\]')
+        com = re.compile('(\[\[.+?\]\])')
         message = com.sub(merge, keystr)
         return message
 
@@ -490,9 +476,7 @@ class actions_server(osv.osv):
                 address = self.get_field_value(cr, uid, action, context)
                 if not address:
                     raise osv.except_osv(_('Error'), _("Please specify the Partner Email address !"))
-                
                 body = self.merge_message(cr, uid, str(action.message), action, context)
-
                 if tools.email_send_attach(user, address, subject, body, debug=False) == True:
                     logger.notifyChannel('email', netsvc.LOG_INFO, 'Email successfully send to : %s' % (address))
                 else:
@@ -537,8 +521,9 @@ class actions_server(osv.osv):
                 for exp in action.fields_lines:
                     euq = exp.value
                     if exp.type == 'equation':
-                        expr = self.merge_message(cr, uid, euq, action, context)
-                        expr = eval(expr)
+                        obj_pool = self.pool.get(action.model_id.model)
+                        obj = obj_pool.browse(cr, uid, context['active_id'], context=context)
+                        expr = eval(euq, {'context':context, 'object': obj})
                     else:
                         expr = exp.value
                     res[exp.col1.name] = expr
@@ -550,8 +535,9 @@ class actions_server(osv.osv):
                 for exp in action.fields_lines:
                     euq = exp.value
                     if exp.type == 'equation':
-                        expr = self.merge_message(cr, uid, euq, action, context)
-                        expr = eval(expr)
+                        obj_pool = self.pool.get(action.model_id.model)
+                        obj = obj_pool.browse(cr, uid, context['active_id'], context=context)
+                        expr = eval(euq, {'context':context, 'object': obj})
                     else:
                         expr = exp.value
                     res[exp.col1.name] = expr
diff --git a/bin/workflow/workitem.py b/bin/workflow/workitem.py
index 05f7ded57fd..8757fd9024c 100644
--- a/bin/workflow/workitem.py
+++ b/bin/workflow/workitem.py
@@ -96,6 +96,12 @@ def _execute(cr, workitem, activity, ident, stack):
     if activity['kind']=='dummy':
         if workitem['state']=='active':
             _state_set(cr, workitem, activity, 'complete', ident)
+            if activity['action_id']:
+                print 'ICI'
+                res2 = wkf_expr.execute_action(cr, ident, workitem, activity)
+                if res2:
+                    stack.append(res2)
+                    result=res2
     elif activity['kind']=='function':
         if workitem['state']=='active':
             _state_set(cr, workitem, activity, 'running', ident)

From 637ede5888bfdc418b2a986fd4b0f489f2feb07c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 27 Nov 2008 00:59:46 +0100
Subject: [PATCH 03/12] improve

bzr revid: fp@tinyerp.com-20081126235946-j7gldiqz5jvlowbn
---
 bin/addons/base/ir/ir_model.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/ir/ir_model.py b/bin/addons/base/ir/ir_model.py
index 91360668243..df73edd108b 100644
--- a/bin/addons/base/ir/ir_model.py
+++ b/bin/addons/base/ir/ir_model.py
@@ -204,7 +204,7 @@ class ir_model_fields(osv.osv):
         'select_level': fields.selection([('0','Not Searchable'),('1','Always Searchable'),('2','Advanced Search')],'Searchable', required=True),
         'translate': fields.boolean('Translate'),
         'size': fields.integer('Size'),
-        'state': fields.selection([('manual','Custom Field'),('base','Base Field')],'Manualy Created', required=True, readonly=True),
+        'state': fields.selection([('manual','Custom Field'),('base','Base Field')],'Manualy Created', required=True),
         'on_delete': fields.selection([('cascade','Cascade'),('set null','Set NULL')], 'On delete', help='On delete property for many2one fields'),
         'domain': fields.char('Domain', size=256),
         'groups': fields.many2many('res.groups', 'ir_model_fields_group_rel', 'field_id', 'group_id', 'Groups'),

From c8dec38eb193c745433e934ad8a3b52c079d4411 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 27 Nov 2008 01:00:02 +0100
Subject: [PATCH 04/12] improved_view

bzr revid: fp@tinyerp.com-20081127000002-jk3fb1ycni90a59x
---
 addons/product/product_view.xml | 98 ++++++++++++++++++++++++---------
 addons/sale/sale_view.xml       |  2 +-
 addons/stock/product_view.xml   | 18 +++---
 3 files changed, 83 insertions(+), 35 deletions(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index ce879ab389f..fa9ff515aef 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -455,37 +455,83 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Product Template">
-                    <notebook>
+                    <group colspan="2" col="4">
+                        <separator string="Product Description" colspan="4"/>
+                        <field name="name" select="1"/>
+                    </group>
+                    <group colspan="2" col="2">
+                        <separator string="Product Type" colspan="2"/>
+                        <field name="sale_ok" select="2"/>
+                        <field name="purchase_ok" select="2"/>
+                        <field groups="base.group_extended" name="rental" select="2"/>
+                    </group>
+                    <notebook colspan="4">
                         <page string="Information">
-                            <field colspan="4" name="name" select="1"/>
-                            <field name="categ_id" select="1"/>
-                            <field name="type" select="1"/>
-                            <field digits="(14, 3)" name="volume"/>
-                            <newline/>
-                            <field digits="(14, 3)" name="weight"/>
-                            <field digits="(14, 3)" name="weight_net"/>
-                            <field name="procure_method"/>
-                            <field name="state"/>
-                            <field name="uom_id"/>
-                            <field name="uom_po_id"/>
-                            <field colspan="4" name="description"/>
-                            <newline/>
-                            <field name="list_price"/>
-                            <field name="standard_price"/>
-                            <field name="product_manager"/>
-                            <field name="cost_method"/>
+                            <group colspan="2" col="2">
+                                <separator string="Procurement" colspan="2"/>
+                                <field name="type" select="2"/>
+                                <field name="procure_method"/>
+                                <field name="supply_method"/>
+                            </group>
+
+                            <group colspan="2" col="2" groups="base.group_extended">
+                                <separator string="Weigths" colspan="2"/>
+                                <field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
+                                <field digits="(14, 3)" name="weight" attrs="{'readonly':[('type','=','service')]}"/>
+                                <field digits="(14, 3)" name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
+                            </group>
+
+                            <group colspan="2" col="2" name="status">
+                                <separator string="Status" colspan="2"/>
+                                <field name="categ_id" select="1"/>
+                                <field name="state" select="2"/>
+                                <field groups="base.group_extended" name="product_manager" select="2"/>
+                            </group>
+
+                            <group colspan="2" col="2" name="uom">
+                                <separator string="UOM" colspan="2"/>
+                                <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)"/>
+                                <field name="uom_po_id"/>
+                            </group>
+
+                            <group colspan="2" col="2" name="uos" groups="product.group_uos">
+                                <separator string="Second UoM" colspan="2"/>
+                                <field name="uos_id"/>
+                                <field name="uos_coeff"/>
+                                <field name="mes_type"/>
+                            </group>
+
                         </page>
-                        <page string="Procurement">
-                            <field name="supply_method" select="2"/>
-                            <field name="rental" select="2"/>
+                        <page string="Procurement &amp; Locations">
+                            <group colspan="2" col="2" name="delay">
+                                <separator string="Delays" colspan="2"/>
+                                <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
+                                <field name="produce_delay"/>
+                                <field name="warranty"/>
+                            </group>
+                            <group colspan="2" col="2" name="store">
+                                <separator string="Storage Localisation" colspan="2"/>
+                                <field name="loc_rack"/>
+                                <field name="loc_row"/>
+                                <field name="loc_case"/>
+                            </group>
+
+                            <group colspan="2" col="2" name="misc">
+                                <separator string="Miscelleanous" colspan="2"/>
+                            </group>
+
+                        </page>
+                        <page string="Prices &amp; Suppliers">
+                            <separator string="Base Prices" colspan="4"/>
+                            <field name="standard_price"/>
+                            <field name="list_price"/>
+                            <field groups="base.group_extended" name="cost_method"/>
                             <newline/>
-                            <field name="sale_delay" select="2"/>
-                            <field name="sale_ok" select="2"/>
-                            <field name="purchase_ok" select="2"/>
-                            <field name="produce_delay" select="2"/>
-                            <field name="warranty"/>
+                            <field colspan="4" name="seller_ids" nolabel="1"/>
                         </page>
                         <page string="Descriptions">
+                            <separator string="Description"/>
+                            <field colspan="4" name="description" nolabel="1"/>
                             <separator string="Sale Description"/>
                             <field colspan="4" name="description_sale" nolabel="1"/>
                             <separator string="Purchase Description"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 52a84c6cfa7..d362ad6d664 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -108,7 +108,7 @@
                             <field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id"/>
                             <field domain="[('partner_id','=',partner_id)]" name="partner_shipping_id"/>
                             <field domain="[('type','=','sale')]" name="pricelist_id"/>
-                            <field name="project_id" select="2" context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id}"/>
+                            <field name="project_id" select="2" context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}"/>
                             <newline/>
                             <field colspan="4" mode="tree,graph" name="order_line" nolabel="1" widget="one2many_list">
                                 <form string="Sale Order Lines">
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index d1cf0f7a3ad..c82391a2df2 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -27,14 +27,16 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_template_form_view"/>
             <field name="arch" type="xml">
-                <page string="Properties" position="inside">
-                    <separator string="Counter-Part Locations Properties" colspan="4"/>
-                    <field name="property_stock_procurement"/>
-                    <field name="property_stock_production"/>
-                    <field name="property_stock_inventory"/>
-                    <separator string="Accounting Entries" colspan="4"/>
-                    <field name="property_stock_account_input"/>
-                    <field name="property_stock_account_output"/>
+                 <page position="after" string="Information">
+                    <page string="Properties">
+                        <separator string="Counter-Part Locations Properties" colspan="4"/>
+                        <field name="property_stock_procurement"/>
+                        <field name="property_stock_production"/>
+                        <field name="property_stock_inventory"/>
+                        <separator string="Accounting Entries" colspan="4"/>
+                        <field name="property_stock_account_input"/>
+                        <field name="property_stock_account_output"/>
+                    </page>
                 </page>
             </field>
         </record>

From 83b2287a3384c3d2c01155782631e600fe795c2b Mon Sep 17 00:00:00 2001
From: Jay Vora <jvo@tinyerp.com>
Date: Thu, 27 Nov 2008 11:44:08 +0530
Subject: [PATCH 05/12] Minor Edit on Menuitem for Maintenance

bzr revid: jvo@tinyerp.com-20081127061408-soi4lg7sswr0ajw2
---
 bin/addons/base/maintenance/maintenance_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/maintenance/maintenance_view.xml b/bin/addons/base/maintenance/maintenance_view.xml
index 81af7270f71..bf935a5c8c2 100755
--- a/bin/addons/base/maintenance/maintenance_view.xml
+++ b/bin/addons/base/maintenance/maintenance_view.xml
@@ -48,7 +48,7 @@
             <field name="view_mode">form,tree</field>
         </record>
         <menuitem
-            string="Maintenance"
+            name="Maintenance"
             id="maintenance"
             parent="base.menu_administration"/>
 

From 5f216f4b791497211f858fa80ca1a22013367cfe Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@tinyerp.com>
Date: Thu, 27 Nov 2008 09:01:58 +0100
Subject: [PATCH 06/12] [FIX] Typo

bzr revid: stephane@tinyerp.com-20081127080158-mteq5ovquyqbdihh
---
 bin/service/web_services.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/service/web_services.py b/bin/service/web_services.py
index 2c6d2c1987c..e99a7aa8ec3 100644
--- a/bin/service/web_services.py
+++ b/bin/service/web_services.py
@@ -149,7 +149,7 @@ class db(netsvc.Service):
             try:
                 cr.execute('DROP DATABASE ' + db_name)
             except:
-                logger.notifyChannel("web-service", netsvc.LOG_ERROR,
+                logger.notifyChannel("web-services", netsvc.LOG_ERROR,
                     'DROP DB: %s failed' % (db_name,))
                 raise
             else:
@@ -177,7 +177,7 @@ class db(netsvc.Service):
         data = stdout.read()
         res = stdout.close()
         if res:
-            logger.notifyChannel("web-service", netsvc.LOG_ERROR,
+            logger.notifyChannel("web-services", netsvc.LOG_ERROR,
                     'DUMP DB: %s failed\n%s' % (db_name, data))
             raise Exception, "Couldn't dump database"
         logger.notifyChannel("web-services", netsvc.LOG_INFO,
@@ -189,7 +189,7 @@ class db(netsvc.Service):
         logger = netsvc.Logger()
 
         if self.db_exist(db_name):
-            logger.notifyChannel("web-service", netsvc.LOG_WARNING,
+            logger.notifyChannel("web-services", netsvc.LOG_WARNING,
                     'RESTORE DB: %s already exists' % (db_name,))
             raise Exception, "Database already exists"
 
@@ -318,7 +318,7 @@ class common(netsvc.Service):
         res = security.login(db, login, password)
         logger = netsvc.Logger()
         msg = res and 'successful login' or 'bad login or password'
-        logger.notifyChannel("web-service", netsvc.LOG_INFO, "%s from '%s' using database '%s'" % (msg, login, db.lower()))
+        logger.notifyChannel("web-services", netsvc.LOG_INFO, "%s from '%s' using database '%s'" % (msg, login, db.lower()))
         return res or False
 
     def about(self, extended=False):
@@ -470,7 +470,7 @@ class report_spool(netsvc.Service):
                 tb_s = reduce(lambda x, y: x+y, traceback.format_exception(
                     sys.exc_type, sys.exc_value, sys.exc_traceback))
                 logger = netsvc.Logger()
-                logger.notifyChannel('web-service', netsvc.LOG_ERROR,
+                logger.notifyChannel('web-services', netsvc.LOG_ERROR,
                         'Exception: %s\n%s' % (str(exception), tb_s))
                 self._reports[id]['exception'] = exception
                 self._reports[id]['state'] = True

From b3f65107c60db7b7744b76dbde5168655389b634 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@tinyerp.com>
Date: Thu, 27 Nov 2008 09:14:17 +0100
Subject: [PATCH 07/12] [IMP] Improve the logging from the Object Service

bzr revid: stephane@tinyerp.com-20081127081417-sycppkuv8tx3uv3k
---
 bin/osv/osv.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/bin/osv/osv.py b/bin/osv/osv.py
index 58a98da347b..2efc3a41a3c 100644
--- a/bin/osv/osv.py
+++ b/bin/osv/osv.py
@@ -90,16 +90,14 @@ class osv_pool(netsvc.Service):
         except psycopg.IntegrityError, inst:
             for key in self._sql_error.keys():
                 if key in inst[0]:
-                    self.abortResponse(1, 'Constraint Error', 'warning',
-                            self._sql_error[key])
+                    self.abortResponse(1, 'Constraint Error', 'warning', self._sql_error[key])
             self.abortResponse(1, 'Integrity Error', 'warning', inst[0])
         except Exception, e:
             import traceback
-            tb_s = reduce(lambda x, y: x+y, traceback.format_exception(
-                sys.exc_type, sys.exc_value, sys.exc_traceback))
+            tb_s = reduce(lambda x, y: x+y, traceback.format_exception( sys.exc_type, sys.exc_value, sys.exc_traceback))
             logger = Logger()
-            logger.notifyChannel("web-services", LOG_ERROR,
-                    'Exception in call: ' + tb_s)
+            for idx, s in enumerate(tb_s.split('\n')):
+                logger.notifyChannel("web-services", LOG_ERROR, '[%2d]: %s' % (idx, s,))
             raise
 
     def execute(self, db, uid, obj, method, *args, **kw):

From 05613c2bea120b203e46378243ca6cc1e4ea5f16 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@tinyerp.com>
Date: Thu, 27 Nov 2008 09:24:44 +0100
Subject: [PATCH 08/12] [FIX] Move the read_string and write_string methods
 from orm to orm_template

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

bzr revid: stephane@tinyerp.com-20081127082444-rpa115twbkgy6oib
---
 bin/osv/orm.py | 82 +++++++++++++++++++++++++-------------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 7fada153b64..e933464960a 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1107,6 +1107,47 @@ class orm_template(object):
     def copy(self, cr, uid, id, default=None, context=None):
         raise _('The copy method is not implemented on this object !')
 
+    def read_string(self, cr, uid, id, langs, fields=None, context=None):
+        if not context:
+            context = {}
+        res = {}
+        res2 = {}
+        self.pool.get('ir.model.access').check(cr, uid, 'ir.translation', 'read')
+        if not fields:
+            fields = self._columns.keys() + self._inherit_fields.keys()
+        for lang in langs:
+            res[lang] = {'code': lang}
+            for f in fields:
+                if f in self._columns:
+                    res_trans = self.pool.get('ir.translation')._get_source(cr, uid, self._name+','+f, 'field', lang)
+                    if res_trans:
+                        res[lang][f] = res_trans
+                    else:
+                        res[lang][f] = self._columns[f].string
+        for table in self._inherits:
+            cols = intersect(self._inherit_fields.keys(), fields)
+            res2 = self.pool.get(table).read_string(cr, uid, id, langs, cols, context)
+        for lang in res2:
+            if lang in res:
+                res[lang] = {'code': lang}
+            for f in res2[lang]:
+                res[lang][f] = res2[lang][f]
+        return res
+
+    def write_string(self, cr, uid, id, langs, vals, context=None):
+        if not context:
+            context = {}
+        self.pool.get('ir.model.access').check(cr, uid, 'ir.translation', 'write')
+        for lang in langs:
+            for field in vals:
+                if field in self._columns:
+                    self.pool.get('ir.translation')._set_ids(cr, uid, self._name+','+field, 'field', lang, [0], vals[field])
+        for table in self._inherits:
+            cols = intersect(self._inherit_fields.keys(), vals)
+            if cols:
+                self.pool.get(table).write_string(cr, uid, id, langs, vals, context)
+        return True
+
 
 class orm_memory(orm_template):
     _protected = ['read', 'write', 'create', 'default_get', 'perm_read', 'unlink', 'fields_get', 'fields_view_get', 'search', 'name_get', 'distinct_field_get', 'name_search', 'copy', 'import_data', 'search_count']
@@ -2543,47 +2584,6 @@ class orm(orm_template):
 
         return new_id
 
-    def read_string(self, cr, uid, id, langs, fields=None, context=None):
-        if not context:
-            context = {}
-        res = {}
-        res2 = {}
-        self.pool.get('ir.model.access').check(cr, uid, 'ir.translation', 'read')
-        if not fields:
-            fields = self._columns.keys() + self._inherit_fields.keys()
-        for lang in langs:
-            res[lang] = {'code': lang}
-            for f in fields:
-                if f in self._columns:
-                    res_trans = self.pool.get('ir.translation')._get_source(cr, uid, self._name+','+f, 'field', lang)
-                    if res_trans:
-                        res[lang][f] = res_trans
-                    else:
-                        res[lang][f] = self._columns[f].string
-        for table in self._inherits:
-            cols = intersect(self._inherit_fields.keys(), fields)
-            res2 = self.pool.get(table).read_string(cr, uid, id, langs, cols, context)
-        for lang in res2:
-            if lang in res:
-                res[lang] = {'code': lang}
-            for f in res2[lang]:
-                res[lang][f] = res2[lang][f]
-        return res
-
-    def write_string(self, cr, uid, id, langs, vals, context=None):
-        if not context:
-            context = {}
-        self.pool.get('ir.model.access').check(cr, uid, 'ir.translation', 'write')
-        for lang in langs:
-            for field in vals:
-                if field in self._columns:
-                    self.pool.get('ir.translation')._set_ids(cr, uid, self._name+','+field, 'field', lang, [0], vals[field])
-        for table in self._inherits:
-            cols = intersect(self._inherit_fields.keys(), vals)
-            if cols:
-                self.pool.get(table).write_string(cr, uid, id, langs, vals, context)
-        return True
-
     def check_recursion(self, cr, uid, ids, parent=None):
         if not parent:
             parent = self._parent_name

From 59f316df19a7209f2fd2e9a743eed28fddc4f1bd Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@tinyerp.com>
Date: Thu, 27 Nov 2008 09:27:20 +0100
Subject: [PATCH 09/12] [IMP] Improve the logging of error for LocalService

bzr revid: stephane@tinyerp.com-20081127082720-zoqwogtk09l0dipw
---
 bin/netsvc.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/bin/netsvc.py b/bin/netsvc.py
index b84f5cecb68..daa29788e07 100644
--- a/bin/netsvc.py
+++ b/bin/netsvc.py
@@ -122,10 +122,15 @@ class Service(object):
 class LocalService(Service):
     def __init__(self, name):
         self.__name = name
-        s = _service[name]
-        self._service = s
-        for m in s._method:
-            setattr(self, m, s._method[m])
+        try:
+            s = _service[name]
+            self._service = s
+            for m in s._method:
+                setattr(self, m, s._method[m])
+        except KeyError, keyError:
+            Logger().notifyChannel('module', LOG_ERROR, 'This service does not exists: %s' % (str(keyError),) )
+            raise
+
 
 
 class ServiceUnavailable(Exception):

From 9d8efe4e35b70f08713e0bbc15a9651b3654e4f6 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 27 Nov 2008 10:33:29 +0100
Subject: [PATCH 10/12] improve

bzr revid: fp@tinyerp.com-20081127093329-ov2s7avzddi956ah
---
 addons/wiki/__terp__.py   |   2 +-
 addons/wiki/wiki_data.xml | 171 +++++++++++++++++++-------------------
 2 files changed, 86 insertions(+), 87 deletions(-)

diff --git a/addons/wiki/__terp__.py b/addons/wiki/__terp__.py
index ca2fdf011e3..5873ee38854 100644
--- a/addons/wiki/__terp__.py
+++ b/addons/wiki/__terp__.py
@@ -14,7 +14,7 @@
     "demo_xml" : [],
     "update_xml" : [
         "wiki_view.xml",
-        #"wiki_data.xml",
+        "wiki_data.xml",
         "wizard/wizard_view.xml",
         "security/ir.model.access.csv"
     ],
diff --git a/addons/wiki/wiki_data.xml b/addons/wiki/wiki_data.xml
index 8e3ce35339a..19a151e2ce3 100644
--- a/addons/wiki/wiki_data.xml
+++ b/addons/wiki/wiki_data.xml
@@ -20,92 +20,91 @@
 			<field eval="0" name="minor_edit"/>
 			<field eval="&quot;&quot;&quot;1&quot;&quot;&quot;" name="section"/>
 			<field eval="&quot;&quot;&quot;quick start help for the wiki formating&quot;&quot;&quot;" name="summary"/>
-			<field  name="text_area">
-			<![CDATA[
-			==Basic Fromatting==
-			 You can ''italicize text'' by putting 2 
-			 apostrophes on each side. 
-			 3 apostrophes will embolden '''the text'''. 
-			 5 apostrophes will embolden and italicize 
-			 '''''the text'''''.
-			 (4 apostrophes don't do anything
-			 special -- there's just ''''one left
-			 over''''.)
-			
-			You can ''italicize text'' by putting 2 
-			apostrophes on each side. 
-			
-			3 apostrophes will embolden '''the text'''. 
-			
-			5 apostrophes will embolden and italicize 
-			'''''the text'''''.
-			
-			(4 apostrophes don't do anything special -- there's just ''''one left over''''.)
-			
-			==Links==
-			===Internal===
-			You give the link as same as the wiki Page Title
-			<br/>
-			See also : [[Complete Help]]
-			===External===
-			You can give link to the other Web page over the Internet easily  [http://google.com Visit Google]
-			==Attachments==
-			===Images===
-			You can get the External links easily <br/>
-			img:http://images.google.co.in/intl/en_ALL/images/images_hp.gif
-			
-			==Headings==
-			 =1st Level Heading=
-			 ==2nd Level Heading==
-			 ===3rd Level Heading===
-			
-			==Unnumbered List==
-			* ''Unordered lists'' are easy to do:
-			** Start every line with a star.
-			*** More stars indicate a deeper level.
-			*: Previous item continues.
-			** A new line
-			* in a list  
-			marks the end of the list.
-			*Of course you can start again.
-			
-			==Numbered List==
-			# ''Numbered lists'' are:
-			## Very organized
-			## Easy to follow
-			#: Previous item continues
-			A new line marks the end of the list.
-			# New numbering starts with 1
-			
-			==Text Indents==
-			: A colon (:) indents a line or paragraph.
-			A newline starts a new paragraph.
-			: We use 1 colon to indent once.
-			:: We use 2 colons to indent twice.
-			::: 3 colons to indent 3 times, and so on.
-			
-			==Table==
-			<nowiki>
-			 {| border="1" cellspacing="0" cellpadding="5" align="left"
-			 ! Web site
-			 ! Link
-			 ! Contact Email
-			 |- 
-			 | '''Open ERP''' - ''Belgium''
-			 | [http://openerp.com]
-			 | [[ mailto:fp@tinyerp.com ]]
-			 |}
-			</nowiki>
-			{| border="1" cellspacing="0" cellpadding="5" align="left"
-			 ! Web site
-			! Link
-			! Contact Email
-			|- 
-			| '''Open ERP''' - ''Belgium''
-			| [http://openerp.com]
-			| [[ mailto:fp@tinyerp.com ]]
-			|}
-			<br/><br/>]]></field>
+			<field  name="text_area">==Basic Fromatting==
+You can ''italicize text'' by putting 2 
+apostrophes on each side. 
+3 apostrophes will embolden '''the text'''. 
+5 apostrophes will embolden and italicize 
+'''''the text'''''.
+(4 apostrophes don't do anything
+special -- there's just ''''one left
+over''''.)
+
+You can ''italicize text'' by putting 2 
+apostrophes on each side. 
+
+3 apostrophes will embolden '''the text'''. 
+
+5 apostrophes will embolden and italicize 
+'''''the text'''''.
+
+(4 apostrophes don't do anything special -- there's just ''''one left over''''.)
+
+==Links==
+===Internal===
+You give the link as same as the wiki Page Title
+<br/>
+See also : [[Complete Help]]
+===External===
+You can give link to the other Web page over the Internet easily  [http://google.com Visit Google]
+==Attachments==
+===Images===
+You can get the External links easily <br/>
+img:http://images.google.co.in/intl/en_ALL/images/images_hp.gif
+
+==Headings==
+=1st Level Heading=
+==2nd Level Heading==
+===3rd Level Heading===
+
+==Unnumbered List==
+* ''Unordered lists'' are easy to do:
+** Start every line with a star.
+*** More stars indicate a deeper level.
+*: Previous item continues.
+** A new line
+* in a list  
+marks the end of the list.
+*Of course you can start again.
+
+==Numbered List==
+# ''Numbered lists'' are:
+## Very organized
+## Easy to follow
+#: Previous item continues
+A new line marks the end of the list.
+# New numbering starts with 1
+
+==Text Indents==
+: A colon (:) indents a line or paragraph.
+A newline starts a new paragraph.
+: We use 1 colon to indent once.
+:: We use 2 colons to indent twice.
+::: 3 colons to indent 3 times, and so on.
+
+==Table==
+<nowiki>
+{| border="1" cellspacing="0" cellpadding="5" align="left"
+! Web site
+! Link
+! Contact Email
+|- 
+| '''Open ERP''' - ''Belgium''
+| [http://openerp.com]
+| [[ mailto:fp@tinyerp.com ]]
+|}
+</nowiki>
+{| border="1" cellspacing="0" cellpadding="5" align="left"
+! Web site
+! Link
+! Contact Email
+|- 
+| '''Open ERP''' - ''Belgium''
+| [http://openerp.com]
+| [[ mailto:fp@tinyerp.com ]]
+|}
+<br/><br/>]]&gt;
+            </field>
 			<field name="group_id" ref="wiki_groups_wikiformatting0"/>
 		</record>
 	</data>

From 83ea18a4f27b7cd1f818d9dbcd50b581fdc8a052 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 27 Nov 2008 15:11:42 +0530
Subject: [PATCH 11/12] small change in terp

bzr revid: mga@tinyerp.com-20081127094142-dxuekpnc5vfgkiz1
---
 addons/wiki/__terp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/wiki/__terp__.py b/addons/wiki/__terp__.py
index ca2fdf011e3..5873ee38854 100644
--- a/addons/wiki/__terp__.py
+++ b/addons/wiki/__terp__.py
@@ -14,7 +14,7 @@
     "demo_xml" : [],
     "update_xml" : [
         "wiki_view.xml",
-        #"wiki_data.xml",
+        "wiki_data.xml",
         "wizard/wizard_view.xml",
         "security/ir.model.access.csv"
     ],

From 1a0cc78b59e97673d096a2fef4dab8a4c85212d8 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 27 Nov 2008 20:38:33 +0530
Subject: [PATCH 12/12] add some date files

bzr revid: mga@tinyerp.com-20081127150833-bh8nphd7poopkb69
---
 addons/wiki/__terp__.py                       |  3 +-
 addons/wiki/data/wiki_faq.xml                 |  1 +
 addons/wiki/data/wiki_help.xml                |  1 +
 addons/wiki/data/wiki_quality.xml             |  1 +
 .../wiki_quickstart.xml}                      | 51 ++++++++++++-------
 addons/wiki/wiki.py                           |  3 +-
 addons/wiki/wiki_view.xml                     |  9 ++--
 7 files changed, 44 insertions(+), 25 deletions(-)
 create mode 100644 addons/wiki/data/wiki_faq.xml
 create mode 100644 addons/wiki/data/wiki_help.xml
 create mode 100644 addons/wiki/data/wiki_quality.xml
 rename addons/wiki/{wiki_data.xml => data/wiki_quickstart.xml} (74%)

diff --git a/addons/wiki/__terp__.py b/addons/wiki/__terp__.py
index 5873ee38854..559a1b68b49 100644
--- a/addons/wiki/__terp__.py
+++ b/addons/wiki/__terp__.py
@@ -14,7 +14,8 @@
     "demo_xml" : [],
     "update_xml" : [
         "wiki_view.xml",
-        "wiki_data.xml",
+        "data/wiki_main.xml",
+        "data/wiki_quickstart.xml",
         "wizard/wizard_view.xml",
         "security/ir.model.access.csv"
     ],
diff --git a/addons/wiki/data/wiki_faq.xml b/addons/wiki/data/wiki_faq.xml
new file mode 100644
index 00000000000..12bbf745ce3
--- /dev/null
+++ b/addons/wiki/data/wiki_faq.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?>
diff --git a/addons/wiki/data/wiki_help.xml b/addons/wiki/data/wiki_help.xml
new file mode 100644
index 00000000000..12bbf745ce3
--- /dev/null
+++ b/addons/wiki/data/wiki_help.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?>
diff --git a/addons/wiki/data/wiki_quality.xml b/addons/wiki/data/wiki_quality.xml
new file mode 100644
index 00000000000..12bbf745ce3
--- /dev/null
+++ b/addons/wiki/data/wiki_quality.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?>
diff --git a/addons/wiki/wiki_data.xml b/addons/wiki/data/wiki_quickstart.xml
similarity index 74%
rename from addons/wiki/wiki_data.xml
rename to addons/wiki/data/wiki_quickstart.xml
index 19a151e2ce3..23b35675078 100644
--- a/addons/wiki/wiki_data.xml
+++ b/addons/wiki/data/wiki_quickstart.xml
@@ -2,25 +2,26 @@
 <openerp>
 	<data>
 		<record id="wiki_groups_help0" model="wiki.groups">
-			<field eval="&quot;&quot;&quot;Help&quot;&quot;&quot;" name="name"/>
+			<field name="name">Help</field>
 			<field eval="1" name="section"/>
 		</record>
 	</data>
 	<data>
 		<record id="wiki_groups_wikiformatting0" model="wiki.groups">
-			<field eval="&quot;&quot;&quot;Wiki Formatting&quot;&quot;&quot;" name="name"/>
+			<field name="name">Wiki Formatting</field>
 			<field name="parent_id" ref="wiki_groups_help0"/>
 			<field eval="1" name="section"/>
 		</record>
 	</data>
 	<data>
 		<record id="wiki_wiki_quickstart0" model="wiki.wiki">
-			<field eval="&quot;&quot;&quot;Quick Start&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;help, quick start, wiki, formatting&quot;&quot;&quot;" name="tags"/>
-			<field eval="0" name="minor_edit"/>
-			<field eval="&quot;&quot;&quot;1&quot;&quot;&quot;" name="section"/>
-			<field eval="&quot;&quot;&quot;quick start help for the wiki formating&quot;&quot;&quot;" name="summary"/>
-			<field  name="text_area">==Basic Fromatting==
+			<field name="name">Basic Wiki Editing</field>
+			<field name="tags">help, quick start, wiki, formatting</field>
+			<field name="minor_edit">0</field>
+			<field name="toc">1</field>
+			<field name="section">1.1</field>
+			<field name="summary">Initial Page</field>
+			<field  name="text_area">==Basic Wiki Editing==
 You can ''italicize text'' by putting 2 
 apostrophes on each side. 
 3 apostrophes will embolden '''the text'''. 
@@ -43,19 +44,23 @@ apostrophes on each side.
 ==Links==
 ===Internal===
 You give the link as same as the wiki Page Title
-<br/>
-See also : [[Complete Help]]
+
+Go back to Main Page : [[The Open ERP wiki]]
 ===External===
 You can give link to the other Web page over the Internet easily  [http://google.com Visit Google]
 ==Attachments==
 ===Images===
-You can get the External links easily <br/>
+You can get the External links easily
+
 img:http://images.google.co.in/intl/en_ALL/images/images_hp.gif
 
-==Headings==
-=1st Level Heading=
-==2nd Level Heading==
-===3rd Level Heading===
+==Play with Open ERP Records==
+* edit:res.partner|False|Create New Partner
+* edit:res.partner|China Export|Edit China Export
+* edit:res.country|India|Edit Country - India
+
+==Working with Attachments==
+* Download File : attach:document.doc
 
 ==Unnumbered List==
 * ''Unordered lists'' are easy to do:
@@ -83,7 +88,7 @@ A newline starts a new paragraph.
 ::: 3 colons to indent 3 times, and so on.
 
 ==Table==
-<nowiki>
+&lt;nowiki&gt;
 {| border="1" cellspacing="0" cellpadding="5" align="left"
 ! Web site
 ! Link
@@ -93,7 +98,8 @@ A newline starts a new paragraph.
 | [http://openerp.com]
 | [[ mailto:fp@tinyerp.com ]]
 |}
-</nowiki>
+&lt;/nowiki&gt;
+
 {| border="1" cellspacing="0" cellpadding="5" align="left"
 ! Web site
 ! Link
@@ -103,8 +109,15 @@ A newline starts a new paragraph.
 | [http://openerp.com]
 | [[ mailto:fp@tinyerp.com ]]
 |}
-<br/><br/>]]&gt;
-            </field>
+&lt;br/&gt;
+&lt;br/&gt;
+&lt;br/&gt;
+&lt;br/&gt;
+==Headings==
+=1st Level Heading=
+==2nd Level Heading==
+===3rd Level Heading===
+</field>
 			<field name="group_id" ref="wiki_groups_wikiformatting0"/>
 		</record>
 	</data>
diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py
index c12ecb6c4ec..cb1680bcb9a 100644
--- a/addons/wiki/wiki.py
+++ b/addons/wiki/wiki.py
@@ -43,7 +43,7 @@ class WikiGroup(osv.osv):
        'notes':fields.text("Description", select=True),
        'create_date':fields.datetime("Created Date", select=True),
        'template': fields.text('Wiki Template'),
-       'section': fields.boolean("Make Section?")
+       'section': fields.boolean("Make Section ?"),
     }
 WikiGroup()
 
@@ -64,6 +64,7 @@ class Wiki(osv.osv):
         'summary':fields.char('Summary',size=256, select=True),
         'section': fields.char('Section', size=32, help="Use page section code like 1.2.1"),
         'group_id':fields.many2one('wiki.groups', 'Wiki Group', select=1, ondelete='set null'),
+        'toc':fields.boolean('Table of Contents ?'),
     }
     def onchange_group_id(self, cr, uid, ids, group_id, content, context={}):
         if (not group_id) or content:
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 9d8f63cfcd0..75654567e5a 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -100,6 +100,7 @@
                         <field name="write_uid" readonly="1" select="2"/>
                         <field name="tags" select="2" groups="base.group_extended"/>
                         <field name="minor_edit" select="2" groups="base.group_extended"/>
+                        <field name="toc"/>
                         <field name="summary" colspan="4" select="2" groups="base.group_extended"/>
                     </group>
                     <field name="text_area" nolabel="1" colspan="4" select="1" widget="text_wiki"/>
@@ -129,7 +130,7 @@
                 <tree srting="Wiki History">
                     <field name="create_date"/>
                     <field name="write_uid"/>
-                    <field name="minor_edit"/>
+                    <field name="minor_edit" groups="base.group_extended"/>
                     <field name="summary"/>
                 </tree>
             </field>
@@ -143,9 +144,9 @@
                 <form srting="Wiki History">
                     <field name="wiki_id" select="1" colspan="4"/>
                     <field name="summary" select="1" colspan="4"/>
-                    <field name="text_area" select="1" colspan="4" widget="text_wiki"/>
+                    <field name="text_area" select="1" colspan="4" nolabel="1" widget="text_wiki"/>
                     <field name="create_date" select="1"/>
-                    <field name="minor_edit" select="1"/>
+                    <field name="minor_edit" select="1" groups="base.group_extended"/>
                 </form>
             </field>
         </record>
@@ -168,7 +169,7 @@
             src_model="wiki.wiki"/>
 
         <act_window
-            domain="[('group_id', '=', active_id)]"
+            domain="[('group_id', 'child_of', active_ids)]"
             id="act_wiki_group_open"
             name="Wiki Pages"
             res_model="wiki.wiki"