From 8466b999a27232126dffdf2bb6bedf2d4c5aa42e Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Fri, 14 May 2010 19:06:40 +0530
Subject: [PATCH 001/121] [IMP]: sale_crm: Convert makesale wizard into osv
 memory wizard (crm_make_sale)

bzr revid: atp@tinyerp.co.in-20100514133640-rykzahgkf3wqk4aj
---
 addons/sale_crm/__openerp__.py          |   2 +-
 addons/sale_crm/sale_crm_view.xml       |   2 +-
 addons/sale_crm/sale_crm_wizard.xml     |  14 --
 addons/sale_crm/wizard/__init__.py      |   2 +-
 addons/sale_crm/wizard/crm_make_sale.py | 175 ++++++++++++++++++++++++
 addons/sale_crm/wizard/makesale.py      | 174 -----------------------
 6 files changed, 178 insertions(+), 191 deletions(-)
 delete mode 100644 addons/sale_crm/sale_crm_wizard.xml
 create mode 100644 addons/sale_crm/wizard/crm_make_sale.py
 delete mode 100644 addons/sale_crm/wizard/makesale.py

diff --git a/addons/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py
index 9464db91b6f..49f867ee79d 100644
--- a/addons/sale_crm/__openerp__.py
+++ b/addons/sale_crm/__openerp__.py
@@ -38,7 +38,7 @@ crm modules.
     'website': 'http://www.openerp.com',
     'depends': ['sale', 'crm'],
     'init_xml': [],
-    'update_xml': ['sale_crm_wizard.xml',
+    'update_xml': ['wizard/crm_make_sale_view.xml',
                    'sale_crm_view.xml',
                    'process/sale_crm_process.xml',
                    'security/sale_crm_security.xml',
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 7660dcc5cd2..1e4d984a1b2 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -9,7 +9,7 @@
         <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
         <field name="arch" type="xml">
             <field name="priority" position="after">
-                <button string="Convert to Quote" icon="terp-sale" name="%(sale_crm_wizard)d" type="action"/>
+                <button string="Create a Sale Order" icon="terp-sale" name="%(action_crm_make_sale)d" type="action"/>
                 <label colspan="2"  string=""/>
             </field>
         </field>
diff --git a/addons/sale_crm/sale_crm_wizard.xml b/addons/sale_crm/sale_crm_wizard.xml
deleted file mode 100644
index 74dcf06e901..00000000000
--- a/addons/sale_crm/sale_crm_wizard.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-    <data>
-
-        <wizard
-            string="Make Quotation"
-            model="crm.opportunity"
-            name="crm.opportunity.make_order"
-            keyword="client_action_multi"
-            multi="True"
-            id="sale_crm_wizard"/>
-        
-    </data>
-</openerp>
diff --git a/addons/sale_crm/wizard/__init__.py b/addons/sale_crm/wizard/__init__.py
index 87048a13fc4..04f40c92207 100644
--- a/addons/sale_crm/wizard/__init__.py
+++ b/addons/sale_crm/wizard/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import makesale
+import crm_make_sale
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
new file mode 100644
index 00000000000..f74df093a84
--- /dev/null
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -0,0 +1,175 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+from mx.DateTime import now
+
+class crm_make_sale(osv.osv_memory):
+    """ Make sale  order for crm """
+
+    _name = "crm.make.sale"
+    _description = "Make sale"
+    
+    def _selectPartner(self, cr, uid, context=None):
+        """
+        This function gets default value for partner_id field.
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values
+        @return : default value of partner_id field.
+        """ 
+        if not context:
+            context = {}
+            
+        data = context and context.get('active_ids', []) or []
+        case_obj = self.pool.get('crm.lead')
+        case = case_obj.read(cr, uid, data, ['partner_id'])
+        return  case[0]['partner_id']
+    
+    def makeOrder(self, cr, uid, ids, context=None):
+        """
+        This function  create Quotation on given case.
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of crm make sale' ids
+        @param context: A standard dictionary for contextual values
+        @return : Dictionary value of created sale order.
+        """
+        if not context:
+            context = {}
+            
+        mod_obj = self.pool.get('ir.model.data')
+        result = mod_obj._get_id(cr, uid, 'sale', 'view_sales_order_filter')
+        id = mod_obj.read(cr, uid, result, ['res_id'])
+        case_obj = self.pool.get('crm.lead')
+        sale_obj = self.pool.get('sale.order')
+        partner_obj = self.pool.get('res.partner')
+        sale_line_obj = self.pool.get('sale.order.line')
+        
+        data = context and context.get('active_ids', []) or []
+             
+        for make in self.browse(cr, uid, ids):  
+            default_partner_addr = partner_obj.address_get(cr, uid, [make.partner_id.id],
+                    ['invoice', 'delivery', 'contact'])
+            default_pricelist = partner_obj.browse(cr, uid, make.partner_id.id,
+                         context).property_product_pricelist.id
+            fpos_data = partner_obj.browse(cr, uid, make.partner_id.id, context).property_account_position
+            new_ids = []
+    
+            for case in case_obj.browse(cr, uid, data):
+                if case.partner_id and case.partner_id.id:
+                    partner_id = case.partner_id.id
+                    fpos = case.partner_id.property_account_position and case.partner_id.property_account_position.id or False
+                    partner_addr = partner_obj.address_get(cr, uid, [case.partner_id.id],
+                            ['invoice', 'delivery', 'contact'])
+                    pricelist = partner_obj.browse(cr, uid, case.partner_id.id,
+                            context).property_product_pricelist.id
+                else:
+                    partner_id = make.partner_id.id
+                    fpos = fpos_data and fpos_data.id or False
+                    partner_addr = default_partner_addr
+                    pricelist = default_pricelist
+    
+                if False in partner_addr.values():
+                    raise osv.except_osv(_('Data Insufficient!'),_('Customer has no addresses defined!'))
+    
+                vals = {
+                    'origin': 'CRM-Opportunity:%s' % str(case.id),
+                    'section_id': case.section_id and case.section_id.id or False,
+                    'picking_policy': make.picking_policy,
+                    'shop_id': make.shop_id.id,
+                    'partner_id': partner_id,
+                    'pricelist_id': pricelist,
+                    'partner_invoice_id': partner_addr['invoice'],
+                    'partner_order_id': partner_addr['contact'],
+                    'partner_shipping_id': partner_addr['delivery'],
+                    'order_policy': 'manual',
+                    'date_order': now(),
+                    'fiscal_position': fpos,
+                }
+    
+                if partner_id:
+                    partner = partner_obj.browse(cr, uid, partner_id, context=context)
+                    vals['user_id'] = partner.user_id and partner.user_id.id or uid
+    
+                if make.analytic_account.id:
+                    vals['project_id'] = make.analytic_account.id
+                new_id = sale_obj.create(cr, uid, vals)
+                for product_id in make.product_ids:
+                    value = sale_line_obj.product_id_change(cr, uid, [], pricelist,
+                            product_id.id, qty=1, partner_id=partner_id, fiscal_position=fpos)['value']
+                    value['product_id'] = product_id.id
+                    value['order_id'] = new_id
+                    value['tax_id'] = [(6,0,value['tax_id'])]
+                    sale_line_obj.create(cr, uid, value)
+    
+                case_obj.write(cr, uid, [case.id], {'ref': 'sale.order,%s' % new_id})
+                new_ids.append(new_id)
+    
+            if make.close:
+                case_obj.case_close(cr, uid, data)
+            
+            if not new_ids:
+                return {}
+            if len(new_ids)<=1:
+                value = {
+                    'domain': str([('id', 'in', new_ids)]),
+                    'view_type': 'form',
+                    'view_mode': 'form',
+                    'res_model': 'sale.order',
+                    'view_id': False,
+                    'type': 'ir.actions.act_window',
+                    'res_id': new_ids and new_ids[0]
+                }
+                
+            else:
+                value = {
+                    'domain': str([('id', 'in', new_ids)]),
+                    'view_type': 'form',
+                    'view_mode': 'tree,form',
+                    'res_model': 'sale.order',
+                    'view_id': False,
+                    'type': 'ir.actions.act_window',
+                    'res_id':new_ids
+                    }
+            return value
+
+    _columns = {
+                'shop_id': fields.many2one('sale.shop', 'Shop', required = True),
+                'partner_id': fields.many2one('res.partner', 'Customer',  required = True,  help = 'Use this partner if there is no partner on the case'),
+                'picking_policy': fields.selection([('direct','Direct Delivery'),
+                                                    ('one','All at once')], 'Picking Policy', required = True),
+                'product_ids': fields.many2many('product.product', 'product_sale_rel',\
+                                 'sale_id', 'product_id', 'Products'),
+                'analytic_account': fields.many2one('account.analytic.account', 'Analytic Account'),   
+                'close': fields.boolean('Close Case', help = 'Check this to close the case after having created the sale order.'),              
+               }
+    _defaults = {
+                 'partner_id': _selectPartner,
+                 'close': lambda *a: 1
+                 }
+    
+crm_make_sale()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_crm/wizard/makesale.py b/addons/sale_crm/wizard/makesale.py
deleted file mode 100644
index 780634e62e4..00000000000
--- a/addons/sale_crm/wizard/makesale.py
+++ /dev/null
@@ -1,174 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from mx.DateTime import now
-
-import wizard
-import netsvc
-import ir
-import pooler
-from tools.translate import _
-
-sale_form = """<?xml version="1.0"?>
-<form string="Convert to Quote">
-    <field name="partner_id" required="True"/>
-    <field name="shop_id" required="True"/>
-    <field name="analytic_account"/>
-    <field name="picking_policy" required="True"/>
-    <field name="close"/>
-    <newline/>
-    <field name="products" colspan="4"/>
-</form>"""
-
-sale_fields = {
-    'shop_id': {'string': 'Shop', 'type': 'many2one', 'relation': 'sale.shop'},
-    'partner_id': {'string': 'Customer', 'type': 'many2one',
-        'relation': 'res.partner',
-        'help': 'Use this partner if there is no partner on the case'},
-    'picking_policy': {'string': 'Picking Policy', 'type': 'selection',
-        'selection': [('direct','Direct Delivery'),('one','All at once')]},
-    'products': {'string': 'Products', 'type': 'many2many',
-        'relation': 'product.product'},
-    'analytic_account': {'string': 'Analytic Account', 'type': 'many2one',
-        'relation': 'account.analytic.account'},
-    'close': {'string': 'Close Case', 'type': 'boolean', 'default': lambda *a: 1,
-        'help': 'Check this to close the case after having created the sale order.'},
-}
-
-
-class make_sale(wizard.interface):
-
-    def _selectPartner(self, cr, uid, data, context):
-        case_obj = pooler.get_pool(cr.dbname).get('crm.lead')
-        case = case_obj.read(cr, uid, data['ids'], ['partner_id'])
-        return {'partner_id': case[0]['partner_id']}
-
-    def _makeOrder(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        mod_obj = pool.get('ir.model.data')
-        result = mod_obj._get_id(cr, uid, 'sale', 'view_sales_order_filter')
-        id = mod_obj.read(cr, uid, result, ['res_id'])
-        case_obj = pool.get('crm.lead')
-        sale_obj = pool.get('sale.order')
-        partner_obj = pool.get('res.partner')
-        sale_line_obj = pool.get('sale.order.line')
-
-        default_partner_addr = partner_obj.address_get(cr, uid, [data['form']['partner_id']],
-                ['invoice', 'delivery', 'contact'])
-        default_pricelist = partner_obj.browse(cr, uid, data['form']['partner_id'],
-                    context).property_product_pricelist.id
-        fpos_data = partner_obj.browse(cr, uid, data['form']['partner_id'],context).property_account_position
-        new_ids = []
-
-        for case in case_obj.browse(cr, uid, data['ids']):
-            if case.partner_id and case.partner_id.id:
-                partner_id = case.partner_id.id
-                fpos = case.partner_id.property_account_position and case.partner_id.property_account_position.id or False
-                partner_addr = partner_obj.address_get(cr, uid, [case.partner_id.id],
-                        ['invoice', 'delivery', 'contact'])
-                pricelist = partner_obj.browse(cr, uid, case.partner_id.id,
-                        context).property_product_pricelist.id
-            else:
-                partner_id = data['form']['partner_id']
-                fpos = fpos_data and fpos_data.id or False
-                partner_addr = default_partner_addr
-                pricelist = default_pricelist
-
-            if False in partner_addr.values():
-                raise wizard.except_wizard(_('Data Insufficient!'),_('Customer has no addresses defined!'))
-
-            vals = {
-                'origin': 'CRM-Opportunity:%s' % str(case.id),
-                'section_id': case.section_id and case.section_id.id or False,
-                'picking_policy': data['form']['picking_policy'],
-                'shop_id': data['form']['shop_id'],
-                'partner_id': partner_id,
-                'pricelist_id': pricelist,
-                'partner_invoice_id': partner_addr['invoice'],
-                'partner_order_id': partner_addr['contact'],
-                'partner_shipping_id': partner_addr['delivery'],
-                'order_policy': 'manual',
-                'date_order': now(),
-                'fiscal_position': fpos,
-            }
-
-            if partner_id:
-                partner = partner_obj.browse(cr, uid, partner_id, context=context)
-                vals['user_id'] = partner.user_id and partner.user_id.id or uid
-
-            if data['form']['analytic_account']:
-                vals['project_id'] = data['form']['analytic_account']
-            new_id = sale_obj.create(cr, uid, vals)
-            for product_id in data['form']['products'][0][2]:
-                value = sale_line_obj.product_id_change(cr, uid, [], pricelist,
-                        product_id, qty=1, partner_id=partner_id, fiscal_position=fpos)['value']
-                value['product_id'] = product_id
-                value['order_id'] = new_id
-                value['tax_id'] = [(6,0,value['tax_id'])]
-                sale_line_obj.create(cr, uid, value)
-
-            case_obj.write(cr, uid, [case.id], {'ref': 'sale.order,%s' % new_id})
-            new_ids.append(new_id)
-
-        if data['form']['close']:
-            case_obj.case_close(cr, uid, data['ids'])
-        
-        if not new_ids:
-            return {}
-            
-        if len(new_ids)<=1:
-            value = {
-                'domain': str([('id', 'in', new_ids)]),
-                'view_type': 'form',
-                'view_mode': 'form',
-                'res_model': 'sale.order',
-                'view_id': False,
-                'type': 'ir.actions.act_window',
-                'res_id': new_ids and new_ids[0]
-            }
-        else:
-            value = {
-                'domain': str([('id', 'in', new_ids)]),
-                'view_type': 'form',
-                'view_mode': 'tree,form',
-                'res_model': 'sale.order',
-                'view_id': False,
-                'type': 'ir.actions.act_window',
-                'res_id':new_ids
-                }
-                
-        return value
-
-    states = {
-        'init': {
-            'actions': [_selectPartner],
-            'result': {'type': 'form', 'arch': sale_form, 'fields': sale_fields,
-                'state' : [('end', 'Cancel', 'gtk-cancel'),('order', 'Create Quote', 'gtk-go-forward')]}
-        },
-        'order': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _makeOrder, 'state': 'end'}
-        }
-    }
-
-make_sale('crm.opportunity.make_order')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From f1a879937d532d1f9a2f4ddd4d5219d665cef854 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Mon, 17 May 2010 10:28:46 +0530
Subject: [PATCH 002/121] [ADD]: sale_crm: add sale_crm wizard view file.

bzr revid: atp@tinyerp.co.in-20100517045846-8gttxjnuuqwp90wa
---
 addons/sale_crm/wizard/crm_make_sale_view.xml | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 addons/sale_crm/wizard/crm_make_sale_view.xml

diff --git a/addons/sale_crm/wizard/crm_make_sale_view.xml b/addons/sale_crm/wizard/crm_make_sale_view.xml
new file mode 100644
index 00000000000..64b0585fb25
--- /dev/null
+++ b/addons/sale_crm/wizard/crm_make_sale_view.xml
@@ -0,0 +1,43 @@
+<openerp>
+   <data>
+
+        <!-- crm make sale's view -->
+
+       <record id="view_crm_make_sale" model="ir.ui.view">
+          <field name="name">crm.make.sale.form</field>
+          <field name="model">crm.make.sale</field>
+          <field name="type">form</field>
+          <field name="arch" type="xml">
+              <form string="Create a Sale Order" >
+                	<group colspan="4">
+	                	<field name="partner_id"/>
+	                	<field name="shop_id"/>
+	                	<field name="analytic_account"/>
+	                	<field name="picking_policy"/>
+	                	<field name="close"/>
+	                </group>
+	                <separator string="Products" colspan="4"/>
+	                <field name="product_ids" colspan="4" nolabel="1"/>
+                <separator colspan="4"/>
+                <group col="4" colspan="4">
+                    <label string="" colspan="2"/>
+                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    <button name="makeOrder" string="Create" type="object" icon='gtk-go-forward'/>
+                </group>
+            </form>
+          </field>
+       </record>
+       
+       <!-- crm make sale's  action -->
+       
+       <record id="action_crm_make_sale" model="ir.actions.act_window">
+          <field name="name">Make Quotation</field>
+          <field name="type">ir.actions.act_window</field>
+          <field name="res_model">crm.make.sale</field>
+          <field name="view_type">form</field>
+          <field name="view_mode">form</field>
+          <field name="target">new</field>
+       </record>
+       
+   </data>
+</openerp>

From a5970cd47646f7c9daba5f2287157bc65e86a425 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Wed, 19 May 2010 15:40:19 +0530
Subject: [PATCH 003/121] [IMP]: sale_crm: change label  in Picking_policy
 selection field.

bzr revid: atp@tinyerp.co.in-20100519101019-94ny803ferkw9z6i
---
 addons/sale_crm/wizard/crm_make_sale.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index 3563f45aa51..9807274b63f 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -163,8 +163,8 @@ class crm_make_sale(osv.osv_memory):
     _columns = {
                 'shop_id': fields.many2one('sale.shop', 'Shop', required = True),
                 'partner_id': fields.many2one('res.partner', 'Customer',  required = True,  help = 'Use this partner if there is no partner on the case'),
-                'picking_policy': fields.selection([('direct','Direct Delivery'),
-                                                    ('one','All at once')], 'Picking Policy', required = True),
+                'picking_policy': fields.selection([('direct','Partial Delivery'),
+                                                    ('one','Complete Delivery')], 'Picking Policy', required = True),
                 'product_ids': fields.many2many('product.product', 'product_sale_rel',\
                                  'sale_id', 'product_id', 'Products'),
                 'analytic_account': fields.many2one('account.analytic.account', 'Analytic Account'),   

From 62bfe8dcaf77b651103cb71c929684b388cc5563 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Mon, 31 May 2010 19:21:33 +0530
Subject: [PATCH 004/121] [ADD]: audittrail: product backlog -621 :Apply log
 detail for action in audittrail

bzr revid: ksa@tinyerp.co.in-20100531135133-jhbej4htfiqfj5fe
---
 addons/audittrail/audittrail.py       | 288 +++++++++++++++++++-------
 addons/audittrail/audittrail_view.xml | 140 +++++++------
 addons/audittrail/i18n/it.po          |   4 -
 3 files changed, 289 insertions(+), 143 deletions(-)

diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index 16041889575..d6badfd7c46 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -25,6 +25,7 @@ from tools.translate import _
 import ir
 import pooler
 import time
+import tools
 
 class audittrail_rule(osv.osv):
     """
@@ -33,25 +34,28 @@ class audittrail_rule(osv.osv):
     _name = 'audittrail.rule'
     _description = "Audittrail Rule"
     _columns = {
-        "name": fields.char("Rule Name", size=32, required=True), 
-        "object_id": fields.many2one('ir.model', 'Object', required=True), 
-        "user_id": fields.many2many('res.users', 'audittail_rules_users', 
-                                            'user_id', 'rule_id', 'Users', help="if  User is not added then it will applicable for all users"), 
-        "log_read": fields.boolean("Log reads"), 
-        "log_write": fields.boolean("Log writes"), 
-        "log_unlink": fields.boolean("Log deletes"), 
-        "log_create": fields.boolean("Log creates"), 
-        "state": fields.selection((("draft", "Draft"), 
-                                   ("subscribed", "Subscribed")), 
-                                   "State", required=True), 
-        "action_id": fields.many2one('ir.actions.act_window', "Action ID"), 
+        "name": fields.char("Rule Name", size=32, required=True),
+        "object_id": fields.many2one('ir.model', 'Object', required=True),
+        "user_id": fields.many2many('res.users', 'audittail_rules_users',
+                                            'user_id', 'rule_id', 'Users', help="if  User is not added then it will applicable for all users"),
+        "log_read": fields.boolean("Log Reads"),
+        "log_write": fields.boolean("Log Writes"),
+        "log_unlink": fields.boolean("Log Deletes"),
+        "log_create": fields.boolean("Log Creates"),
+        "log_action": fields.boolean("Log Action"),
+        "log_workflow": fields.boolean("Log Workflow"),
+        "state": fields.selection((("draft", "Draft"),
+                                   ("subscribed", "Subscribed")),
+                                   "State", required=True),
+        "action_id": fields.many2one('ir.actions.act_window', "Action ID"),
+
     }
 
     _defaults = {
-        'state': lambda *a: 'draft', 
-        'log_create': lambda *a: 1, 
-        'log_unlink': lambda *a: 1, 
-        'log_write': lambda *a: 1, 
+        'state': lambda *a: 'draft',
+        'log_create': lambda *a: 1,
+        'log_unlink': lambda *a: 1,
+        'log_write': lambda *a: 1,
     }
 
     _sql_constraints = [
@@ -65,7 +69,7 @@ class audittrail_rule(osv.osv):
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of Auddittrail Rule’s IDs.
-        @return: True 
+        @return: True
         """
         obj_action = self.pool.get('ir.actions.act_window')
         obj_model = self.pool.get('ir.model.data')
@@ -74,13 +78,13 @@ class audittrail_rule(osv.osv):
             obj = self.pool.get(thisrule.object_id.model)
             if not obj:
                 raise osv.except_osv(
-                        _('WARNING: audittrail is not part of the pool'), 
+                        _('WARNING: audittrail is not part of the pool'),
                         _('Change audittrail depends -- Setting rule as DRAFT'))
                 self.write(cr, uid, [thisrule.id], {"state": "draft"})
             val = {
-                 "name": 'View Log', 
-                 "res_model": 'audittrail.log', 
-                 "src_model": thisrule.object_id.model, 
+                 "name": 'View Log',
+                 "res_model": 'audittrail.log',
+                 "src_model": thisrule.object_id.model,
                  "domain": "[('object_id','=', " + str(thisrule.object_id.id) + "), ('res_id', '=', active_id)]"
 
             }
@@ -98,7 +102,7 @@ class audittrail_rule(osv.osv):
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of Auddittrail Rule’s IDs.
-        @return: True 
+        @return: True
         """
         obj_action = self.pool.get('ir.actions.act_window')
         val_obj = self.pool.get('ir.values')
@@ -128,16 +132,19 @@ class audittrail_log(osv.osv):
     _description = "Audittrail Log"
 
     _columns = {
-        "name": fields.char("Name", size=32), 
-        "object_id": fields.many2one('ir.model', 'Object'), 
-        "user_id": fields.many2one('res.users', 'User'), 
-        "method": fields.selection((('read', 'Read'), 
-                                    ('write', 'Write'), 
-                                    ('unlink', 'Delete'), 
-                                    ('create', 'Create')), "Method"), 
-        "timestamp": fields.datetime("Date"), 
-        "res_id": fields.integer('Resource Id'), 
-        "line_ids": fields.one2many('audittrail.log.line', 'log_id', 'Log lines'), 
+        "name": fields.char("Name", size=32),
+        "object_id": fields.many2one('ir.model', 'Object'),
+        "user_id": fields.many2one('res.users', 'User'),
+        "method": fields.selection((('read', 'Read'),
+                                    ('write', 'Write'),
+                                    ('unlink', 'Delete'),
+                                    ('create', 'Create'),
+                                    ('action','Action'),
+                                    ('workflow','Workflow')), "Method"),
+        "timestamp": fields.datetime("Date"),
+        "res_id": fields.integer('Resource Id'),
+        "method_name": fields.char("Method Name", size=32),
+        "line_ids": fields.one2many('audittrail.log.line', 'log_id', 'Log lines'),
     }
 
     _defaults = {
@@ -155,14 +162,14 @@ class audittrail_log_line(osv.osv):
     _name = 'audittrail.log.line'
     _description = "Log Line"
     _columns = {
-          'field_id': fields.many2one('ir.model.fields', 'Fields', required=True), 
-          'log_id': fields.many2one('audittrail.log', 'Log'), 
-          'log': fields.integer("Log ID"), 
-          'old_value': fields.text("Old Value"), 
-          'new_value': fields.text("New Value"), 
-          'old_value_text': fields.text('Old value Text'), 
-          'new_value_text': fields.text('New value Text'), 
-          'field_description': fields.char('Field Description', size=64), 
+          'field_id': fields.many2one('ir.model.fields', 'Fields', required=True),
+          'log_id': fields.many2one('audittrail.log', 'Log'),
+          'log': fields.integer("Log ID"),
+          'old_value': fields.text("Old Value"),
+          'new_value': fields.text("New Value"),
+          'old_value_text': fields.text('Old value Text'),
+          'new_value_text': fields.text('New value Text'),
+          'field_description': fields.char('Field Description', size=64),
         }
 
 audittrail_log_line()
@@ -170,7 +177,7 @@ audittrail_log_line()
 
 class audittrail_objects_proxy(osv_pool):
     """ Uses Object proxy for auditing changes on object of subscribed Rules"""
-    
+
     def get_value_text(self, cr, uid, field_name, values, object, context=None):
         """
         Gets textual values for the fields
@@ -178,9 +185,9 @@ class audittrail_objects_proxy(osv_pool):
 
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param field_name: List of fields for text values 
-        @param values: Values for field to be converted into textual values  
-        @return: values: List of textual values for given fields 
+        @param field_name: List of fields for text values
+        @param values: Values for field to be converted into textual values
+        @return: values: List of textual values for given fields
         """
         if not context:
             context = {}
@@ -226,7 +233,6 @@ class audittrail_objects_proxy(osv_pool):
         @param object: Object who's values are being changed
         @param lines: List of values for line is to be created
         """
-        
         pool = pooler.get_pool(cr.dbname)
         obj = pool.get(object.model)
         #start Loop
@@ -242,7 +248,7 @@ class audittrail_objects_proxy(osv_pool):
                 new_value = 'new_value' in line and  line['new_value'] or ''
                 old_value_text = 'old_value_text' in line and  line['old_value_text'] or ''
                 new_value_text = 'new_value_text' in line and  line['new_value_text'] or ''
-                
+
                 if old_value_text == new_value_text:
                     continue
                 if fields[0]['ttype'] == 'many2one':
@@ -251,12 +257,12 @@ class audittrail_objects_proxy(osv_pool):
                     if type(new_value) == tuple:
                         new_value = new_value[0]
                 vals = {
-                        "log_id": id, 
-                        "field_id": f_id[0], 
-                        "old_value": old_value, 
-                        "new_value": new_value, 
-                        "old_value_text": old_value_text, 
-                        "new_value_text": new_value_text, 
+                        "log_id": id,
+                        "field_id": f_id[0],
+                        "old_value": old_value,
+                        "new_value": new_value,
+                        "old_value_text": old_value_text,
+                        "new_value_text": new_value_text,
                         "field_description": fields[0]['field_description']
                         }
                 line_id = pool.get('audittrail.log.line').create(cr, uid, vals)
@@ -264,22 +270,25 @@ class audittrail_objects_proxy(osv_pool):
                 #End Loop
         return True
 
+
     def log_fct(self, db, uid, object, method, fct_src, *args):
         """
         Logging function: This function is performs logging oprations according to method
         @param db: the current database
         @param uid: the current user’s ID for security checks,
         @param object: Object who's values are being changed
-        @param method: method to log: create, read, write, unlink 
+        @param method: method to log: create, read, write, unlink
         @param fct_src: execute method of Object proxy
-        
-        @return: Returns result as per method of Object proxy 
+
+        @return: Returns result as per method of Object proxy
         """
         logged_uids = []
+        res2 = args
         pool = pooler.get_pool(db)
         cr = pooler.get_db(db).cursor()
         obj_ids = pool.get('ir.model').search(cr, uid, [('model', '=', object)])
         model_object = pool.get('ir.model').browse(cr, uid, obj_ids)[0]
+
         if method in ('create'):
             res_id = fct_src(db, uid, object, method, *args)
             cr.commit()
@@ -290,9 +299,9 @@ class audittrail_objects_proxy(osv_pool):
                 resource_name = pool.get(model_object.model).name_get(cr, uid, [res_id])
                 resource_name = resource_name and resource_name[0][1] or ''
                 vals = {
-                        "method": method, 
-                        "object_id": model_object.id, 
-                        "user_id": uid, "res_id": res_id, 
+                        "method": method,
+                        "object_id": model_object.id,
+                        "user_id": uid, "res_id": res_id,
                         "name": resource_name
                         }
                 id = pool.get('audittrail.log').create(cr, uid, vals)
@@ -300,8 +309,8 @@ class audittrail_objects_proxy(osv_pool):
                 for field in new_value:
                     if new_value[field]:
                         line = {
-                              'name': field, 
-                              'new_value': new_value[field], 
+                              'name': field,
+                              'new_value': new_value[field],
                               'new_value_text': self.get_value_text(cr, uid, field, new_value[field], model_object)
                               }
                         lines.append(line)
@@ -329,10 +338,10 @@ class audittrail_objects_proxy(osv_pool):
                         for field in args[1].keys():
                             if args[1].keys():
                                 line = {
-                                      'name': field, 
-                                      'new_value': field in new_values and new_values[field] or '', 
-                                      'old_value': field in old_values and old_values[field] or '', 
-                                      'new_value_text': self.get_value_text(cr, uid, field, new_values[field], model_object), 
+                                      'name': field,
+                                      'new_value': field in new_values and new_values[field] or '',
+                                      'old_value': field in old_values and old_values[field] or '',
+                                      'new_value_text': self.get_value_text(cr, uid, field, new_values[field], model_object),
                                       'old_value_text': old_values_text[field]
                                       }
                                 lines.append(line)
@@ -360,8 +369,8 @@ class audittrail_objects_proxy(osv_pool):
                     for field in old_values[res_id]:
                         if old_values[res_id][field]:
                             line = {
-                                      'name': field, 
-                                      'old_value': old_values[res_id][field], 
+                                      'name': field,
+                                      'old_value': old_values[res_id][field],
                                       'old_value_text': self.get_value_text(cr, uid, field, old_values[res_id][field], model_object)
                                       }
                             lines.append(line)
@@ -385,8 +394,8 @@ class audittrail_objects_proxy(osv_pool):
                     for field in old_values[res_id]:
                         if old_values[res_id][field]:
                             line = {
-                                  'name': field, 
-                                  'old_value': old_values[res_id][field], 
+                                  'name': field,
+                                  'old_value': old_values[res_id][field],
                                   'old_value_text': self.get_value_text(cr, uid, field, old_values[res_id][field], model_object)
                                   }
                             lines.append(line)
@@ -397,16 +406,61 @@ class audittrail_objects_proxy(osv_pool):
             return res
         cr.close()
 
+    def log_action(self, db, uid, object, method, fct_src, *args):
+        """
+        Logging function: This function is performs logging oprations according to method
+        @param db: the current database
+        @param uid: the current user’s ID for security checks,
+        @param object: Object who's values are being changed
+        @param method: method to log: create, read, write, unlink
+        @param fct_src: execute method of Object proxy
+
+        @return: Returns result as per method of Object proxy
+        """
+
+        logged_uids = []
+        pool = pooler.get_pool(db)
+        cr = pooler.get_db(db).cursor()
+        obj_ids = pool.get('ir.model').search(cr, uid, [('model', '=', object)])
+        model_object = pool.get('ir.model').browse(cr, uid, obj_ids)[0]
+
+        res_ids = args[0]
+        old_values = {}
+        for res_id in res_ids:
+            old_values[res_id] = pool.get(model_object.model).read(cr, uid, res_id, [])
+
+        for res_id in res_ids:
+            if not logged_uids or uid in logged_uids:
+                resource_name = pool.get(model_object.model).name_get(cr, uid, [res_id])
+                resource_name = resource_name and resource_name[0][1] or ''
+                id = pool.get('audittrail.log').create(cr, uid, {"method": 'action', "object_id": model_object.id, "user_id": uid, "res_id": res_id, "name": resource_name, "method_name": method})
+                lines = []
+                for field in old_values[res_id]:
+                    if old_values[res_id][field]:
+                        line = {
+                              'name': field,
+                              'old_value': old_values[res_id][field],
+                              'old_value_text': self.get_value_text(cr, uid, field, old_values[res_id][field], model_object)
+                              }
+                        lines.append(line)
+                cr.commit()
+                self.create_log_line(cr, uid, id, model_object, lines)
+            res = fct_src(db, uid, object, method, *args)
+            cr.close()
+            return res
+        cr.close()
+
     def execute(self, db, uid, object, method, *args, **kw):
         """
         Overrides Object Proxy execute method
         @param db: the current database
         @param uid: the current user’s ID for security checks,
         @param object: Object who's values are being changed
-        @param method: method to log: create, read, write, unlink 
-        
-        @return: Returns result as per method of Object proxy 
+        @param method: method to log: create, read, write, unlink
+
+        @return: Returns result as per method of Object proxy
         """
+
         pool = pooler.get_pool(db)
         cr = pooler.get_db(db).cursor()
         cr.autocommit(True)
@@ -433,13 +487,105 @@ class audittrail_objects_proxy(osv_pool):
                     logged_uids.append(user.id)
                 if not logged_uids or uid in logged_uids:
                     if field in ('read', 'write', 'create', 'unlink'):
+
                         if getattr(thisrule, 'log_' + field):
                             return self.log_fct(db, uid, object, method, fct_src, *args)
+
+                    elif field not in ('default_get','read','fields_view_get','fields_get','search','search_count','name_search','name_get','get','request_get', 'get_sc', 'unlink') and (field != 'write' and field != 'create'):
+                        if thisrule.log_action:
+                            return self.log_action(db, uid, object, method, fct_src, *args)
                 return fct_src(db, uid, object, method, *args)
         res = my_fct(db, uid, object, method, *args)
         cr.close()
         return res
 
+
+    def workflow_log(self, db, uid, object, method,*args, **argv):
+        """
+        Logging function: This function is performs logging oprations according to method
+        @param db: the current database
+        @param uid: the current user’s ID for security checks,
+        @param object: Object who's values are being changed
+        @param method: method to log: create, read, write, unlink
+        @param fct_src: execute method of Object proxy
+
+        @return: Returns result as per method of Object proxy
+        """
+
+        logged_uids = []
+        pool = pooler.get_pool(db)
+        cr = pooler.get_db(db).cursor()
+        obj_ids = pool.get('ir.model').search(cr, uid, [('model', '=', object)])
+        model_object = pool.get('ir.model').browse(cr, uid, obj_ids)[0]
+
+        workflow_obj = pool.get('workflow')
+        wkf_ids = workflow_obj.search(cr, uid, [('osv', '=', object)])
+        wkf_name= workflow_obj.browse(cr, uid, wkf_ids)[0].name
+
+        res_id = args[0]
+        old_values_text = {}
+        old_values = pool.get(model_object.model).read(cr, uid, res_id)
+        for field in old_values.keys():
+            old_values_text[field] = self.get_value_text(cr, uid, field, old_values[field], model_object)
+
+        res = super(audittrail_objects_proxy, self).exec_workflow(db, uid, object, method, *args, **argv)
+        cr.commit()
+        new_values = pool.get(model_object.model).read(cr, uid, res_id)
+
+        resource_name = pool.get(model_object.model).name_get(cr, uid, [args[0]])
+        resource_name = resource_name and resource_name[0][1] or ''
+        l_id = pool.get('audittrail.log').create(cr, uid, {"method": 'workflow', "object_id": model_object.id, "user_id": uid, "res_id": args[0], "name": resource_name +"/"+ wkf_name })
+        lines = []
+        diff = {}
+        log_line_pool = pool.get('audittrail.log.line')
+
+        for field in old_values.keys():
+            if old_values[field] == new_values[field]:
+                continue
+            else:
+                diff.update({field: (old_values[field], new_values[field])})
+                f_id = pool.get('ir.model.fields').search(cr, uid, [('name', '=', field), ('model_id', '=', model_object.id)])
+                log_line_pool.create(cr, uid, {'field_id': f_id[0], 'log_id': l_id, \
+                                'old_value': str(old_values[field]),\
+                                 'new_value': str(new_values[field]),\
+                                 'old_value_text':str(old_values_text[field]),
+                                 'new_value_text':self.get_value_text(cr, uid, field, new_values[field], model_object),
+                                 })
+        cr.commit()
+        cr.close()
+        return res
+
+
+    def exec_workflow(self, db, uid, object, method, *args, **argv):
+        pool = pooler.get_pool(db)
+        cr = pooler.get_db(db).cursor()
+        cr.autocommit(True)
+        logged_uids = []
+        fct_src = super(audittrail_objects_proxy, self).execute
+        field = method
+        rule = False
+        obj_ids = pool.get('ir.model').search(cr, uid, [('model', '=', object)])
+        for obj_name in pool.obj_list():
+            if obj_name == 'audittrail.rule':
+                rule = True
+        if not rule:
+            return super(audittrail_objects_proxy, self).exec_workflow(db, uid, object, method, *args, **argv)
+        if not obj_ids:
+            return super(audittrail_objects_proxy, self).exec_workflow(db, uid, object, method, *args, **argv)
+        rule_ids = pool.get('audittrail.rule').search(cr, uid, [('object_id', '=', obj_ids[0]), ('state', '=', 'subscribed')])
+        if not rule_ids:
+             res = super(audittrail_objects_proxy, self).exec_workflow(db, uid, object, method, *args, **argv)
+
+        for thisrule in pool.get('audittrail.rule').browse(cr, uid, rule_ids):
+            for user in thisrule.user_id:
+                logged_uids.append(user.id)
+            if not logged_uids or uid in logged_uids:
+                 if thisrule.log_workflow:
+                     return self.workflow_log(db, uid, object, method, *args,**argv)
+            return super(audittrail_objects_proxy, self).exec_workflow(db, uid, object, method, *args, **argv)
+
+        cr.close()
+
 audittrail_objects_proxy()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index c8999e78774..d269624f3ca 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -12,10 +12,12 @@
                 <form string="AuditTrail Rule">
                     <field name="name" select="1" required="1"/>
                     <field name="object_id" select="1"/>
-                    <field name="log_read" />
-                    <field name="log_write" />
-                    <field name="log_unlink" />
-                    <field name="log_create" />
+                    <field name="log_read"/>
+                    <field name="log_write"/>
+                    <field name="log_unlink"/>
+                    <field name="log_create"/>
+                    <field name="log_action"/>
+                    <field name="log_workflow"/>
                     <separator string="Users (if User is not added then it will applicable for all users)"  colspan="4" />
                     <field name="user_id" select="1" colspan="4" nolabel="1" />
                     <field name="action_id" colspan="4" readonly="1" groups="base.group_extended"/>
@@ -38,49 +40,48 @@
                 <tree string="AuditTrail Rules">
                     <field name="name" />
                     <field name="object_id"/>
-                    <field name="user_id"/>
+                    <field name="user_id" />
                     <field name="log_read" />
                     <field name="log_write" />
                     <field name="log_unlink" />
                     <field name="log_create" />
+                     <field name="log_action"/>
+                    <field name="log_workflow"/>
                     <field name="state" />
-                    <button string="Subscribe" name="subscribe"
-                            type="object" states="draft" icon="gtk-go-forward"/>
                 </tree>
             </field>
         </record>
-        
-        <!-- Audittrail rule  Search View -->
 
-	    <record id="view_audittrail_rule_filter" model="ir.ui.view">
-	        <field name="name">Audittrail-rule Search</field>
-	        <field name="model">audittrail.rule</field>
-	        <field name="type">search</field>
-	        <field name="arch" type="xml">
-	            <search string="Search rule">
-	            	<group>
-		                <filter icon="terp-project"
-		                    string="Draft"
-		                    domain="[('state','=','draft')]"/>
-		                <filter icon="terp-project"
-		                    name="subscribed"
-		                    string="Subscribed"
-		                    domain="[('state','=','subscribed')]"/>
-		                <separator orientation="vertical"/>
-		                <field name="name"/>
-		                <field name="object_id" widget="selection"/>
-		                <field name="user_id" widget="selection"/>
-		            </group>    
-	                <newline/>
-	                <group expand="1" string="Group By..." colspan="14">
-	                    <filter string="State" icon="terp-crm" domain="[]" context="{'group_by':'state'}"/>
-	                    <filter string="Object" icon="terp-crm" domain="[]" context="{'group_by':'object_id'}"/>
-	                </group>
- 					<newline/>	                
-	            </search>
-	        </field>
-	    </record>
-	    
+        <!-- Audittrail rule  Search View -->
+        <record id="view_audittrail_rule_filter" model="ir.ui.view">
+            <field name="name">Audittrail-rule Search</field>
+            <field name="model">audittrail.rule</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search rule">
+                    <group>
+                        <filter icon="terp-project"
+                            string="Draft"
+                            domain="[('state','=','draft')]"/>
+                        <filter icon="terp-project"
+                            name="subscribed"
+                            string="Subscribed"
+                            domain="[('state','=','subscribed')]"/>
+                        <separator orientation="vertical"/>
+                        <field name="name"/>
+                        <field name="object_id" widget="selection"/>
+                        <field name="user_id" widget="selection"/>
+                    </group>
+                    <newline/>
+                    <group expand="1" string="Group By..." colspan="14">
+                        <filter string="State" icon="terp-crm" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Object" icon="terp-crm" domain="[]" context="{'group_by':'object_id'}"/>
+                    </group>
+                    <newline/>
+                </search>
+            </field>
+        </record>
+
     <!-- Action for audittrail rule -->
 
         <record model="ir.actions.act_window" id="action_audittrail_rule_tree">
@@ -89,7 +90,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-           <field name="search_view_id" ref="view_audittrail_rule_filter"/>
+            <!--<field name="view_id" ref="view_audittrail_rule_form" />-->
         </record>
 
         <menuitem name="Audittrails" id="menu_action_audittrail"
@@ -117,22 +118,24 @@
             <field name="arch" type="xml">
                 <form string="AuditTrail Logs">
                     <field name="timestamp" select="1" required="1" readonly="1"/>
-                    <field name="object_id" select="1" readonly="1"/>
-                    <field name="method" select="1" readonly="1"/>
                     <field name="user_id" select="1" readonly="1"/>
-                    <field name="res_id" readonly="1"/>
+                    <field name="method" select="1" readonly="1"/>
                     <field name="name" readonly="1" select="1"/>
+                    <field name="res_id" readonly="1"/>
+                    <field name="object_id" select="1" readonly="1"/>
+                    <field name="method_name" select="1" readonly="1"/>
                     <field name="line_ids" colspan="4" mode="tree,form"
-                        widget="one2many_list" readonly="1" nolabel="1">
+                        widget="one2many_list" readonly="1">
                         <form string="Log Lines">
-                            <group colspan="4" col="2">       
-                            <field name="field_id" 
+                            <group colspan="4" col="2">
+                            <field name="field_id"
                                 readonly="1" colspan="4"/>
                             <newline />
-                            <field name="field_description" 
+                            <field name="field_description"
                                 readonly="1" colspan="4"/>
                             <newline />
                             </group>
+
                             <separator string="Old Value : "
                                 colspan="2" />
                             <separator string="New Value : "
@@ -178,31 +181,31 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_audittrail_log_filter" model="ir.ui.view">
-	        <field name="name">Audittrail-log Search</field>
-	        <field name="model">audittrail.log</field>
-	        <field name="type">search</field>
-	        <field name="arch" type="xml">
-	            <search string="Search log">
-	            	<group>
+            <field name="name">Audittrail-log Search</field>
+            <field name="model">audittrail.log</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search log">
+                    <group>
                     <field name="timestamp" />
                     <field name="name" />
                     <field name="object_id" widget="selection"/>
                     <field name="method" />
                     <field name="user_id" widget="selection"/>
-		            </group>    
-	                <newline/>
-	                 <group expand="1" string="Group By..." colspan="14">
-	              		<filter string="Log Date" icon="terp-crm" domain="[]" context="{'group_by':'timestamp'}"/>
-	              		<filter string="Log Method" icon="terp-crm" domain="[]" context="{'group_by':'method'}"/>	   
-	                    <filter string="Object" icon="terp-crm" domain="[]" context="{'group_by':'object_id'}"/>
-	                    <filter string="User" icon="terp-partner" name="user" domain="[]" context="{'group_by':'user_id'}"/>
-	                </group>
- 					<newline/>	                
-	            </search>
-	        </field>
-	    </record>
+                    </group>
+                    <newline/>
+                     <group expand="1" string="Group By..." colspan="14">
+                        <filter string="Log Date" icon="terp-crm" domain="[]" context="{'group_by':'timestamp'}"/>
+                        <filter string="Log Method" icon="terp-crm" domain="[]" context="{'group_by':'method'}"/>
+                        <filter string="Object" icon="terp-crm" domain="[]" context="{'group_by':'object_id'}"/>
+                        <filter string="User" icon="terp-partner" name="user" domain="[]" context="{'group_by':'user_id'}"/>
+                    </group>
+                    <newline/>
+                </search>
+            </field>
+        </record>
 
 <!--  Action for Audittrail Log  -->
 
@@ -210,12 +213,13 @@
             <field name="name">Logs</field>
             <field name="res_model">audittrail.log</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="search_view_id" ref="view_audittrail_log_filter"/>
         </record>
-        
         <menuitem name="Logs" id="menu_action_audittrail_log_tree"
             action="action_audittrail_log_tree" parent="menu_action_audittrail" />
 
+        <!--  <wizard string="View log" menu="False" model="audittrail.log" name="audittrail.view.log" id="wizard_audittrail_log"/>-->
+        <menuitem name="View Logs" id="menu_action_log_tree2"
+            action="action_audittrail_view_log" parent="menu_action_audittrail" />
+
     </data>
 </openerp>
diff --git a/addons/audittrail/i18n/it.po b/addons/audittrail/i18n/it.po
index f795546b2fe..08587530a61 100644
--- a/addons/audittrail/i18n/it.po
+++ b/addons/audittrail/i18n/it.po
@@ -13,11 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-<<<<<<< TREE
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
-=======
 "X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
->>>>>>> MERGE-SOURCE
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail

From b0bd8bce74ed46d7287c58778416cba6b903eaa7 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Tue, 1 Jun 2010 11:38:21 +0530
Subject: [PATCH 005/121] [IMP] Remove conflict

bzr revid: ksa@tinyerp.co.in-20100601060821-15gm6j5jqgn3nhss
---
 addons/account/i18n/cs.po         | 4 ----
 addons/account_payment/i18n/cs.po | 4 ----
 addons/base_contact/i18n/ko.po    | 4 ----
 addons/crm/i18n/fi.po             | 4 ----
 addons/hr_timesheet/i18n/de.po    | 4 ----
 addons/report_purchase/i18n/ko.po | 4 ----
 addons/scrum/i18n/ko.po           | 4 ----
 7 files changed, 28 deletions(-)

diff --git a/addons/account/i18n/cs.po b/addons/account/i18n/cs.po
index be9a9612f42..09125a2706f 100644
--- a/addons/account/i18n/cs.po
+++ b/addons/account/i18n/cs.po
@@ -13,11 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-<<<<<<< TREE
-"X-Launchpad-Export-Date: 2010-04-03 03:54+0000\n"
-=======
 "X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
->>>>>>> MERGE-SOURCE
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account_payment/i18n/cs.po b/addons/account_payment/i18n/cs.po
index 1b10c28c59e..eec828ea2ae 100644
--- a/addons/account_payment/i18n/cs.po
+++ b/addons/account_payment/i18n/cs.po
@@ -13,11 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-<<<<<<< TREE
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
-=======
 "X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
->>>>>>> MERGE-SOURCE
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/base_contact/i18n/ko.po b/addons/base_contact/i18n/ko.po
index d209a3d2db3..a5dbaad3f46 100644
--- a/addons/base_contact/i18n/ko.po
+++ b/addons/base_contact/i18n/ko.po
@@ -14,11 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-<<<<<<< TREE
-"X-Launchpad-Export-Date: 2010-04-07 03:46+0000\n"
-=======
 "X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
->>>>>>> MERGE-SOURCE
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/crm/i18n/fi.po b/addons/crm/i18n/fi.po
index d8d7144e92c..ee51240f4c7 100644
--- a/addons/crm/i18n/fi.po
+++ b/addons/crm/i18n/fi.po
@@ -14,11 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-<<<<<<< TREE
-"X-Launchpad-Export-Date: 2010-04-07 03:46+0000\n"
-=======
 "X-Launchpad-Export-Date: 2010-04-17 04:01+0000\n"
->>>>>>> MERGE-SOURCE
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/hr_timesheet/i18n/de.po b/addons/hr_timesheet/i18n/de.po
index 8da6cb5fbef..c0dc16b4145 100644
--- a/addons/hr_timesheet/i18n/de.po
+++ b/addons/hr_timesheet/i18n/de.po
@@ -13,11 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-<<<<<<< TREE
-"X-Launchpad-Export-Date: 2010-04-07 03:46+0000\n"
-=======
 "X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
->>>>>>> MERGE-SOURCE
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/report_purchase/i18n/ko.po b/addons/report_purchase/i18n/ko.po
index 3fc2f47e73f..4bdec1193dd 100644
--- a/addons/report_purchase/i18n/ko.po
+++ b/addons/report_purchase/i18n/ko.po
@@ -14,11 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-<<<<<<< TREE
-"X-Launchpad-Export-Date: 2010-04-07 03:46+0000\n"
-=======
 "X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
->>>>>>> MERGE-SOURCE
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/scrum/i18n/ko.po b/addons/scrum/i18n/ko.po
index 7715e88937c..53022cb34d4 100644
--- a/addons/scrum/i18n/ko.po
+++ b/addons/scrum/i18n/ko.po
@@ -14,11 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-<<<<<<< TREE
-"X-Launchpad-Export-Date: 2010-04-07 03:46+0000\n"
-=======
 "X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
->>>>>>> MERGE-SOURCE
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum

From b53952416540d7d89b763d818de1226a3e5a5427 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 1 Jun 2010 11:39:15 +0530
Subject: [PATCH 006/121] [IMP]: crm, account: Improvement for partner info
 tab, put fields below notebook instead of pages

bzr revid: rpa@tinyerp.com-20100601060915-3hhuhuowtqxtn6s9
---
 addons/account/partner_view.xml |  6 +--
 addons/crm/res_partner_view.xml | 88 ++++++++++++++++-----------------
 2 files changed, 43 insertions(+), 51 deletions(-)

diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index ee1bbbbcc4b..1c1b425434e 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -133,11 +133,7 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//notebook[last()]" position="after">
-	                <notebook colspan="4">
-	                    <page string="Project">
-	                        <field name="contract_ids" colspan="4" nolabel="1" />
-	                    </page>
-	                </notebook>
+                    <field name="contract_ids" colspan="4" nolabel="1" />
                 </xpath>
             </field>
         </record>
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 24523f7b072..254d2c8f3b4 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -11,52 +11,48 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//notebook[last()]" position="after">
-                    <notebook colspan="4">
-		               		<page string="CRM">
-								<field name="meeting_ids" colspan="4" nolabel="1" />
-								<field name="phonecall_ids" colspan="4" nolabel="1" />
-								<field name="opportunity_ids" colspan="4" nolabel="1" domain="[('type', '=', 'opportunity')]">
-		               				<tree string="Opportunities"  colors="blue:state=='pending';grey:state in ('cancel', 'done')">
-						                <field name="create_date"/>
-						                <field name="partner_name"/>
-						                <field name="name"/>
-						                <field name="email_from"/>
-						                <field name="phone"/>
-						
-						                <field name="categ_id" invisible="1"/>
-						                <field name="type_id" invisible="1"/>
-						                <field name="referred" invisible="1"/>
-						
-						                <field name="stage_id"/>
-						                <button name="stage_previous" string="Previous"
-						                    states="open,pending" type="object" icon="gtk-go-back" />
-						                <button name="stage_next" string="Next"
-						                    states="open,pending" type="object"
-						                    icon="gtk-go-forward" />
-						                <field name="section_id"
-						                    invisible="context.get('invisible_section', True)" />
-						                <field name="user_id" />
-						                <field name="state" />
-						                <button name="case_open" string="Open"
-						                    states="draft,pending" type="object"
-						                    icon="gtk-go-forward" />
-						                <button name="case_close" string="Close"
-						                    states="open,draft,pending" type="object"
-						                    icon="gtk-close" />
-						                <button string="Convert to Opportunity"
-						                    name="convert_opportunity"
-						                    states="draft,open,pending" icon="gtk-index"
-						                    type="object" />
-						                <button name="case_escalate" string="Escalate"
-						                    states="open,draft,pending" type="object"
-						                    icon="gtk-go-up" />
-						                <button name="case_cancel" string="Cancel"
-						                    states="draft,open,pending" type="object"
-						                    icon="gtk-cancel" />
-						            </tree>
-		               			</field>
-							</page>
-						</notebook>
+						<field name="meeting_ids" colspan="4" nolabel="1" />
+						<field name="phonecall_ids" colspan="4" nolabel="1" />
+						<field name="opportunity_ids" colspan="4" nolabel="1" domain="[('type', '=', 'opportunity')]">
+               				<tree string="Opportunities"  colors="blue:state=='pending';grey:state in ('cancel', 'done')">
+				                <field name="create_date"/>
+				                <field name="partner_name"/>
+				                <field name="name"/>
+				                <field name="email_from"/>
+				                <field name="phone"/>
+				
+				                <field name="categ_id" invisible="1"/>
+				                <field name="type_id" invisible="1"/>
+				                <field name="referred" invisible="1"/>
+				
+				                <field name="stage_id"/>
+				                <button name="stage_previous" string="Previous"
+				                    states="open,pending" type="object" icon="gtk-go-back" />
+				                <button name="stage_next" string="Next"
+				                    states="open,pending" type="object"
+				                    icon="gtk-go-forward" />
+				                <field name="section_id"
+				                    invisible="context.get('invisible_section', True)" />
+				                <field name="user_id" />
+				                <field name="state" />
+				                <button name="case_open" string="Open"
+				                    states="draft,pending" type="object"
+				                    icon="gtk-go-forward" />
+				                <button name="case_close" string="Close"
+				                    states="open,draft,pending" type="object"
+				                    icon="gtk-close" />
+				                <button string="Convert to Opportunity"
+				                    name="convert_opportunity"
+				                    states="draft,open,pending" icon="gtk-index"
+				                    type="object" />
+				                <button name="case_escalate" string="Escalate"
+				                    states="open,draft,pending" type="object"
+				                    icon="gtk-go-up" />
+				                <button name="case_cancel" string="Cancel"
+				                    states="draft,open,pending" type="object"
+				                    icon="gtk-cancel" />
+				            </tree>
+               			</field>
                 </xpath>
             </field>
         </record>

From e5301a400433d06f98ed6e2507a582b96d377552 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 1 Jun 2010 11:43:50 +0530
Subject: [PATCH 007/121] [IMP]: crm: Some minor improvements

bzr revid: rpa@tinyerp.com-20100601061350-o89770rki5et9xa4
---
 addons/crm/crm_meeting.py            |  3 ++-
 addons/crm/test/test_crm_meeting.yml | 14 ++++++--------
 addons/crm/wizard/crm_send_email.py  |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index e45ee85b31d..133cb98f9dc 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -57,7 +57,8 @@ class crm_meeting(osv.osv, crm_case):
                              Define Responsible user and Email account for mail gateway.'), 
         'email_from': fields.char('Email', size=128, help="These people will receive email."),
         'id': fields.integer('ID'),
-
+        'create_date': fields.datetime('Creation Date' , readonly=True),
+        'write_date': fields.datetime('Write Date' , readonly=True),
         # Meeting fields
         'thread_id': fields.many2one('mailgate.thread', 'Thread', required=False), 
         'categ_id': fields.many2one('crm.case.categ', 'Meeting Type', \
diff --git a/addons/crm/test/test_crm_meeting.yml b/addons/crm/test/test_crm_meeting.yml
index 6365c913b1f..94a7b7a9442 100644
--- a/addons/crm/test/test_crm_meeting.yml
+++ b/addons/crm/test/test_crm_meeting.yml
@@ -9,11 +9,11 @@
     date: '2010-04-21 16:04:00'
     date_deadline: '2010-04-22 00:04:00'
     duration: 8.0
-    email_from: info@balmerinc.be
-    location: Ahmedabad
-    name: Regarding Presentation
+    email_from: info@mycompany.com
+    location: B-1367 Grand-Rosière
+    name: Technical Presentation
     partner_address_id: base.res_partner_address_1
-    partner_id: base.res_partner_9
+    partner_id: base.main_partner
     rrule_type: weekly
     section_id: crm.section_sales_department
 - |
@@ -77,11 +77,9 @@
   I can invite internal user. 
 - 
   !record {model: base_calendar.invite.attendee, id: base_calendar_invite_attendee_0}:
-    type: internal
     partner_id: base.res_partner_9
-    user_ids:
-      - base.user_demo
-- |
+    type: email
+    email: noemail@openerp.com- |
   If I set Send mail boolean as True I can see that an email is send to 
     specified email address with proper meeting information.
 -
diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index 8bc63f2f1a1..f6b5f88c4e1 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -225,7 +225,7 @@ class crm_send_new_email(osv.osv_memory):
 
                 original = [header, sender, to, sentdate, desc, signature]
 
-            res['text']= '\n'.join(original)
+            res['text']= '\n\n\n' + '\n'.join(original)
 
             if 'subject' in fields:
                 res.update({'subject': '[%s] %s' %(str(case.id), case.name or '')})

From 8d6dc5966039b992d3c0533fcf19e6d729ef30c1 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 1 Jun 2010 11:45:09 +0530
Subject: [PATCH 008/121] [IMP]: mail_gateway: Improvement in script for
 history

bzr revid: rpa@tinyerp.com-20100601061509-2qk5pmy1lsdo37rg
---
 .../scripts/openerp_mailgate/openerp_mailgate.py          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py b/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
index a865443c1b9..fa9c990e406 100755
--- a/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
+++ b/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
@@ -190,7 +190,7 @@ class email_parser(object):
 
         try:
             id = self.rpc(self.model, 'create', data)
-            self.rpc(self.model, 'history', [id], 'Receive', True, msg_to, message['body'], msg_from, False, {'model' : self.model})
+            self.rpc(self.model, '_history', [id], 'Receive', True, msg_to, message['body'], msg_from, False, {'model' : self.model})
             #self.rpc(self.model, 'case_open', [id])
         except Exception, e:
             if getattr(e, 'faultCode', '') and 'AccessError' in e.faultCode:
@@ -316,7 +316,7 @@ class email_parser(object):
             }
             self.rpc('ir.attachment', 'create', data_attach)
 
-        self.rpc(self.model, 'history', [id], 'Send', True, self._decode_header(msg['To']), body['body'], self._decode_header(msg['From']), False, {'model' : self.model})
+        self.rpc(self.model, '_history', [id], 'Send', True, self._decode_header(msg['To']), body['body'], self._decode_header(msg['From']), False, {'model' : self.model})
         return id
 
     def msg_send(self, msg, emails, priority=None):
@@ -360,7 +360,7 @@ class email_parser(object):
             }
             self.rpc('ir.attachment', 'create', data_attach)
 
-        self.rpc(self.model, 'history', [id], 'Send', True, self._decode_header(msg['To']), message['body'], self._decode_header(msg['From']), False, {'model' : self.model})
+        self.rpc(self.model, '_history', [id], 'Send', True, self._decode_header(msg['To']), message['body'], self._decode_header(msg['From']), False, {'model' : self.model})
         return id
 
     def msg_test(self, msg, case_str):
@@ -390,7 +390,7 @@ class email_parser(object):
                 del msg['Subject']
             msg['Subject'] = '['+str(case_id)+'] '+subject
             msg['Message-Id'] = '<'+str(time.time())+'-openerpcrm-'+str(case_id)+'@'+socket.gethostname()+'>'
-
+        
         emails = self.rpc(self.model, 'emails_get', case_id)
         priority = emails[3]
         em = [emails[0], emails[1]] + (emails[2] or '').split(',')

From 03ed85de4dfa6a10c7e803c565b66001aa577a6e Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 1 Jun 2010 14:49:46 +0530
Subject: [PATCH 009/121] [IMP]: document_webdav: Added checking for importing
 pywebdav library

bzr revid: rpa@tinyerp.com-20100601091946-nutaqpvfx00dzbcr
---
 addons/document_webdav/webdav.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/document_webdav/webdav.py b/addons/document_webdav/webdav.py
index b69c21d62ee..b9b1a1f8a65 100644
--- a/addons/document_webdav/webdav.py
+++ b/addons/document_webdav/webdav.py
@@ -23,8 +23,12 @@ import xml.dom.minidom
 domimpl = xml.dom.minidom.getDOMImplementation()
 import urlparse
 import urllib
-from DAV import utils
-from DAV.propfind import PROPFIND
+try:
+    from DAV import utils
+    from DAV.propfind import PROPFIND
+except ImportError:
+    raise osv.except_osv('PyWebDAV Import Error!','Please install pywebdav \
+                     from http://pywebdav.googlecode.com/files/PyWebDAV-0.9.3.tar.gz/')
 import tools
 
 

From 1ea07696714e43ae7b578df8c10252614581f9d9 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Tue, 1 Jun 2010 15:42:46 +0530
Subject: [PATCH 010/121] [IMP]: base_module_quality: Apply minor changes

bzr revid: ksa@tinyerp.co.in-20100601101246-pnwln0zovpw6q887
---
 addons/base_module_quality/pep8_test/pep8_test.py  |  6 +++---
 .../base_module_quality/pylint_test/pylint_test.py |  6 +++---
 .../structure_test/structure_test.py               |  6 +++---
 addons/base_module_quality/terp_test/terp_test.py  | 14 +++++++-------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/addons/base_module_quality/pep8_test/pep8_test.py b/addons/base_module_quality/pep8_test/pep8_test.py
index 52c04756382..4aaaaa7bddc 100644
--- a/addons/base_module_quality/pep8_test/pep8_test.py
+++ b/addons/base_module_quality/pep8_test/pep8_test.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -48,7 +48,7 @@ PEP-8 Test , copyright of py files check, method can not call from loops
                         list_files.append(os.path.join(i, j))
         py_list = []
         for file_py in list_files:
-            if file_py.split('.')[-1] == 'py' and not file_py.endswith('__init__.py') and not file_py.endswith('__terp__.py'):
+            if file_py.split('.')[-1] == 'py' and not file_py.endswith('__init__.py') and not file_py.endswith('__openerp__.py'):
                 file_path = os.path.join(module_path, file_py)
                 py_list.append(file_path)
 
diff --git a/addons/base_module_quality/pylint_test/pylint_test.py b/addons/base_module_quality/pylint_test/pylint_test.py
index 8dbbce0e2ce..12400dbb196 100644
--- a/addons/base_module_quality/pylint_test/pylint_test.py
+++ b/addons/base_module_quality/pylint_test/pylint_test.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -50,7 +50,7 @@ class quality_test(base_module_quality.abstract_quality_check):
         flag = False
         self.result_details += '''<html><body><head>%s</head>'''%(self.get_style())
         for file_py in list_files:
-            if file_py.split('.')[-1] == 'py' and not file_py.endswith('__init__.py') and not file_py.endswith('__terp__.py'):
+            if file_py.split('.')[-1] == 'py' and not file_py.endswith('__init__.py') and not file_py.endswith('__openerp__.py'):
                 if not flag:
                     flag = True
                 file_path = os.path.join(module_path, file_py)
diff --git a/addons/base_module_quality/structure_test/structure_test.py b/addons/base_module_quality/structure_test/structure_test.py
index 466976f5d17..10b80aaacdd 100644
--- a/addons/base_module_quality/structure_test/structure_test.py
+++ b/addons/base_module_quality/structure_test/structure_test.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -82,7 +82,7 @@ This test checks if the module satisfy tiny structure
         # module files calculation (module.py,module_view.xml,etc..)
         com_list = ['_unit_test.xml', '.py', '_view.xml', '_workflow.xml' , '_wizard.xml', '_report.xml', '_data.xml', '_demo.xml', '_security.xml', '_sequence.xml', '_graph.xml']
         com_list = map(lambda x: module_name + x, com_list)
-        main_file = ['__init__.py', '__terp__.py']
+        main_file = ['__init__.py', '__openerp__.py']
         com_list.extend(main_file)
         module_dict['module'] = filter(lambda x: len(x.split(".")) > 1, module_dict['module'])
         score = self.get_score(module_dict['module'], com_list)
diff --git a/addons/base_module_quality/terp_test/terp_test.py b/addons/base_module_quality/terp_test/terp_test.py
index 993a80fe32b..a9747496dc1 100644
--- a/addons/base_module_quality/terp_test/terp_test.py
+++ b/addons/base_module_quality/terp_test/terp_test.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -49,13 +49,13 @@ class quality_test(base_module_quality.abstract_quality_check):
         score = 1.0
         feel_good_factor = 0
         feel_bad_factor = 0
-        if '__terp__.py' not in list_files:
+        if '__openerp__.py' not in list_files:
             self.no_terp = True
-            self.result += _("The module does not contain the __terp__.py file")
+            self.result += _("The module does not contain the __openerp__.py file")
             return None
         result_dict = {}
         result_dict1 = {}
-        terp_file = os.path.join(module_path,'__terp__.py')
+        terp_file = os.path.join(module_path,'__openerp__.py')
         res = eval(tools.file_open(terp_file).read())
         terp_keys = ['category', 'name', 'description', 'author', 'website', 'update_xml', 'init_xml', 'depends', 'version', 'active', 'installable', 'demo_xml']
         for key in terp_keys:
@@ -117,7 +117,7 @@ class quality_test(base_module_quality.abstract_quality_check):
 
         self.result_details += self.get_result_details(result_dict)
         self.result_details += self.get_result_details(result_dict1)
-        return [_('__terp__.py file'), score]
+        return [_('__openerp__.pyfile'), score]
 
     def run_test(self, cr, uid, module_path):
         terp_score = self.run_test_terp(cr, uid, module_path)
@@ -125,7 +125,7 @@ class quality_test(base_module_quality.abstract_quality_check):
         if self.score*100 < self.min_score:
             self.message = 'Score is below than minimal score(%s%%)' % self.min_score
         if terp_score:
-            self.result = self.get_result({'__terp__.py': terp_score})
+            self.result = self.get_result({'__openerp__.py': terp_score})
         return None
 
     def get_result(self, dict_terp):

From 4091bf320772d91ac0eb8a200390debe1e964856 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 1 Jun 2010 18:00:58 +0530
Subject: [PATCH 011/121] [IMP]: mail_gateway: Improvement in mailgate objects
 and refactoring of mailgate script to be used for any OpenERP model (Removed
 dependency with crm)

bzr revid: rpa@tinyerp.com-20100601123058-9j3ef3yi1z36vqlz
---
 addons/mail_gateway/mail_gateway.py           |   8 +-
 addons/mail_gateway/mail_gateway_view.xml     |  40 ++--
 .../openerp_mailgate/openerp_mailgate.py      | 219 ++++++------------
 3 files changed, 100 insertions(+), 167 deletions(-)

diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index 5a71051637d..13e6a0410f9 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -50,9 +50,11 @@ class mailgate_thread(osv.osv):
     _rec_name = 'thread' 
 
     _columns = {
-        'thread': fields.char('Thread', size=32, required=False), 
+        'thread': fields.char('Thread', size=124, required=False), 
         'message_ids': one2many_domain('mailgate.message', 'thread_id', 'Messages', domain=[('history', '=', True)], required=False), 
-        'log_ids': one2many_domain('mailgate.message', 'thread_id', 'Logs', domain=[('history', '=', False)], required=False), 
+        'log_ids': one2many_domain('mailgate.message', 'thread_id', 'Logs', domain=[('history', '=', False)], required=False),
+        'model': fields.char('Model Name', size=64, required=False),  
+        'res_id': fields.integer('Resource ID'), 
         }
         
     def __history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, email_from=False, message_id=False, attach=[], context={}):
@@ -130,8 +132,6 @@ class mailgate_message(osv.osv):
 
     _columns = {
         'name':fields.char('Message', size=64), 
-        'model_id': fields.many2one('ir.model', 'Model'), 
-        'res_id': fields.integer('Resource ID'),
         'thread_id':fields.many2one('mailgate.thread', 'Thread'), 
         'date': fields.datetime('Date'), 
         'history': fields.boolean('Is History?', required=False), 
diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
index 5cf35fa3420..14aa7fc3aad 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -11,7 +11,7 @@
 	                    <field name="name" required="1" select="1"/>
 	                    <field name="date" required="1" select="1"/>
 	                    <field name="user_id" string="Responsible" select="1"/>
-	                </group>	                
+	                </group>
                     <notebook colspan="4">
 	                    <page string="Details">
 	                    	<group col="4" colspan="4">
@@ -33,7 +33,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record model="ir.ui.view" id="view_mailgate_message_tree">
             <field name="name">mailgate.message.tree</field>
             <field name="model">mailgate.message</field>
@@ -41,12 +41,12 @@
             <field name="arch" type="xml">
                 <tree string="Mailgateway Message">
                     <field name="date" />
-                    <field name="email_from" />                    
-                    <field name="user_id" />                    
+                    <field name="email_from" />
+                    <field name="user_id" />
                 </tree>
             </field>
         </record>
-        
+
         <record model="ir.ui.view" id="view_mailgate_message_search">
             <field name="name">mailgate.message.search</field>
             <field name="model">mailgate.message</field>
@@ -56,11 +56,11 @@
                     <field name="name" />
                     <field name="date" />
                     <field name="user_id" />
-                    <field name="message_id" />                    
+                    <field name="message_id" />
                 </search>
             </field>
         </record>
-        
+
 
         <record model="ir.ui.view" id="view_mailgate_thread_form">
             <field name="name">mailgate.thread.form</field>
@@ -68,7 +68,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Mailgateway Thread">
-                    <field name="thread" select="1"/>
+                    <group col="6" colspan="4">
+                        <field name="thread" select="1" colspan="3"/>
+                        <newline/>
+                        <field name="model" />
+                        <field name="res_id" />
+                    </group>
                     <separator string="Logs" colspan="4"/>
                     <field name="log_ids" nolabel="1" colspan="4" domain="[('history', '=', True)]">
                     	<tree string="Mailgateway Logs">
@@ -79,7 +84,7 @@
 		                    <field name="name" />
 		                    <field name="date" />
 		                    <field name="user_id" />
-		                    <field name="message_id" />		                    
+		                    <field name="message_id" />
 		                    <notebook colspan="4">
 			                    <page string="Email Details">
 			                    	<group col="4" colspan="4">
@@ -131,7 +136,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record model="ir.ui.view" id="view_mailgate_thread_tree">
             <field name="name">mailgate.thread.tree</field>
             <field name="model">mailgate.thread</field>
@@ -143,7 +148,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record model="ir.actions.act_window" id="action_view_mailgate_thread">
 	        <field name="name">Mailgateway Threads</field>
 	        <field name="res_model">mailgate.thread</field>
@@ -151,7 +156,7 @@
 	        <field name="view_type">form</field>
 	        <field name="view_id" ref="view_mailgate_thread_tree"/>
 	    </record>
-		
+
 		<record model="ir.actions.act_window.view" id="action_view_mailgate_thread_view1">
 	        <field name="sequence" eval="1"/>
 	        <field name="view_mode">tree</field>
@@ -164,19 +169,16 @@
 	        <field name="view_id" ref="view_mailgate_thread_form"/>
 	        <field name="act_window_id" ref="action_view_mailgate_thread"/>
 	    </record>
-		
-		
-		 <!-- <menuitem id="base.menu_crm_configuration" name="Cases"
-            parent="base.menu_base_config" sequence="0"/>
+
 
         <menuitem id="menu_mailgate_thread" name="Mailgateway Threads" action="action_view_mailgate_thread"
-        	parent="base.menu_crm_configuration"  sequence="20"/>
-        	-->
+        	parent="base.menu_base_config"  sequence="20"/>
+
         <act_window domain="[('partner_id', '=', active_id), ('history', '=', True)]"
             id="act_res_partner_emails" name="Emails"
             res_model="mailgate.message"
             src_model="res.partner"
-            view_id="view_mailgate_message_tree"            
+            view_id="view_mailgate_message_tree"
             />
 
     </data>
diff --git a/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py b/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
index fa9c990e406..b07bbe809b8 100755
--- a/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
+++ b/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
@@ -130,7 +130,7 @@ class rpc_proxy(object):
         return self.rpc.execute(self.dbname, self.user_id, self.passwd, *request, **kwargs)
 
 class email_parser(object):
-    def __init__(self, uid, password, model, email, email_default, dbname, host, port):        
+    def __init__(self, uid, password, model, email, email_default, dbname, host, port, smtp_server=None, smtp_port=None, smtp_ssl=None, smtp_user=None, smtp_password=None):
         self.rpc = rpc_proxy(uid, password, host=host, port=port, dbname=dbname)
         try:
             self.model_id = int(model)
@@ -141,7 +141,13 @@ class email_parser(object):
         self.email = email
         self.email_default = email_default
         self.canal_id = False
-
+        self.smtp_server = smtp_server
+        self.smtp_port = smtp_port
+        self.smtp_ssl = smtp_ssl
+        self.smtp_user = smtp_user
+        self.smtp_password = smtp_password
+        
+        
     def email_get(self, email_from):
         res = email_re.search(email_from)
         return res and res.group(1)
@@ -170,7 +176,28 @@ class email_parser(object):
         from email.Header import decode_header
         s = decode_header(s.replace('\r', '')) 
         return ''.join(map(lambda x:self._to_decode(x[0], [x[1]]), s or []))
-
+    
+    def history(self, model, new_id, subject, msg_to, msg_from, body, attach):
+        thread_data = {
+                    'model': model, 
+                    'res_id': new_id, 
+                    'thread': subject, 
+        }
+        thread_id = self.rpc('mailgate.thread', 'create', thread_data)
+        msg_data = {
+                    'name': subject, 
+                    'history': True, 
+                    'thread_id': thread_id, 
+                    'user_id': self.rpc.user_id, 
+                    'date': time.strftime('%Y-%m-%d %H:%M:%S'), 
+                    'email_from': msg_from, 
+                    'email_to': msg_to, 
+                    'description': body, 
+                    'attachment_ids': [(6, 0, attach)]
+        }
+        msg_id = self.rpc('mailgate.message', 'create', msg_data)
+        return True
+    
     def msg_new(self, msg):
         message = self.msg_body_get(msg)
         msg_subject = self._decode_header(msg['Subject'])
@@ -189,26 +216,30 @@ class email_parser(object):
         data.update(self.partner_get(msg_from))
 
         try:
-            id = self.rpc(self.model, 'create', data)
-            self.rpc(self.model, '_history', [id], 'Receive', True, msg_to, message['body'], msg_from, False, {'model' : self.model})
-            #self.rpc(self.model, 'case_open', [id])
+            att_ids = []
+            new_id = self.rpc(self.model, 'create', data)
+            attachments = message['attachment']        
+            for attach in attachments or []:
+                data_attach = {
+                    'name': str(attach), 
+                    'datas': binascii.b2a_base64(str(attachments[attach])), 
+                    'datas_fname': str(attach), 
+                    'description': 'Mail attachment', 
+                    'res_model': self.model, 
+                    'res_id': new_id
+                }
+                att_ids.append(self.rpc('ir.attachment', 'create', data_attach))
+            try:
+                self.rpc(self.model, 'history', [new_id], 'Receive', True, msg_to, message['body'], msg_from, False, {'model' : self.model})
+            except Exception, e:
+                self.history(self.model, new_id, msg_subject, msg_to, msg_from, message['body'], att_ids)
         except Exception, e:
             if getattr(e, 'faultCode', '') and 'AccessError' in e.faultCode:
-                e = '\n\nThe Specified user does not have an access to the CRM case.'
+                e = '\n\nThe Specified user does not have an access to the Model.'
             print e
-        attachments = message['attachment']        
-        for attach in attachments or []:
-            data_attach = {
-                'name': str(attach), 
-                'datas': binascii.b2a_base64(str(attachments[attach])), 
-                'datas_fname': str(attach), 
-                'description': 'Mail attachment', 
-                'res_model': self.model, 
-                'res_id': id
-            }
-            self.rpc('ir.attachment', 'create', data_attach)
+        
 
-        return id
+        return new_id
 
 #   #change the return type format to dictionary
 #   {
@@ -262,63 +293,6 @@ class email_parser(object):
         #end for        
         return message
 
-    def msg_user(self, msg, id):
-        body = self.msg_body_get(msg)
-
-        # handle email body commands (ex: Set-State: Draft)
-        actions = {}
-        body_data=''
-        for line in body['body'].split('\n'):
-            res = command_re.match(line)
-            if res:
-                actions[res.group(1).lower()] = res.group(2).lower()
-            else:
-                body_data += line+'\n'
-        body['body'] = body_data
-
-        data = {
-#            'description': body['body'],
-        }
-        act = 'case_open'
-        if 'state' in actions:
-            if actions['state'] in ['draft', 'close', 'cancel', 'open', 'pending']:
-                act = 'case_' + actions['state']
-
-            for k1, k2 in [('cost', 'planned_cost'), ('revenue', 'planned_revenue'), ('probability', 'probability')]:
-                try:
-                    data[k2] = float(actions[k1])
-                except:
-                    pass
-
-        if 'priority' in actions:
-            if actions['priority'] in ('1', '2', '3', '4', '5'):
-                data['priority'] = actions['priority']
-
-        if 'partner' in actions:
-            data['email_from'] = actions['partner'][:128]
-
-        if 'user' in actions:
-            uids = self.rpc('res.users', 'name_search', actions['user'])
-            if uids:
-                data['user_id'] = uids[0][0]
-
-        self.rpc(self.model, act, [id])
-        self.rpc(self.model, 'write', [id], data)
-        attachments = body['attachment']        
-        for attach in attachments or []:
-            data_attach = {
-                'name': str(attach), 
-                'datas': binascii.b2a_base64(str(attachments[attach])), 
-                'datas_fname': str(attach), 
-                'description': 'Mail attachment', 
-                'res_model': self.model, 
-                'res_id': id
-            }
-            self.rpc('ir.attachment', 'create', data_attach)
-
-        self.rpc(self.model, '_history', [id], 'Send', True, self._decode_header(msg['To']), body['body'], self._decode_header(msg['From']), False, {'model' : self.model})
-        return id
-
     def msg_send(self, msg, emails, priority=None):
         if not len(emails):
             return False
@@ -330,85 +304,38 @@ class email_parser(object):
             msg['Cc'] = ','.join(emails[1:])
         del msg['Reply-To']
         msg['Reply-To'] = self.email
-        if priority:
-            msg['X-Priority'] = priorities.get(priority, '3 (Normal)')
-        s = smtplib.SMTP()
-        s.connect()
-        s.sendmail(self.email, emails, msg.as_string())
+        s = smtplib.SMTP(self.smtp_server, self.smtp_port)
+        s.ehlo()
+        s.starttls()
+        s.ehlo()
+        
+        if self.smtp_user and self.smtp_password:
+            s.login(self.smtp_user, self.smtp_password)
+            s.sendmail(self.email, emails, msg.as_string())
         s.close()
         return True
 
-    def msg_partner(self, msg, id):
-        message = self.msg_body_get(msg)
-        body = message['body']
-        act = 'case_open'
-        self.rpc(self.model, act, [id])
-        #body2 = '\n'.join(map(lambda l: '> '+l, (body or '').split('\n')))
-        #data = {
-        #    'description':body, 
-        #}
-        #self.rpc(self.model, 'write', [id], data)
-        attachments = message['attachment']        
-        for attach in attachments or []:
-            data_attach = {
-                'name': str(attach), 
-                'datas': binascii.b2a_base64(str(attachments[attach])), 
-                'datas_fname': str(attach), 
-                'description': 'Mail attachment', 
-                'res_model': self.model, 
-                'res_id': id
-            }
-            self.rpc('ir.attachment', 'create', data_attach)
-
-        self.rpc(self.model, '_history', [id], 'Send', True, self._decode_header(msg['To']), message['body'], self._decode_header(msg['From']), False, {'model' : self.model})
-        return id
-
-    def msg_test(self, msg, case_str):
-        if not case_str:
-            return (False, False)
-        emails = self.rpc(self.model, 'emails_get', int(case_str))
-        return (int(case_str), emails)
 
     def parse(self, msg):
-        case_str = reference_re.search(msg.get('References', ''))
-        if case_str:
-            case_str = case_str.group(1)
-        else:
-            case_str = case_re.search(msg.get('Subject', ''))
-            if case_str:
-                case_str = case_str.group(1)
-        (case_id, emails) = self.msg_test(msg, case_str)
-        if case_id:
-            if emails[0] and self.email_get(emails[0])==self.email_get(self._decode_header(msg['From'])):
-                self.msg_user(msg, case_id)
-            else:
-                self.msg_partner(msg, case_id)
-        else:
-            case_id = self.msg_new(msg)
-            subject = self._decode_header(msg['subject'])
-            if msg.get('Subject', ''):
-                del msg['Subject']
-            msg['Subject'] = '['+str(case_id)+'] '+subject
-            msg['Message-Id'] = '<'+str(time.time())+'-openerpcrm-'+str(case_id)+'@'+socket.gethostname()+'>'
-        
-        emails = self.rpc(self.model, 'emails_get', case_id)
-        priority = emails[3]
-        em = [emails[0], emails[1]] + (emails[2] or '').split(',')
-        emails = map(self.email_get, filter(None, em))
+        #TODO: Something with Message hierarchy 
+        res_id = self.msg_new(msg)
+        subject = self._decode_header(msg['subject'])
+        if msg.get('Subject', ''):
+            del msg['Subject']
+        msg['Subject'] = '['+str(res_id)+'] '+subject
+        msg['Message-Id'] = '<'+str(time.time())+'-openerpcrm-'+str(res_id)+'@'+socket.gethostname()+'>'
 
         mm = [self._decode_header(msg['From']), self._decode_header(msg['To'])]+self._decode_header(msg.get('Cc', '')).split(',')
         msg_mails = map(self.email_get, filter(None, mm))
-
-        emails = filter(lambda m: m and m not in msg_mails, emails)
         try:
-            self.msg_send(msg, emails, priority)
-        except:
+            self.msg_send(msg, msg_mails)
+        except Exception, e:
             if self.email_default:
                 a = self._decode_header(msg['Subject'])
                 del msg['Subject']
-                msg['Subject'] = '[OpenERP-CaseError] ' + a
+                msg['Subject'] = '[OpenERP-FetchError] ' + a
                 self.msg_send(msg, self.email_default.split(','))
-        return case_id, emails
+        return res_id, msg_mails
 
 if __name__ == '__main__':
     import sys, optparse
@@ -425,10 +352,14 @@ if __name__ == '__main__':
     parser.add_option("-d", "--dbname", dest="dbname", help="Database name (default: terp)", default='terp')
     parser.add_option("--host", dest="host", help="Hostname of the Open ERP Server", default="localhost")
     parser.add_option("--port", dest="port", help="Port of the Open ERP Server", default="8069")
-
+    parser.add_option('--smtp', dest='smtp_server', default='', help='specify the SMTP server for sending email')
+    parser.add_option('--smtp-port', dest='smtp_port', default='25', help='specify the SMTP port', type="int")
+    parser.add_option('--smtp-ssl', dest='smtp_ssl', default='', help='specify the SMTP server support SSL or not')
+    parser.add_option('--smtp-user', dest='smtp_user', default='', help='specify the SMTP username for sending email')
+    parser.add_option('--smtp-password', dest='smtp_password', default='', help='specify the SMTP password for sending email')
 
     (options, args) = parser.parse_args()
-    parser = email_parser(options.userid, options.password, options.model, options.email, options.default, dbname=options.dbname, host=options.host, port=options.port)
+    parser = email_parser(options.userid, options.password, options.model, options.email, options.default, dbname=options.dbname, host=options.host, port=options.port, smtp_server=options.smtp_server, smtp_port=options.smtp_port, smtp_ssl=options.smtp_ssl, smtp_user=options.smtp_user, smtp_password=options.smtp_password)
 
     msg_txt = email.message_from_file(sys.stdin)
 

From 6883726ee4e3ace00e0120cf28c1ec2c79e316c5 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 2 Jun 2010 12:09:55 +0530
Subject: [PATCH 012/121] [IMP]: mail_gateway: Improvement in mailgateway for
 message-id

bzr revid: rpa@tinyerp.com-20100602063955-8q61fvzqggvo7eq8
---
 addons/crm/wizard/crm_send_email.py |  9 ++++++---
 addons/mail_gateway/mail_gateway.py | 10 ++++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index f6b5f88c4e1..8d394ddcf9e 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -20,11 +20,12 @@
 #
 ##############################################################################
 
+from crm import crm
 from osv import osv, fields
 from tools.translate import _
 import base64
+import time
 import tools
-from crm import crm
 
 class crm_send_new_email(osv.osv_memory):
     """ Sends new email for the case"""
@@ -93,10 +94,12 @@ class crm_send_new_email(osv.osv_memory):
             if context.get('mail', 'new') == 'new':
                 if len(case.message_ids):
                     message_id = case.message_ids[0].message_id
+                else:
+                    message_id = "<%s-openerp-@%s-%s-%d>" % (time.time(), cr.dbname, model, res_id)
             else:
                 hist = hist_obj.browse(cr, uid, res_id)
                 message_id = hist.message_id
-                model = hist.model_id.model
+                model = hist.model
                 model_pool = self.pool.get(model)
                 res_ids = model_pool.search(cr, uid, [('thread_id','=', hist.thread_id.id)])
                 res_id = res_ids and res_ids[0] or False
@@ -196,7 +199,7 @@ class crm_send_new_email(osv.osv_memory):
         include_original = context and context.get('include_original', False) or False
         res = {}
         for hist in hist_obj.browse(cr, uid, res_ids, context=context):
-            model = hist.model_id.model
+            model = hist.model
 
             # In the case where the crm.case does not exist in the database
             if not model:
diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index 221dce21cbd..5a4ab95c935 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -80,11 +80,11 @@ class mailgate_thread(osv.osv):
         obj = self.pool.get('mailgate.message')
 
         for case in cases:
-            model_ids = model_obj.search(cr, uid, [('model', '=', case._name)])
             data = {
                 'name': keyword, 
                 'user_id': uid, 
-                'model_id' : model_ids and model_ids[0] or False, 
+                'model' : case._name, 
+                'res_id': case.id, 
                 'date': time.strftime('%Y-%m-%d %H:%M:%S'), 
                 'thread_id': case.thread_id.id, 
                 'message_id': message_id, 
@@ -98,7 +98,7 @@ class mailgate_thread(osv.osv):
                         'name': subject or 'History', 
                         'history': True, 
                         'user_id': uid, 
-                        'model_id' : model_ids and model_ids[0] or False, 
+                        'model' : case._name, 
                         'res_id': case.id,
                         'date': time.strftime('%Y-%m-%d %H:%M:%S'), 
                         'description': details or (hasattr(case, 'description') and case.description or False), 
@@ -144,7 +144,9 @@ class mailgate_message(osv.osv):
         'message_id': fields.char('Message Id', size=1024, readonly=True, help="Message Id on Email Server.", select=True), 
         'description': fields.text('Description'), 
         'partner_id': fields.many2one('res.partner', 'Partner', required=False), 
-        'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments'), 
+        'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments'),
+        'model': fields.char('Model Name', size=64, required=False),  
+        'res_id': fields.integer('Resource ID'), 
     }
 
 mailgate_message()

From 819c10ca6568311111433d4e899769f2ab5f4a8a Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 2 Jun 2010 16:51:58 +0530
Subject: [PATCH 013/121] [IMP]: mail_gateway: Improvements for mailgate
 message creation on new mail fetched + view improvement

bzr revid: rpa@tinyerp.com-20100602112158-0tgg94lpcpr73pig
---
 addons/mail_gateway/mail_gateway_view.xml     | 28 +++++++++++++------
 .../openerp_mailgate/openerp_mailgate.py      | 14 ++++------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
index 14aa7fc3aad..a89e4359ef4 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -14,14 +14,19 @@
 	                </group>
                     <notebook colspan="4">
 	                    <page string="Details">
-	                    	<group col="4" colspan="4">
+	                    	<group col="2" colspan="2">
 	                    		<separator string="Email Details" colspan="4"/>
 			                    <field name="email_from" />
 			                    <field name="email_to" />
 			                    <field name="email_cc" />
-			                    <field name="email_bcc" />
-			                    <field name="message_id" />
+			                    <field name="email_bcc" invisible="1"/>
 			               </group>
+			               <group col="2" colspan="2">
+                                <separator string="Message Details" colspan="4"/>
+                                    <field name="model" readonly="1"/>
+                                    <field name="res_id"  readonly="1"/>
+                                <field name="message_id" />
+                           </group>
 			               <separator string="Description" colspan="4"/>
                             <field name="description" nolabel="1" colspan="4" />
 		                </page>
@@ -70,9 +75,6 @@
                 <form string="Mailgateway Thread">
                     <group col="6" colspan="4">
                         <field name="thread" select="1" colspan="3"/>
-                        <newline/>
-                        <field name="model" />
-                        <field name="res_id" />
                     </group>
                     <separator string="Logs" colspan="4"/>
                     <field name="log_ids" nolabel="1" colspan="4" domain="[('history', '=', True)]">
@@ -169,9 +171,17 @@
 	        <field name="view_id" ref="view_mailgate_thread_form"/>
 	        <field name="act_window_id" ref="action_view_mailgate_thread"/>
 	    </record>
-
-
-        <menuitem id="menu_mailgate_thread" name="Mailgateway Threads" action="action_view_mailgate_thread"
+        
+        <!--        Mailgateway message action-->
+        <record model="ir.actions.act_window" id="action_view_mailgate_message">
+            <field name="name">Mailgateway Messages</field>
+            <field name="res_model">mailgate.message</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_mailgate_message_tree"/>
+        </record>
+        
+        <menuitem id="menu_mailgate_message" name="Mailgateway Messages" action="action_view_mailgate_message"
         	parent="base.menu_base_config"  sequence="20"/>
 
         <act_window domain="[('partner_id', '=', active_id), ('history', '=', True)]"
diff --git a/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py b/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
index b07bbe809b8..4a18d8cb251 100755
--- a/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
+++ b/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
@@ -177,17 +177,13 @@ class email_parser(object):
         s = decode_header(s.replace('\r', '')) 
         return ''.join(map(lambda x:self._to_decode(x[0], [x[1]]), s or []))
     
-    def history(self, model, new_id, subject, msg_to, msg_from, body, attach):
-        thread_data = {
-                    'model': model, 
-                    'res_id': new_id, 
-                    'thread': subject, 
-        }
-        thread_id = self.rpc('mailgate.thread', 'create', thread_data)
+    def history(self, model, new_id, msg_id, subject, msg_to, msg_from, body, attach):
         msg_data = {
                     'name': subject, 
                     'history': True, 
-                    'thread_id': thread_id, 
+                    'model': model, 
+                    'res_id': new_id, 
+                    'message_id': msg_id, 
                     'user_id': self.rpc.user_id, 
                     'date': time.strftime('%Y-%m-%d %H:%M:%S'), 
                     'email_from': msg_from, 
@@ -232,7 +228,7 @@ class email_parser(object):
             try:
                 self.rpc(self.model, 'history', [new_id], 'Receive', True, msg_to, message['body'], msg_from, False, {'model' : self.model})
             except Exception, e:
-                self.history(self.model, new_id, msg_subject, msg_to, msg_from, message['body'], att_ids)
+                self.history(self.model, new_id, msg['Message-Id'], msg_subject, msg_to, msg_from, message['body'], att_ids)
         except Exception, e:
             if getattr(e, 'faultCode', '') and 'AccessError' in e.faultCode:
                 e = '\n\nThe Specified user does not have an access to the Model.'

From 1929847dc2550f1ec05b961b50bac553c92e3f77 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 2 Jun 2010 19:08:15 +0530
Subject: [PATCH 014/121] [IMP]: base_action_rule: Applied reverted changes of
 changes related to create/write of rule object

bzr revid: rpa@tinyerp.com-20100602133815-ytf6nse83rdhby1a
---
 addons/base_action_rule/base_action_rule.py | 111 ++++++++++++++++++--
 1 file changed, 102 insertions(+), 9 deletions(-)

diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py
index a1213dd7542..85c4e9d4480 100644
--- a/addons/base_action_rule/base_action_rule.py
+++ b/addons/base_action_rule/base_action_rule.py
@@ -19,14 +19,16 @@
 #
 ##############################################################################
 
-import time
-import mx.DateTime
-import re
-
-import tools
+from datetime import datetime
 from osv import fields, osv, orm
 from osv.orm import except_orm
+from osv.osv import osv_pool
 from tools.translate import _
+import mx.DateTime
+import pooler 
+import re
+import time
+import tools
 
 class base_action_rule(osv.osv):
     """ Base Action Rules """
@@ -132,6 +134,74 @@ the rule to mark CC(mail to any other person defined in actions)."),
     
     _order = 'sequence'
     
+    def pre_action(self, cr, uid, ids, model, context=None):
+        # Searching for action rules
+        cr.execute("SELECT m.model, r.id  from base_action_rule r left join ir_model m on (m.id = r.name)")
+        res = cr.fetchall()
+        # Check if any rule matching with current object
+        for obj_name, rule_id in res:
+            if not (model == obj_name):
+                continue
+            else:
+                obj = self.pool.get(obj_name)
+                self._action(cr, uid, [rule_id], obj.browse(cr, uid, ids, context=context))
+        return True
+
+    def new_create(self, old_create, model, context=None):
+        if not context:
+            context  = {}
+        def make_call_old(cr, uid, vals, context=context):
+            new_id = old_create(cr, uid, vals, context=context)
+            if not context.get('action'):
+                self.pre_action(cr, uid, [new_id], model, context=context)
+            return new_id
+        return make_call_old
+    
+    def new_write(self, old_write, model, context=None):
+        if not context:
+            context  = {}
+        def make_call_old(cr, uid, ids, vals, context=context):
+            if isinstance(ids, (str, int, long)):
+                ids = [ids]
+            if not context.get('action'):
+                self.pre_action(cr, uid, ids, model, context=context)
+            return old_write(cr, uid, ids, vals, context=context)
+        return make_call_old
+
+    def create(self, cr, uid, vals, context=None):
+        if not context:
+            context = {}
+        res_id = super(base_action_rule, self).create(cr, uid, vals, context)
+        model_pool = self.pool.get('ir.model')
+        model = model_pool.browse(cr, uid, vals.get('name'), context=context).model
+        obj_pool = self.pool.get(model)
+        obj_pool.__setattr__('old_create', obj_pool.create)
+        obj_pool.__setattr__('old_write', obj_pool.write)
+        obj_pool.__setattr__('create', self.new_create(obj_pool.create, model, context=context))
+        obj_pool.__setattr__('write', self.new_write(obj_pool.write, model, context=context))
+        return res_id
+    
+    def write(self, cr, uid, ids, vals, context=None):
+        res = super(base_action_rule, self).write(cr, uid, ids, vals, context)
+        model_pool = self.pool.get('ir.model')
+        if not context:
+            context = {}
+        for rule in self.browse(cr, uid, ids, context=context):
+            model = model_pool.browse(cr, uid, rule.name.id, context=context).model
+            obj_pool = self.pool.get(model)
+            obj_pool.__setattr__('old_create', obj_pool.create)
+            obj_pool.__setattr__('old_write', obj_pool.write)
+            obj_pool.__setattr__('create', self.new_create(obj_pool.create, model, context=context))
+            obj_pool.__setattr__('write', self.new_write(obj_pool.write, model, context=context))
+        return res
+
+    def _check(self, cr, uid, automatic=False, use_new_cursor=False, \
+                       context=None):
+        rule_pool= self.pool.get('base.action.rule')
+        rule_ids = rule_pool.search(cr, uid, [], context=context)
+        return rule_pool.write(cr, uid, rule_ids, {}, context=context)
+        
+
     def format_body(self, body):
         """ Foramat Action rule's body
             @param self: The object pointer """
@@ -235,6 +305,7 @@ the rule to mark CC(mail to any other person defined in actions)."),
             context.update({'active_id':obj.id, 'active_ids':[obj.id]})
             self.pool.get('ir.actions.server').run(cr, uid, [action.server_action_id.id], context)
         write = {}
+
         if hasattr(obj, 'user_id') and action.act_user_id:
             obj.user_id = action.act_user_id
             write['user_id'] = action.act_user_id.id
@@ -279,12 +350,10 @@ the rule to mark CC(mail to any other person defined in actions)."),
             @param ids: List of Basic Action Rule’s IDs,
             @param objects: pass objects
             @param context: A standard dictionary for contextual values """
-
+        context.update({'action': True})
         if not scrit:
             scrit = []
-        cr.execute("select id from base_action_rule order by sequence")
-        rule_ids = map(lambda x: x[0], cr.fetchall())
-        for action in self.browse(cr, uid, rule_ids):
+        for action in self.browse(cr, uid, ids):
             level = action.max_level
             if not level:
                 break
@@ -333,6 +402,7 @@ the rule to mark CC(mail to any other person defined in actions)."),
                     self.do_action(cr, uid, action, model_obj, obj, context)
                     break
             level -= 1
+        context.update({'action': False})
         return True
 
     def _check_mail(self, cr, uid, ids, context=None):
@@ -359,4 +429,27 @@ the rule to mark CC(mail to any other person defined in actions)."),
 
 base_action_rule()
 
+
+class ir_cron(osv.osv):
+    _inherit = 'ir.cron' 
+    
+    def _poolJobs(self, db_name, check=False):
+        try:
+            db, pool = pooler.get_db_and_pool(db_name)
+        except:
+            return False
+        cr = db.cursor()
+        try:
+            next = datetime.now().strftime('%Y-%m-%d %H:00:00')
+            # Putting nextcall always less than current time in order to call it every time
+            cr.execute('UPDATE ir_cron set nextcall = \'%s\' where numbercall<>0 and active and model=\'base.action.rule\' ' % (next))
+            cr.commit()
+            res = super(ir_cron, self)._poolJobs(db_name, check=check)
+        finally:
+            cr.commit()
+            cr.close()
+
+ir_cron()
+
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 22f439416273eba39653e4e1cae38c0f10ca9887 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Wed, 2 Jun 2010 19:24:27 +0530
Subject: [PATCH 015/121] [IMP] Improvement in sale and mrp

bzr revid: ksa@tinyerp.co.in-20100602135427-p8w2q3n3venurpbn
---
 .../account/wizard/account_invoice_state.py   |  6 +-
 addons/mrp/mrp.py                             | 20 ++++---
 addons/project/project.py                     |  7 +--
 addons/purchase/purchase.py                   | 57 +++++++++----------
 addons/sale/sale.py                           |  4 +-
 5 files changed, 48 insertions(+), 46 deletions(-)

diff --git a/addons/account/wizard/account_invoice_state.py b/addons/account/wizard/account_invoice_state.py
index c3934e38db0..3b63ed843d1 100644
--- a/addons/account/wizard/account_invoice_state.py
+++ b/addons/account/wizard/account_invoice_state.py
@@ -37,11 +37,11 @@ class account_invoice_confirm(osv.osv_memory):
             context = {}
         pool_obj = pooler.get_pool(cr.dbname)
         data_inv = pool_obj.get('account.invoice').read(cr, uid, context['active_ids'], ['state'], context=context)
-        
+
         for record in data_inv:
             if record['state'] not in ('draft','proforma','proforma2'):
                 raise osv.except_osv(_('Warning'), _("Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-Forma' state!"))
-            wf_service.trg_validate(uid, 'account.invoice', id, 'invoice_open', cr)
+            wf_service.trg_validate(uid, 'account.invoice', record['id'], 'invoice_open', cr)
         return {}
 
 account_invoice_confirm()
@@ -61,7 +61,7 @@ class account_invoice_cancel(osv.osv_memory):
         wf_service = netsvc.LocalService('workflow')
         pool_obj = pooler.get_pool(cr.dbname)
         data_inv = pool_obj.get('account.invoice').read(cr, uid, context['active_ids'], ['state'], context=context)
-        
+
         for record in data_inv:
             if record['state'] in ('cancel','paid'):
                 raise osv.except_osv(_('Warning'), _("Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' or 'Done' state!"))
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 685d289a194..701438f4c5b 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from mx import DateTime
+from datetime import datetime, timedelta
 from osv import fields
 from osv import osv
 from tools.translate import _
@@ -117,9 +118,9 @@ class mrp_bom(osv.osv):
     """
     Defines bills of material for a product.
     """
-    _name = 'mrp.bom'    
+    _name = 'mrp.bom'
     _description = 'Bill of Material'
-    
+
     def _child_compute(self, cr, uid, ids, name, arg, context={}):
         """ Gets child bom.
         @param self: The object pointer
@@ -419,7 +420,6 @@ class mrp_production(osv.osv):
     _name = 'mrp.production'
     _description = 'Manufacturing Order'
     _date_name  = 'date_planned'
-    _log_create = True
 
     def _production_calc(self, cr, uid, ids, prop, unknow_none, context={}):
         """ Calculates total hours and total no. of cycles for a production order.
@@ -647,15 +647,19 @@ class mrp_production(osv.osv):
         """ Changes the production state to Ready and location id of stock move.
         @return: True
         """
+        for production in self.browse(cr, uid, ids):
+            production = self.browse(cr, uid, [production.id])[0]
+            s_date = datetime.strptime(production.date_planned,'%Y-%m-%d %H:%M:%S')
+
         for (id,name) in self.name_get(cr, uid, ids):
-            message = _('Manufacturing Order ') + " '" + name + "' "+ _("is ready to produce.")
+            message = _('Manufacturing Order ') + " '" + name + "' "+ _("scheduled the") + " "
+            message += s_date.strftime('%Y-%m-%d') + " " + _("for") + " " + production.product_id.default_code
             self.log(cr, uid, id, message)
         move_obj = self.pool.get('stock.move')
         self.write(cr, uid, ids, {'state': 'ready'})
-        for production in self.browse(cr, uid, ids):
-            if production.move_prod_id:
-                move_obj.write(cr, uid, [production.move_prod_id.id],
-                        {'location_id': production.location_dest_id.id})
+        if production.move_prod_id:
+             move_obj.write(cr, uid, [production.move_prod_id.id],
+                   {'location_id': production.location_dest_id.id})
         return True
 
     def action_production_end(self, cr, uid, ids):
diff --git a/addons/project/project.py b/addons/project/project.py
index 61720675f49..43430f134ee 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -150,14 +150,14 @@ class project(osv.osv):
              if leave['date_start'] > leave['date']:
                  return False
          return True
-    
+
     def _check_escalation(self, cr, uid, ids):
          project_obj = self.browse(cr, uid, ids[0])
          if project_obj.project_escalation_id:
              if project_obj.project_escalation_id.id == project_obj.id:
                  return False
-         return True 
-     
+         return True
+
     _constraints = [
         (_check_dates, 'Error! project start-date must be lower then project end-date.', ['date_start', 'date']),
         (_check_escalation, 'Error! You cannot assign escalation to the same project!', ['project_escalation_id'])
@@ -261,7 +261,6 @@ project()
 class task(osv.osv):
     _name = "project.task"
     _description = "Task"
-    _log_create = True
     _date_name = "date_start"
 
     def _str_get(self, task, level=0, border='***', context={}):
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index b886dc60a0e..3c09d748360 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -211,7 +211,6 @@ class purchase_order(osv.osv):
     }
     _name = "purchase.order"
     _description = "Purchase Order"
-    _log_create = True
     _order = "name desc"
 
     def unlink(self, cr, uid, ids, context=None):
@@ -223,7 +222,7 @@ class purchase_order(osv.osv):
             else:
                 raise osv.except_osv(_('Invalid action !'), _('Cannot delete Purchase Order(s) which are in %s State!' % s['state']))
 
-        # TODO: temporary fix in 5.0, to remove in 5.2 when subflows support 
+        # TODO: temporary fix in 5.0, to remove in 5.2 when subflows support
         # automatically sending subflow.delete upon deletion
         wf_service = netsvc.LocalService("workflow")
         for id in unlink_ids:
@@ -248,7 +247,7 @@ class purchase_order(osv.osv):
         return {'value':{'location_id': res, 'dest_address_id': False}}
 
     def onchange_partner_id(self, cr, uid, ids, part):
-        
+
         if not part:
             return {'value':{'partner_address_id': False, 'fiscal_position': False}}
         addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['default'])
@@ -264,12 +263,12 @@ class purchase_order(osv.osv):
     #TODO: implement messages system
     def wkf_confirm_order(self, cr, uid, ids, context={}):
         todo = []
-        for po in self.browse(cr, uid, ids):            
+        for po in self.browse(cr, uid, ids):
             if not po.order_line:
                 raise osv.except_osv(_('Error !'),_('You can not confirm purchase order without Purchase Order Lines.'))
-            for line in po.order_line:            
+            for line in po.order_line:
                 if line.state=='draft':
-                    todo.append(line.id)            
+                    todo.append(line.id)
         current_name = self.name_get(cr, uid, ids)[0][1]
         self.pool.get('purchase.order.line').action_confirm(cr, uid, todo, context)
         for id in ids:
@@ -313,13 +312,13 @@ class purchase_order(osv.osv):
         wf_service = netsvc.LocalService("workflow")
         for p_id in ids:
             # Deleting the existing instance of workflow for PO
-            wf_service.trg_delete(uid, 'purchase.order', p_id, cr)            
+            wf_service.trg_delete(uid, 'purchase.order', p_id, cr)
             wf_service.trg_create(uid, 'purchase.order', p_id, cr)
         return True
 
     def action_invoice_create(self, cr, uid, ids, *args):
         res = False
-       
+
         journal_obj = self.pool.get('account.journal')
         for o in self.browse(cr, uid, ids):
             il = []
@@ -437,7 +436,7 @@ class purchase_order(osv.osv):
                     })
                     if order_line.move_dest_id:
                         self.pool.get('stock.move').write(cr, uid, [order_line.move_dest_id.id], {'location_id':order.location_id.id})
-                    todo_moves.append(move)    
+                    todo_moves.append(move)
             self.pool.get('stock.move').action_confirm(cr, uid, todo_moves)
             self.pool.get('stock.move').force_assign(cr, uid, todo_moves)
             wf_service = netsvc.LocalService("workflow")
@@ -459,26 +458,26 @@ class purchase_order(osv.osv):
 
 
     def do_merge(self, cr, uid, ids, context):
-        """ 
-        To merge similar type of purchase orders.        
-        Orders will only be merged if: 
-        * Purchase Orders are in draft  
-        * Purchase Orders belong to the same partner   
+        """
+        To merge similar type of purchase orders.
+        Orders will only be merged if:
+        * Purchase Orders are in draft
+        * Purchase Orders belong to the same partner
         * Purchase Orders are have same stock location, same pricelist
-        Lines will only be merged if: 
-        * Order lines are exactly the same except for the quantity and unit 
+        Lines will only be merged if:
+        * Order lines are exactly the same except for the quantity and unit
 
          @param self: The object pointer.
          @param cr: A database cursor
          @param uid: ID of the user currently logged in
-         @param ids: the ID or list of IDs 
-         @param context: A standard dictionary 
-         
+         @param ids: the ID or list of IDs
+         @param context: A standard dictionary
+
          @return: new purchase order id
-            
-        """          
-        wf_service = netsvc.LocalService("workflow")    
-        def make_key(br, fields):                    
+
+        """
+        wf_service = netsvc.LocalService("workflow")
+        def make_key(br, fields):
             list_key = []
             for field in fields:
                 field_val = getattr(br, field)
@@ -496,9 +495,9 @@ class purchase_order(osv.osv):
             return tuple(list_key)
 
     # compute what the new orders should contain
-  
+
         new_orders = {}
-    
+
         for porder in [order for order in self.browse(cr, uid, ids) if order.state == 'draft']:
             order_key = make_key(porder, ('partner_id', 'location_id', 'pricelist_id'))
             new_order = new_orders.setdefault(order_key, ({}, []))
@@ -541,7 +540,7 @@ class purchase_order(osv.osv):
                         o_line[field] = field_val
                     o_line['uom_factor'] = order_line.product_uom and order_line.product_uom.factor or 1.0
 
-        
+
 
         allorders = []
         for order_key, (order_data, old_ids) in new_orders.iteritems():
@@ -601,7 +600,7 @@ class purchase_order_line(osv.osv):
         'invoiced': fields.boolean('Invoiced', readonly=True),
         'partner_id': fields.related('order_id','partner_id',string='Partner',readonly=True,type="many2one", relation="res.partner"),
         'date_order': fields.related('order_id','date_order',string='Order Date',readonly=True,type="date")
-        
+
     }
     _defaults = {
         'product_qty': lambda *a: 1.0,
@@ -692,7 +691,7 @@ class purchase_order_line(osv.osv):
         return res
     def action_confirm(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state': 'confirmed'}, context)
-        return True    
+        return True
 purchase_order_line()
 
 class mrp_procurement(osv.osv):
@@ -700,7 +699,7 @@ class mrp_procurement(osv.osv):
     _columns = {
         'purchase_id': fields.many2one('purchase.order', 'Latest Requisition'),
     }
-    
+
     def action_po_assign(self, cr, uid, ids, context={}):
         """ This is action which call from workflow to assign purchase order to procurements
         @return: True
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 356bd69f679..a19f51c2f3c 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -510,12 +510,12 @@ class sale_order(osv.osv):
     def action_invoice_end(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-            
+
         for order in self.browse(cr, uid, ids, context=context):
             for line in order.order_line:
                 if line.state == 'exception':
                     self.pool.get('sale.order.line').write(cr, uid, [line.id], {'state': 'confirmed'}, context=context)
-            
+
             if order.state == 'invoice_except':
                 self.write(cr, uid, [order.id], {'state' : 'progress'}, context=context)
 

From 1bdcacd776d1486812c40f0027ec4033e18ea28f Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Thu, 3 Jun 2010 11:35:53 +0530
Subject: [PATCH 017/121] Task 594: product/sale: support price_unit from
 ChriCar or something alike. *[ADD] product_price_unit: New module added with
 reference to
 lp:~openerp-commiter/openobject-addons/chricar_price_unit_trunk_1 branch.

bzr revid: uco@tinyerp.com-20100603060553-hj9q6gwx3r86fgml
---
 addons/account/__openerp__.py                 |    2 +-
 addons/procurement/procurement_view.xml       |    2 +-
 addons/product_price_unit/__init__.py         |   23 +
 addons/product_price_unit/__openerp__.py      |   39 +
 .../product_price_unit/product_price_unit.py  | 1112 +++++++++++++++++
 .../product_price_unit_data.xml               |   32 +
 .../product_price_unit_view.xml               |  241 ++++
 addons/purchase/__openerp__.py                |    4 +-
 addons/sale/__openerp__.py                    |    2 +-
 9 files changed, 1453 insertions(+), 4 deletions(-)
 create mode 100644 addons/product_price_unit/__init__.py
 create mode 100644 addons/product_price_unit/__openerp__.py
 create mode 100644 addons/product_price_unit/product_price_unit.py
 create mode 100644 addons/product_price_unit/product_price_unit_data.xml
 create mode 100644 addons/product_price_unit/product_price_unit_view.xml

diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 51724f47d33..3090777654f 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -119,7 +119,7 @@ module named account_voucherss
         'project/project_demo.xml',
         'project/analytic_account_demo.xml',
         'demo/account_minimal.xml',
-        'account_unit_test.xml',
+        #'account_unit_test.xml',
     ],
     'test': [
         'test/account_customer_invoice.yml',
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index e517f289809..8d45b59baf8 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -66,7 +66,7 @@
                         <field name="move_id" groups="base.group_extended"/>
                         <field name="date_close"/>
                         <field name="close_move" groups="base.group_extended"/>
-						<group colspan="4"  groups="base.group_extended">
+						<group colspan="4"  groups="base.group_extended" expand="1">
 	                    	<separator colspan="4" string="Properties" />
 	                        <field colspan="4" name="property_ids" nolabel="1"/>
 	                    </group>
diff --git a/addons/product_price_unit/__init__.py b/addons/product_price_unit/__init__.py
new file mode 100644
index 00000000000..1ef4ebd8563
--- /dev/null
+++ b/addons/product_price_unit/__init__.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+import product_price_unit
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/product_price_unit/__openerp__.py b/addons/product_price_unit/__openerp__.py
new file mode 100644
index 00000000000..a4be771312d
--- /dev/null
+++ b/addons/product_price_unit/__openerp__.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+{
+    "name" : "Product Price Unit",
+    "version" : "1.1",
+    "author" : "Tiny",
+    "category" : "",
+    "depends" : ["base", 'account','hr_expense','mrp', 'sale'],
+    "init_xml" : [],
+    "demo_xml" : [],
+    "description": """
+    """,
+    'update_xml': [
+        'product_price_unit_data.xml',
+        'product_price_unit_view.xml',
+    ],
+    'installable': True,
+    'active': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product_price_unit/product_price_unit.py b/addons/product_price_unit/product_price_unit.py
new file mode 100644
index 00000000000..e98599c6cd5
--- /dev/null
+++ b/addons/product_price_unit/product_price_unit.py
@@ -0,0 +1,1112 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv
+from osv import fields
+from tools.translate import _
+import decimal_precision as dp
+import time
+
+class product_price_unit(osv.osv):
+    _name = "product.price.unit"
+    _description = 'Product Price Unit'
+    _order = "coefficient asc,name"
+    _columns = {
+       'code': fields.char('PU', size=3, required=True, translate=True, help="A three characters code to be placed next to the price"),
+       'coefficient': fields.integer('Coefficient', required=True, help="Values will be calculated as price / coefficient"),
+       'name': fields.char('Price per Unit', size=32, required=True, translate=True, help="Enter something like: Price for 100 units"),
+    }
+
+product_price_unit()
+
+class product_category(osv.osv):
+    _inherit = "product.category"
+    _name = "product.category"
+
+    _columns = {
+        'property_stock_location': fields.property('stock.location',
+            relation='stock.location', type='many2one',
+            string='Stock Location', method=True, view_load=True,
+            help="This location will be proposed for the stock move"),
+        'allow_negative_stock' : fields.boolean('Allow Negative Stock', help="Allows negative stock quantities for this category - use with care !"),
+    }
+product_category()
+
+class product_template(osv.osv):
+    _inherit = "product.template"
+    _name = "product.template"
+
+    _columns = {
+        'standard_price_coeff': fields.float(string='Standard Price/Coeff',digits=(16,8)) ,
+        'list_price_coeff': fields.float(string='List Price/Coeff',digits=(16,8)),
+        'property_stock_location': fields.property('stock.location',
+            relation='stock.location', type='many2one',
+            string='Stock Location', method=True, view_load=True,
+            help="This location will be proposed for the stock move"),
+        'allow_negative_stock' : fields.boolean('Allow Negative Stock', help="Allows negative stock quantities - use with care !"),
+
+    }
+
+product_template()
+
+class product_product(osv.osv):
+    _name = "product.product"
+    _inherit = "product.product"
+
+    def _get_price_unit_id(self, cr, uid, *args):
+        cr.execute('select id from product_price_unit where coefficient = 1')
+        res = cr.fetchone()
+        return res and res[0] or False
+    
+    def _avg_price(self, cr, uid, ids, field_names=None, arg=False, context={}):
+        res = {} 
+        for product in self.browse(cr, uid, ids, context=context):
+            avg_price = 0.0
+            value = self._stock_value( cr, uid, [product.id], ['stock_value',], arg, context)[product.id]['stock_value']
+            qty = self._product_available( cr, uid, ids, ['qty_available',], arg, context)[product.id]['qty_available']
+            if qty > 0.0 and value > 0.0:
+               pu = self.pool.get('product.price.unit').browse(cr, uid, product.price_unit_id.id)
+               coeff = pu.coefficient
+               avg_price = value / qty * coeff
+            res[product.id] = avg_price  
+        return res
+    
+    def get_stock_value(self, cr, uid, ids, context=None):
+            if not context:
+                context = {}
+            states=context.get('states',[])
+            what=context.get('what',())
+            if not ids:
+                ids = self.search(cr, uid, [])
+            res = {}.fromkeys(ids, 0.0)
+            if not ids:
+                return res
+
+            if context.get('shop', False):
+                cr.execute('select warehouse_id from sale_shop where id=%s', (int(context['shop']),))
+                res2 = cr.fetchone()
+                if res2:
+                    context['warehouse'] = res2[0]
+
+            if context.get('warehouse', False):
+                cr.execute('select lot_stock_id from stock_warehouse where id=%s', (int(context['warehouse']),))
+                res2 = cr.fetchone()
+                if res2:
+                    context['location'] = res2[0]
+
+            if context.get('location', False):
+                if type(context['location']) == type(1):
+                    location_ids = [context['location']]
+                else:
+                    location_ids = context['location']
+            else:
+                cr.execute("select lot_stock_id from stock_warehouse")
+                location_ids = [id for (id,) in cr.fetchall()]
+
+            # build the list of ids of children of the location given by id
+            if context.get('compute_child',True):
+                child_location_ids = self.pool.get('stock.location').search(cr, uid, [('location_id', 'child_of', location_ids)])
+                location_ids= len(child_location_ids) and child_location_ids or location_ids
+            else:
+                location_ids= location_ids
+
+            states_str = ','.join(map(lambda s: "'%s'" % s, states))
+
+            uoms_o = {}
+            product2uom = {}
+            for product in self.browse(cr, uid, ids, context=context):
+                product2uom[product.id] = product.uom_id.id
+                uoms_o[product.uom_id.id] = product.uom_id
+
+            prod_ids_str = ','.join(map(str, ids))
+            location_ids_str = ','.join(map(str, location_ids))
+            results = []
+            results2 = []
+
+            from_date=context.get('from_date',False)
+            to_date=context.get('to_date',False)
+            date_str=False
+            if from_date and to_date:
+                date_str="date_planned>='%s' and date_planned<='%s'"%(from_date,to_date)
+            elif from_date:
+                date_str="date_planned>='%s'"%(from_date)
+            elif to_date:
+                date_str="date_planned<='%s'"%(to_date)
+
+            cr.execute(
+                    'select sum('\
+                    'case when location_dest_id in ('+location_ids_str+') then  move_value else 0 end + '\
+                    'case when location_id      in ('+location_ids_str+') then -move_value else 0 end '\
+                    '), product_id '\
+                    'from stock_move '\
+                    'where (location_id  in ('+location_ids_str+') '\
+                    'or location_dest_id in ('+location_ids_str+')) '\
+                    'and product_id in ('+prod_ids_str+') '\
+                    'and state in ('+states_str+') '+ (date_str and 'and '+date_str+' ' or '') +''\
+                    'group by product_id'
+                )
+            results = cr.fetchall()
+
+            for amount, prod_id in results:
+                if amount: res[prod_id] += amount
+            return res
+    
+    def _stock_value(self, cr, uid, ids, field_names=None, arg=False, context={}):
+        if not field_names:
+            field_names=[]
+        res = {}
+        for id in ids:
+            res[id] = {}.fromkeys(field_names, 0.0)
+        for f in field_names:
+            c = context.copy()
+            if f=='stock_value':
+                c.update({ 'states':('done',), 'what':('in', 'out') })
+            stock=self.get_stock_value(cr,uid,ids,context=c)
+            for id in ids:
+                res[id][f] = stock.get(id, 0.0)
+        return res
+    
+    def get_product_available(self, cr, uid, ids, context=None):
+        if not context:
+            context = {}
+        states=context.get('states',[])
+        what=context.get('what',())
+        if not ids:
+            ids = self.search(cr, uid, [])
+        res = {}.fromkeys(ids, 0.0)
+        if not ids:
+            return res
+
+        if context.get('shop', False):
+            cr.execute('select warehouse_id from sale_shop where id=%s', (int(context['shop']),))
+            res2 = cr.fetchone()
+            if res2:
+                context['warehouse'] = res2[0]
+
+        if context.get('warehouse', False):
+            cr.execute('select lot_stock_id from stock_warehouse where id=%s', (int(context['warehouse']),))
+            res2 = cr.fetchone()
+            if res2:
+                context['location'] = res2[0]
+
+        if context.get('location', False):
+            if type(context['location']) == type(1):
+                location_ids = [context['location']]
+            else:
+                location_ids = context['location']
+        else:
+            location_ids = []
+            wids = self.pool.get('stock.warehouse').search(cr, uid, [], context=context)
+            for w in self.pool.get('stock.warehouse').browse(cr, uid, wids, context=context):
+                location_ids.append(w.lot_stock_id.id)
+
+        # build the list of ids of children of the location given by id
+        if context.get('compute_child',True):
+            child_location_ids = self.pool.get('stock.location').search(cr, uid, [('location_id', 'child_of', location_ids)])
+            location_ids= len(child_location_ids) and child_location_ids or location_ids
+        else:
+            location_ids= location_ids
+
+        uoms_o = {}
+        product2uom = {}
+        for product in self.browse(cr, uid, ids, context=context):
+            product2uom[product.id] = product.uom_id.id
+            uoms_o[product.uom_id.id] = product.uom_id
+
+        results = []
+        results2 = []
+
+        from_date=context.get('from_date',False)
+        to_date=context.get('to_date',False)
+        date_str=False
+        if from_date and to_date:
+            date_str="date_planned>='%s' and date_planned<='%s'"%(from_date,to_date)
+        elif from_date:
+            date_str="date_planned>='%s'"%(from_date)
+        elif to_date:
+            date_str="date_planned<='%s'"%(to_date)
+
+        if 'in' in what:
+            # all moves from a location out of the set to a location in the set
+            cr.execute(
+                'select sum(product_qty), product_id, product_uom,sum(move_value) '\
+                'from stock_move '\
+                'where location_id <> ANY(%s)'\
+                'and location_dest_id =ANY(%s)'\
+                'and product_id =ANY(%s)'\
+                'and state in %s' + (date_str and 'and '+date_str+' ' or '') +''\
+                'group by product_id,product_uom',(location_ids,location_ids,ids,tuple(states),)
+            )
+            results = cr.fetchall()
+        if 'out' in what:
+            # all moves from a location in the set to a location out of the set
+            cr.execute(
+                'select sum(product_qty), product_id, product_uom,sum(move_value) '\
+                'from stock_move '\
+                'where location_id = ANY(%s)'\
+                'and location_dest_id <> ANY(%s) '\
+                'and product_id =ANY(%s)'\
+                'and state in %s' + (date_str and 'and '+date_str+' ' or '') + ''\
+                'group by product_id,product_uom',(location_ids,location_ids,ids,tuple(states),)
+            )
+            results2 = cr.fetchall()
+        uom_obj = self.pool.get('product.uom')
+        uoms = map(lambda x: x[2], results) + map(lambda x: x[2], results2)
+        if context.get('uom', False):
+            uoms += [context['uom']]
+
+        uoms = filter(lambda x: x not in uoms_o.keys(), uoms)
+        if uoms:
+            uoms = uom_obj.browse(cr, uid, list(set(uoms)), context=context)
+        for o in uoms:
+            uoms_o[o.id] = o
+        for amount, prod_id, prod_uom,move_value in results:
+            amount = uom_obj._compute_qty_obj(cr, uid, uoms_o[prod_uom], amount,
+                    uoms_o[context.get('uom', False) or product2uom[prod_id]])
+            res[prod_id] += amount
+        for amount, prod_id, prod_uom,move_value in results2:
+            amount = uom_obj._compute_qty_obj(cr, uid, uoms_o[prod_uom], amount,
+                    uoms_o[context.get('uom', False) or product2uom[prod_id]])
+            res[prod_id] -= amount
+        return res
+    
+    def _product_available(self, cr, uid, ids, field_names=None, arg=False, context={}):
+        res = super(product_product, self)._product_available(cr, uid, ids, field_names, arg, context)
+        for f in field_names:
+            c = context.copy()
+            if f=='stock_value':
+                c.update({ 'states':('done',), 'what':('in', 'out') })
+            stock = self.get_product_available(cr, uid, ids, context=c)
+            for id in ids:
+                res[id][f] = stock.get(id, 0.0)
+        return res
+    
+    _columns = {
+        'price_unit_id': fields.many2one('product.price.unit','Price Unit', help="Use if Price is not defined for UoM"),
+        'stock_value': fields.function(_stock_value, method=True, type='float', string='Value', help="Current Value products in selected locations or all internal if none have been selected.", multi='stock_value'),
+        'average_price': fields.function(_avg_price, method=True, type='float', string='Average Price',digits=(16,4)),
+    }
+
+    _defaults = {
+        'price_unit_id': _get_price_unit_id,
+    }
+    
+        # FIXME - check does not raise error
+#     allow_negative_stock is defined for product_template
+    def _check_allow_negative_stock(self, cr, uid, ids):
+        for product in self.browse(cr, uid, ids):
+            if product.qty_available < 0.0:
+               allow_negative = product.allow_negative_stock
+               if not allow_negative:
+                  allow_neagtive = product.categ_id.allow_negative_stock
+               if allow_negative != True :
+                   return False
+        return True
+
+    _constraints = [ (_check_allow_negative_stock, 'Error: Negative stock quantities are not allowed for this product or product category', ['name']), ]
+
+    
+    def on_change_price_unit(self, cr, uid, ids,price_unit_id,standard_price,list_price):
+         standard_price_coeff = ''
+         list_price_coeff=''
+         if price_unit_id:
+             pu = self.pool.get('product.price.unit').browse(cr, uid, [price_unit_id])[0]
+             coeff =  pu.coefficient
+             standard_price_coeff = standard_price / coeff
+             list_price_coeff     = list_price     / coeff
+             return {'value':{'standard_price_coeff': standard_price_coeff, 'list_price_coeff': list_price_coeff }}
+
+    def name_get(self, cr, uid, ids, context={}):
+        results = super(product_product, self).name_get(cr, uid, ids, context)
+        new_results = []
+        for product_id, product_name in results:           
+            product = self.browse(cr, uid, product_id, context)
+            if product.price_unit_id and product.price_unit_id.name:
+                product_name = "%s (%s)" %(product_name, product.price_unit_id.name)
+            new_results.append((product_id, product_name))
+        return new_results
+
+product_product()
+
+class account_invoice_line(osv.osv):
+    _name = "account.invoice.line"
+    _inherit = "account.invoice.line"
+
+    def _get_price_unit_id(self, cr, uid, *args):
+        cr.execute('select id from product_price_unit where coefficient = 1')
+        res = cr.fetchone()
+        return res and res[0] or False
+
+    def _amount_line(self, cr, uid, ids, prop, unknow_none,unknow_dict):
+        res = {}
+        cur_obj=self.pool.get('res.currency')
+        for line in self.browse(cr, uid, ids):
+            if line.price_unit_id:
+                if line.invoice_id:
+                    res[line.id] = line.price_unit * line.quantity * (1-(line.discount or 0.0)/100.0) / line.price_unit_id.coefficient
+                    cur = line.invoice_id.currency_id
+                    res[line.id] = cur_obj.round(cr, uid, cur, res[line.id])
+                else:
+                    res[line.id] = round(line.price_unit * line.quantity * (1-(line.discount or 0.0)/100.0)/ line.price_unit_id.coefficient,self.pool.get('decimal.precision').precision_get(cr, uid, 'Account'))
+        return res
+
+    _columns = {
+        'price_unit_id': fields.many2one('product.price.unit','Price Unit', help="Use if Price is not defined for UoM"),
+        'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal',store=True, type="float", digits_compute= dp.get_precision('Account')),
+    }
+    _defaults = {
+        'price_unit_id': _get_price_unit_id,
+    }
+
+    def price_product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, price_unit_id=False, address_invoice_id=False, currency_id=False, context=None):
+        result = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context)
+        if product and 'value' in result:
+            pu = self.pool.get('product.product').browse(cr, uid, product)
+            if pu.price_unit_id:
+                result['value']['price_unit_id'] = pu.price_unit_id.id
+        return result
+
+account_invoice_line()
+
+class account_invoice_tax(osv.osv):
+    _inherit = "account.invoice.tax"
+    
+    def compute(self, cr, uid, invoice_id, context={}):
+        tax_grouped = {}
+        tax_obj = self.pool.get('account.tax')
+        cur_obj = self.pool.get('res.currency')
+        inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id, context)
+        cur = inv.currency_id
+        company_currency = inv.company_id.currency_id.id
+
+        for line in inv.invoice_line:
+            for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, (line.price_unit* (1-(line.discount or 0.0)/100.0/line.price_unit_id.coefficient)), line.quantity, inv.address_invoice_id.id, line.product_id, inv.partner_id):
+                val={}
+                val['invoice_id'] = inv.id
+                val['name'] = tax['name']
+                val['amount'] = tax['amount']
+                val['manual'] = False
+                val['sequence'] = tax['sequence']
+                val['base'] = tax['price_unit'] * line['quantity'] / line['price_unit_id'].coefficient
+
+                if inv.type in ('out_invoice','in_invoice'):
+                    val['base_code_id'] = tax['base_code_id']
+                    val['tax_code_id'] = tax['tax_code_id']
+                    val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
+                    val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
+                    val['account_id'] = tax['account_collected_id'] or line.account_id.id
+                else:
+                    val['base_code_id'] = tax['ref_base_code_id']
+                    val['tax_code_id'] = tax['ref_tax_code_id']
+                    val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['ref_base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
+                    val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['ref_tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
+                    val['account_id'] = tax['account_paid_id'] or line.account_id.id
+
+                key = (val['tax_code_id'], val['base_code_id'], val['account_id'])
+                if not key in tax_grouped:
+                    tax_grouped[key] = val
+                else:
+                    tax_grouped[key]['amount'] += val['amount']
+                    tax_grouped[key]['base'] += val['base']
+                    tax_grouped[key]['base_amount'] += val['base_amount']
+                    tax_grouped[key]['tax_amount'] += val['tax_amount']
+
+        for t in tax_grouped.values():
+            t['amount'] = cur_obj.round(cr, uid, cur, t['amount'])
+            t['base_amount'] = cur_obj.round(cr, uid, cur, t['base_amount'])
+            t['tax_amount'] = cur_obj.round(cr, uid, cur, t['tax_amount'])
+        return tax_grouped
+
+account_invoice_tax()
+
+class hr_expense_line(osv.osv):
+    _name = "hr.expense.line"
+    _inherit = "hr.expense.line"
+
+    def _get_price_unit_id(self, cr, uid, *args):
+        cr.execute('select id from product_price_unit where coefficient = 1')
+        res = cr.fetchone()
+        return res and res[0] or False
+
+    def _amount(self, cr, uid, ids, field_name, arg, context):
+        if not len(ids):
+            return {}
+        cr.execute("SELECT l.id,COALESCE(SUM(l.unit_amount*l.unit_quantity/pu.coefficient),0) AS amount FROM hr_expense_line l ,product_price_unit pu WHERE pu.id = l.price_unit_id and l.id =ANY(%s) GROUP BY l.id ",(ids,))
+        res = dict(cr.fetchall())
+        return res
+
+    _columns = {
+        'price_unit_id': fields.many2one('product.price.unit','Price Unit', help="Use if Price is not defined for UoM"),
+        'total_amount': fields.function(_amount, method=True, string='Total'),
+    }    
+    _defaults = {
+        'price_unit_id': _get_price_unit_id,
+    }
+hr_expense_line()
+
+class hr_expense_expense(osv.osv):
+    _name = "hr.expense.expense"
+    _inherit = "hr.expense.expense"
+
+    def _amount(self, cr, uid, ids, field_name, arg, context):
+        if not len(ids):
+            return {}
+        cr.execute("SELECT s.id,COALESCE(SUM(l.unit_amount*l.unit_quantity/pu.coefficient),0) AS amount FROM hr_expense_expense s LEFT OUTER JOIN hr_expense_line l ON (s.id=l.expense_id) LEFT JOIN product_price_unit pu ON (pu.id=l.price_unit_id) WHERE s.id = ANY(%s) GROUP BY s.id ",(ids,))
+        res = dict(cr.fetchall())
+        return res
+
+    _columns = {
+        'amount': fields.function(_amount, method=True, string='Total Amount'),
+    }
+
+hr_expense_expense()
+
+class mrp_bom(osv.osv):
+    _inherit = 'mrp.bom'
+    
+    def _get_price_unit_id(self, cr, uid, *args):
+        cr.execute('select id from product_price_unit where coefficient = 1')
+        res = cr.fetchone()
+        return res and res[0] or False
+    
+    _columns = {
+        'price_unit_id': fields.many2one('product.price.unit','Price Unit' ),
+    }
+    
+    _defaults = {
+        'price_unit_id': _get_price_unit_id,
+    }
+mrp_bom()
+
+class stock_move(osv.osv):
+    _inherit = 'stock.move'
+    _columns = {
+        'price_unit_id': fields.many2one('product.price.unit','Price Unit internal'),
+        'price_unit_sale_id': fields.many2one('product.price.unit','Price Unit Sale' ),
+        'move_value': fields.float('Amount', digits_compute= dp.get_precision('Account')),
+        'move_value_sale': fields.float('Amount Sale',digits_compute= dp.get_precision('Account') ),
+    }
+stock_move()
+
+class stock_avg_price(osv.osv):
+    _name = "stock_avg_price"
+    def init(self, cr):
+        cr.execute("SELECT true FROM pg_catalog.pg_language WHERE lanname = 'plpgsql';")
+        if not cr.fetchall():
+            cr.execute("create language plpgsql;")
+
+        cr.execute("""
+CREATE OR REPLACE FUNCTION get_stock_avg_price(product_id_i integer,location_id_i  integer) RETURNS numeric AS $$
+DECLARE 
+ avg_price decimal(16,8);                    
+ value     float;                    
+ qty       float;                    
+ usage_p   varchar(32);
+
+BEGIN
+
+select into usage_p usage
+  from stock_location
+ where id = location_id_i;
+
+if usage_p = 'internal'
+then 
+select into value,qty
+       sum(case when location_id = location_id_i then -move_value
+                when location_dest_id = location_id_i then move_value 
+                else 0 end),
+       sum(case when location_id = location_id_i then -product_qty
+                when location_dest_id = location_id_i then product_qty 
+                else 0 end)
+  from stock_move
+ where product_id = product_id_i
+   and (location_id = location_id_i or location_dest_id = location_id_i)
+   and state = 'done'; 
+
+if qty = 0
+ then avg_price = 0;
+ else avg_price = value/qty;
+end if;
+end if;
+
+if avg_price is null
+ then avg_price = 0;
+end if;
+         
+                       
+RETURN avg_price;
+END;
+$$ LANGUAGE plpgsql;""")
+stock_avg_price()
+
+class sale_order(osv.osv):
+    _inherit = 'sale.order'
+    
+    def _amount_line_tax(self, cr, uid, line, context={}):
+        val = 0.0
+        for c in self.pool.get('account.tax').compute(cr, uid, line.tax_id, line.price_unit * (1-(line.discount or 0.0)/100.0)/ line.price_unit_id.coefficient, line.product_uom_qty, line.order_id.partner_invoice_id.id, line.product_id, line.order_id.partner_id):
+            val+= c['amount']
+        return val
+    
+    def action_ship_create(self, cr, uid, ids, *args):
+        val = super(sale_order, self).action_ship_create(cr, uid, ids, *args)
+        move_obj = self.pool.get('stock.move')
+        for order in self.browse(cr, uid, ids, context={}):
+            for line in order.order_line:
+                now = datetime.now()
+                order_date = datetime.strptime(order.date_order,"%Y-%m-%d")
+                date_planned = order_date + relativedelta(days=line.delay or 0.0)
+                if date_planned < now:
+                   date_planned = now
+
+                users_roles = self.pool.get('res.users').browse(cr, uid, uid).roles_id
+                for role in users_roles:
+                   if role.name=='Document date manual data':
+                       date_planned = order_date
+                if line.product_id and line.product_id.product_tmpl_id.type in ('product', 'consu'):
+                    location_id = line.product_id.property_stock_location.id
+                    if not location_id:
+                        location_id = line.product_id.categ_id.property_stock_location.id
+                    if not location_id:
+                        location_id = order.shop_id.warehouse_id.lot_stock_id.id
+                    move_ids = move_obj.search(cr, uid, [('sale_line_id','=',line.id)])
+                    cr.execute("""select get_stock_avg_price(%s,%s) ; """ % (line.product_id.id,location_id))
+                    res = cr.fetchone()
+                    stock_avg_price = (res and res[0]) or False
+                    move_obj.write(cr, uid, move_ids, {
+                                                       'date': line.order_id.date_order,
+                                                       'price_unit' : stock_avg_price,
+                                                       'price_unit_id': line.product_id.price_unit_id.id,
+                                                       'price_unit_sale_id': line.price_unit_id.id,
+                                                       'move_value' : line.product_uom_qty * stock_avg_price,
+                                                       'move_value_sale': line.price_subtotal,
+                                                       })
+        return True
+sale_order()
+
+class sale_order_line(osv.osv):
+    _inherit = 'sale.order.line'
+    
+    def _get_price_unit_id(self, cr, uid, *args):
+        cr.execute('select id from product_price_unit where coefficient = 1')
+        res = cr.fetchone()
+        return res and res[0] or False
+    
+    def _amount_line(self, cr, uid, ids, field_name, arg, context):
+        res = {}
+        cur_obj = self.pool.get('res.currency')
+        for line in self.browse(cr, uid, ids):
+            res[line.id] = line.price_unit * line.product_uom_qty * (1 - (line.discount or 0.0) / 100.0) / line.price_unit_id.coefficient
+            cur = line.order_id.pricelist_id.currency_id
+            res[line.id] = cur_obj.round(cr, uid, cur, res[line.id])
+        return res
+    
+    _columns = {
+        'price_unit_id': fields.many2one('product.price.unit','Price Unit', required=True),
+    }
+    
+    _defaults = {
+        'price_unit_id': _get_price_unit_id,
+    }
+    
+    def invoice_line_create(self, cr, uid, ids, context={}):
+        created_ids = super(sale_order_line,self).invoice_line_create(cr, uid, ids, context=context)
+        inv_line_obj = self.pool.get('account.invoice.line')
+        def _get_line_pu_id(line):
+            return line.price_unit_id.id
+        for line in self.browse(cr, uid, ids, context):
+            pu_id = _get_line_pu_id(line)
+            inv_line_obj.write(cr, uid, created_ids, {'price_unit_id': pu_id})
+        return created_ids
+    
+    def product_id_change(self, cr, uid, ids, pricelist, price_unit_id, product, qty=0,
+            uom=False, qty_uos=0, uos=False, name='', partner_id=False,
+            lang=False, update_tax=True, date_order=False, packaging=False, 
+            fiscal_position=False, flag=False):
+        if not partner_id:
+            raise osv.except_osv(_('No Customer Defined !'), _('You have to select a customer in the sale form !\nPlease set one customer before choosing a product.'))
+        warning = {}
+        product_uom_obj = self.pool.get('product.uom')
+        partner_obj = self.pool.get('res.partner')
+        product_obj = self.pool.get('product.product')
+        if partner_id:
+            lang = partner_obj.browse(cr, uid, partner_id).lang
+        context = {'lang': lang, 'partner_id': partner_id}
+
+        if not product:
+            return {'value': {'th_weight': 0, 'product_packaging': False,
+                'product_uos_qty': qty}, 'domain': {'product_uom': [],
+                   'product_uos': []}}
+
+        if not date_order:
+            date_order = time.strftime('%Y-%m-%d')
+
+        result = {}
+        product_obj = product_obj.browse(cr, uid, product, context=context)
+        if product:
+            pu = self.pool.get('product.product').browse(cr, uid, product)
+            pu_id = pu.price_unit_id.id
+            #result['value']['price_unit_id'] = pu_id
+            result['price_unit_id'] = pu_id
+
+        if not packaging and product_obj.packaging:
+            packaging = product_obj.packaging[0].id
+            result['product_packaging'] = packaging
+
+        if packaging:
+            default_uom = product_obj.uom_id and product_obj.uom_id.id
+            pack = self.pool.get('product.packaging').browse(cr, uid, packaging, context)
+            q = product_uom_obj._compute_qty(cr, uid, uom, pack.qty, default_uom)
+#            qty = qty - qty % q + q
+            if qty and (q and not (qty % q) == 0):
+                ean = pack.ean
+                qty_pack = pack.qty
+                type_ul = pack.ul
+                warn_msg = _("You selected a quantity of %d Units.\nBut it's not compatible with the selected packaging.\nHere is a proposition of quantities according to the packaging: ") % (qty)
+                warn_msg = warn_msg + "\n\n" + _("EAN: ") + str(ean) + _(" Quantity: ") + str(qty_pack) + _(" Type of ul: ") + str(type_ul.name)
+                warning = {
+                    'title': _('Picking Information !'),
+                    'message': warn_msg
+                    }
+            result['product_uom_qty'] = qty
+
+        if uom:
+            uom2 = product_uom_obj.browse(cr, uid, uom)
+            if product_obj.uom_id.category_id.id != uom2.category_id.id:
+                uom = False
+
+        if uos:
+            if product_obj.uos_id:
+                uos2 = product_uom_obj.browse(cr, uid, uos)
+                if product_obj.uos_id.category_id.id != uos2.category_id.id:
+                    uos = False
+            else:
+                uos = False        
+        if product_obj.description_sale:
+            result['notes'] = product_obj.description_sale
+        fpos = fiscal_position and self.pool.get('account.fiscal.position').browse(cr, uid, fiscal_position) or False
+        if update_tax: #The quantity only have changed
+            result['delay'] = (product_obj.sale_delay or 0.0)
+            partner = partner_obj.browse(cr, uid, partner_id)
+            result['tax_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, product_obj.taxes_id)
+            result.update({'type': product_obj.procure_method})
+
+        if not flag:
+            result['name'] = self.pool.get('product.product').name_get(cr, uid, [product_obj.id], context=context)[0][1]
+        domain = {}
+        if (not uom) and (not uos):
+            result['product_uom'] = product_obj.uom_id.id
+            if product_obj.uos_id:
+                result['product_uos'] = product_obj.uos_id.id
+                result['product_uos_qty'] = qty * product_obj.uos_coeff
+                uos_category_id = product_obj.uos_id.category_id.id
+            else:
+                result['product_uos'] = False
+                result['product_uos_qty'] = qty
+                uos_category_id = False
+            result['th_weight'] = qty * product_obj.weight
+            domain = {'product_uom':
+                        [('category_id', '=', product_obj.uom_id.category_id.id)],
+                        'product_uos':
+                        [('category_id', '=', uos_category_id)]}
+
+        elif uos: # only happens if uom is False
+            result['product_uom'] = product_obj.uom_id and product_obj.uom_id.id
+            result['product_uom_qty'] = qty_uos / product_obj.uos_coeff
+            result['th_weight'] = result['product_uom_qty'] * product_obj.weight
+        elif uom: # whether uos is set or not
+            default_uom = product_obj.uom_id and product_obj.uom_id.id
+            q = product_uom_obj._compute_qty(cr, uid, uom, qty, default_uom)
+            if product_obj.uos_id:
+                result['product_uos'] = product_obj.uos_id.id
+                result['product_uos_qty'] = qty * product_obj.uos_coeff
+            else:
+                result['product_uos'] = False
+                result['product_uos_qty'] = qty
+            result['th_weight'] = q * product_obj.weight        # Round the quantity up
+
+        # get unit price
+
+        if not pricelist:
+            warning = {
+                'title': 'No Pricelist !',
+                'message':
+                    'You have to select a pricelist in the sale form !\n'
+                    'Please set one before choosing a product.'
+                }
+        else:
+            price = self.pool.get('product.pricelist').price_get(cr, uid, [pricelist],
+                    product, qty or 1.0, partner_id, {
+                        'uom': uom,
+                        'date': date_order,
+                        })[pricelist]
+            if price is False:
+                warning = {
+                    'title': 'No valid pricelist line found !',
+                    'message':
+                        "Couldn't find a pricelist line matching this product and quantity.\n"
+                        "You have to change either the product, the quantity or the pricelist."
+                    }
+            else:
+                result.update({'price_unit': price})
+
+        # FIX ME
+        pname =  product_obj.name
+        if product_obj.variants: 
+            pname = pname + ' ['+product_obj.variants + ']'
+        if product_obj.price_unit_id.coefficient != 1.0:
+            pname = pname + ' (' + product_obj.price_unit_id.name + ')'
+        result['name'] = pname
+        return {'value': result, 'domain': domain,'warning': warning}
+    
+    def product_uom_change(self, cursor, user, ids, pricelist,  product, price_unit_id=False, qty=0,
+            uom=False, qty_uos=0, uos=False, name='', partner_id=False,
+            lang=False, update_tax=True, date_order=False):
+        res = self.product_id_change(cursor, user, ids, pricelist, price_unit_id,product,
+                qty=0, uom=uom, qty_uos=qty_uos, uos=uos, name=name,
+                partner_id=partner_id, lang=lang, update_tax=update_tax,
+                date_order=date_order)
+        if 'product_uom' in res['value']:
+            del res['value']['product_uom']
+        if not uom:
+            res['value']['price_unit'] = 0.0
+        return res
+    
+sale_order_line()
+
+class purchase_order(osv.osv):
+    _name = "purchase.order"
+    _inherit = "purchase.order"
+    
+    def _calc_amount(self, cr, uid, ids, prop, unknow_none, unknow_dict):
+        res = {}
+        for order in self.browse(cr, uid, ids):
+            res[order.id] = 0
+            for oline in order.order_line:
+                res[order.id] += oline.price_unit * oline.product_qty / oline.price_unit_id.coefficient
+        return res
+
+    def _amount_all(self, cr, uid, ids, field_name, arg, context):
+        res = {}
+        cur_obj=self.pool.get('res.currency')
+        for order in self.browse(cr, uid, ids):
+            res[order.id] = {
+                'amount_untaxed': 0.0,
+                'amount_tax': 0.0,
+                'amount_total': 0.0,
+            }
+            val = val1 = 0.0
+            cur=order.pricelist_id.currency_id
+            for line in order.order_line:
+                for c in self.pool.get('account.tax').compute(cr, uid, line.taxes_id, line.price_unit, line.product_qty, order.partner_address_id.id, line.product_id, order.partner_id):
+                    val+= c['amount'] / line.price_unit_id.coefficient
+                val1 += line.price_subtotal
+            res[order.id]['amount_tax']=cur_obj.round(cr, uid, cur, val)
+            res[order.id]['amount_untaxed']=cur_obj.round(cr, uid, cur, val1)
+            res[order.id]['amount_total']=res[order.id]['amount_untaxed'] + res[order.id]['amount_tax']
+        return res
+
+    def _get_order(self, cr, uid, ids, context={}):
+        result = {}
+        for line in self.pool.get('purchase.order.line').browse(cr, uid, ids, context=context):
+            result[line.order_id.id] = True
+        return result.keys()
+
+    _columns = {
+        'amount_untaxed': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Purchase Price'), string='Untaxed Amount',
+            store={
+                'purchase.order.line': (_get_order, None, 10),
+            }, multi="sums"),
+        'amount_tax': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Purchase Price'), string='Taxes',
+            store={
+                'purchase.order.line': (_get_order, None, 10),
+            }, multi="sums"),
+        'amount_total': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Purchase Price'), string='Total',
+            store={
+                'purchase.order.line': (_get_order, None, 10),
+            }, multi="sums"),
+    }
+    
+    def inv_line_create(self, cr, uid, a, ol):
+        return (0, False, {
+            'name': ol.name,
+            'account_id': a,
+            'price_unit': ol.price_unit or 0.0,
+            'price_unit_id': ol.price_unit_id.id ,
+            'quantity': ol.product_qty,
+            'product_id': ol.product_id.id or False,
+            'uos_id': ol.product_uom.id or False,
+            'invoice_line_tax_id': [(6, 0, [x.id for x in ol.taxes_id])],
+            'account_analytic_id': ol.account_analytic_id.id,
+        })
+    
+    def action_picking_create(self,cr, uid, ids, *args):
+        picking_id = super(purchase_order, self).action_picking_create(cr, uid, ids, *args)
+        move_obj = self.pool.get('stock.move')
+        for order in self.browse(cr, uid, ids):
+            for line in order.order_line:
+                move_ids = move_obj.search(cr, uid, [('purchase_line_id','=',line.id),('picking_id','=',picking_id)])
+                move_obj.write(cr, uid, move_ids, {
+                                                   'price_unit_id': line.price_unit_id.id,
+                                                   })
+        return picking_id
+
+purchase_order()
+
+class purchase_order_line(osv.osv):
+    _name = 'purchase.order.line'
+    _inherit = 'purchase.order.line'
+
+    def _get_price_unit_id(self, cr, uid, *args):
+        cr.execute('select id from product_price_unit where coefficient = 1')
+        res = cr.fetchone()
+        return res and res[0] or False
+
+    def _amount_line(self, cr, uid, ids, prop, unknow_none, unknow_dict):
+        res = {}
+        cur_obj=self.pool.get('res.currency')
+        for line in self.browse(cr, uid, ids):
+            cur = line.order_id.pricelist_id.currency_id
+            res[line.id] = cur_obj.round(cr, uid, cur, line.price_unit * line.product_qty / line.price_unit_id.coefficient) 
+        return res
+
+    _columns = {
+        'price_unit_id' : fields.many2one('product.price.unit','Price Unit', required=True),
+        'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', digits_compute= dp.get_precision('Purchase Price')),
+    }
+    _defaults = {
+        'price_unit_id': _get_price_unit_id,
+    }
+
+    def price_product_id_change(self, cr, uid, ids, pricelist, price_unit_id, product, qty, uom,
+            partner_id, date_order=False, fiscal_position=False, date_planned=False,
+            name=False, price_unit=False, notes=False):
+        result = super(purchase_order_line, self).product_id_change(cr, uid, ids, pricelist, product, qty, uom,
+            partner_id, date_order, fiscal_position, date_planned, name, price_unit, notes)
+        if product and 'value' in result:
+            pu = self.pool.get('product.product').browse(cr, uid, product)
+            if pu.price_unit_id:
+                result['value']['price_unit_id'] = pu.price_unit_id.id
+        return result
+
+purchase_order_line()
+
+class stock_partial_picking(osv.osv_memory):
+    _inherit = "stock.partial.picking"
+
+    def view_init(self, cr, uid, fields_list, context=None):
+        res = super(stock_partial_picking, self).view_init(cr, uid, fields_list, context=context)
+        pick_obj = self.pool.get('stock.picking')        
+        if not context:
+            context={}
+        moveids = []
+        for pick in pick_obj.browse(cr, uid, context.get('active_ids', [])):            
+            for m in pick.move_lines:
+                if m.state in ('done', 'cancel'):
+                    continue
+                if 'move%s_product_id'%(m.id) not in self._columns:
+                    self._columns['move%s_product_id'%(m.id)] = fields.many2one('product.product',string="Product")
+                if 'move%s_product_qty'%(m.id) not in self._columns:
+                    self._columns['move%s_product_qty'%(m.id)] = fields.float("Quantity")
+                if 'move%s_product_uom'%(m.id) not in self._columns:
+                    self._columns['move%s_product_uom'%(m.id)] = fields.many2one('product.uom',string="Product UOM")
+
+                if (pick.type == 'in') and (m.product_id.cost_method == 'average'):
+                    if 'move%s_product_price'%(m.id) not in self._columns:
+                        self._columns['move%s_product_price'%(m.id)] = fields.float("Price")
+                    if 'move%s_product_currency'%(m.id) not in self._columns:
+                        self._columns['move%s_product_currency'%(m.id)] = fields.many2one('res.currency',string="Currency")
+                    if 'move%s_product_price_unit_id'%(m.id) not in self._columns:
+                        self._columns['move%s_product_price_unit_id'%(m.id)] = fields.float("Price Unit")
+        return res   
+
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False,submenu=False):
+        result = super(stock_partial_picking, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu)        
+        pick_obj = self.pool.get('stock.picking')
+        picking_ids = context.get('active_ids', False) 
+        picking_ids = pick_obj.search(cr, uid, [('id', 'in', picking_ids)])               
+        _moves_arch_lst = """<form string="Deliver Products">
+                        <separator colspan="4" string="Delivery Information"/>
+                        <field name="date" colspan="4" />
+                        <field name="partner_id"/>
+                        <field name="address_id"/>
+                        <newline/>
+                        <separator colspan="4" string="Move Detail"/>
+                        """
+        _moves_fields = result['fields']
+        if picking_ids and view_type in ['form']:
+            for pick in pick_obj.browse(cr, uid, picking_ids, context):
+                for m in pick.move_lines:
+                    if m.state in ('done', 'cancel'):
+                        continue
+                    _moves_fields.update({
+                        'move%s_product_id'%(m.id)  : {
+                                    'string': _('Product'),
+                                    'type' : 'many2one', 
+                                    'relation': 'product.product', 
+                                    'required' : True, 
+                                    'readonly' : True,                                    
+                                    },
+                        'move%s_product_qty'%(m.id) : {
+                                    'string': _('Quantity'),
+                                    'type' : 'float',
+                                    'required': True,                                    
+                                    },
+                        'move%s_product_uom'%(m.id) : {
+                                    'string': _('Product UOM'),
+                                    'type' : 'many2one', 
+                                    'relation': 'product.uom', 
+                                    'required' : True, 
+                                    'readonly' : True,                                    
+                                    }
+                    })                
+                    
+                    _moves_arch_lst += """
+                        <group colspan="4" col="12">
+                        <field name="move%s_product_id" nolabel="1"/>
+                        <field name="move%s_product_qty" string="Qty" />
+                        <field name="move%s_product_uom" nolabel="1" />
+                    """%(m.id, m.id, m.id)
+                    if (pick.type == 'in') and (m.product_id.cost_method == 'average'):                        
+                        _moves_fields.update({
+                            'move%s_product_price'%(m.id) : {
+                                    'string': _('Price'),
+                                    'type' : 'float',
+                                    },
+                            'move%s_product_currency'%(m.id): {
+                                    'string': _('Currency'),
+                                    'type' : 'many2one', 
+                                    'relation': 'res.currency',
+                                    },
+                            'move%s_product_price_unit_id'%(m.id): {
+                                    'string': _('Price Unit'),
+                                    'type': 'many2one',
+                                    'relation': 'product.price.unit', 
+                                    'required': True,
+                                    },
+                        })
+                        _moves_arch_lst += """
+                            <field name="move%s_product_price" />
+                            <field name="move%s_product_currency" nolabel="1"/>
+                            <field name="move%s_product_price_unit_id" nolabel="1"/>
+                        """%(m.id, m.id, m.id)
+                    _moves_arch_lst += """
+                        </group>
+                        """
+        _moves_arch_lst += """
+                <separator string="" colspan="4" />
+                <label string="" colspan="2"/>
+                <group col="2" colspan="2">
+                <button icon='gtk-cancel' special="cancel"
+                    string="_Cancel" />
+                <button name="do_partial" string="_Deliver"
+                    colspan="1" type="object" icon="gtk-apply" />
+            </group>                    
+        </form>"""
+        result['arch'] = _moves_arch_lst
+        result['fields'] = _moves_fields           
+        return result
+
+    def default_get(self, cr, uid, fields, context=None):
+        """ 
+             To get default values for the object.
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param fields: List of fields for which we want default values 
+             @param context: A standard dictionary 
+             
+             @return: A dictionary which of fields with values. 
+        
+        """ 
+
+        res = super(stock_partial_picking, self).default_get(cr, uid, fields, context=context)
+        pick_obj = self.pool.get('stock.picking')        
+        if not context:
+            context={}
+        moveids = []
+        if 'date' in fields:
+            res.update({'date': time.strftime('%Y-%m-%d %H:%M:%S')})
+        for pick in pick_obj.browse(cr, uid, context.get('active_ids', [])):
+            if 'partner_id' in fields:
+                res.update({'partner_id': pick.address_id.partner_id.id})                
+            if 'address_id' in fields:
+                res.update({'address_id': pick.address_id.id})            
+            for m in pick.move_lines:
+                if m.state in ('done', 'cancel'):
+                    continue
+                if 'move%s_product_id'%(m.id) in fields:
+                    res['move%s_product_id'%(m.id)] = m.product_id.id
+                if 'move%s_product_qty'%(m.id) in fields:
+                    res['move%s_product_qty'%(m.id)] = m.product_qty
+                if 'move%s_product_uom'%(m.id) in fields:
+                    res['move%s_product_uom'%(m.id)] = m.product_uom.id
+
+                if (pick.type == 'in') and (m.product_id.cost_method == 'average'):
+                    price = 0
+                    if hasattr(m, 'purchase_line_id') and m.purchase_line_id:
+                        price = m.purchase_line_id.price_unit
+                    if hasattr(m, 'purchase_line_id') and m.price_unit_id:
+                        price_unit_id = m.purchase_line_id.price_unit_id.id
+
+                    currency = False
+                    if hasattr(pick, 'purchase_id') and pick.purchase_id:
+                        currency = pick.purchase_id.pricelist_id.currency_id.id
+        
+                    if 'move%s_product_price'%(m.id) in fields:
+                        res['move%s_product_price'%(m.id)] = price
+                    if 'move%s_product_currency'%(m.id) in fields:
+                        res['move%s_product_currency'%(m.id)] = currency
+                    if 'move%s_product_price_unit_id'%(m.id) in fields:
+                        res['move%s_product_price_unit_id'%(m.id)] = price_unit_id
+        return res   
+
+    def do_partial(self, cr, uid, ids, context):    
+        pick_obj = self.pool.get('stock.picking')    
+        picking_ids = context.get('active_ids', False)
+        partial = self.browse(cr, uid, ids[0], context)
+        partial_datas = {
+            'partner_id' : partial.partner_id and partial.partner_id.id or False,
+            'address_id' : partial.address_id and partial.address_id.id or False,
+            'delivery_date' : partial.date         
+        }
+        for pick in pick_obj.browse(cr, uid, picking_ids):
+            for m in pick.move_lines:
+                if m.state in ('done', 'cancel'):
+                    continue
+                partial_datas['move%s'%(m.id)] = {
+                    'product_id' : getattr(partial, 'move%s_product_id'%(m.id)).id,
+                    'product_qty' : getattr(partial, 'move%s_product_qty'%(m.id)),
+                    'product_uom' : getattr(partial, 'move%s_product_uom'%(m.id)).id
+                }
+
+                if (pick.type == 'in') and (m.product_id.cost_method == 'average'):   
+                    partial_datas['move%s'%(m.id)].update({             
+                        'product_price' : getattr(partial, 'move%s_product_price'%(m.id)),
+                        'product_currency': getattr(partial, 'move%s_product_currency'%(m.id)).id,
+                        'product_price_unit_id' : getattr(partial, 'move%s_product_price_unit_id'%(m.id)).id,
+                    })          
+        res = pick_obj.do_partial(cr, uid, picking_ids, partial_datas, context=context)
+        return {}
+ 
+stock_partial_picking()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product_price_unit/product_price_unit_data.xml b/addons/product_price_unit/product_price_unit_data.xml
new file mode 100644
index 00000000000..fca300c7009
--- /dev/null
+++ b/addons/product_price_unit/product_price_unit_data.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+         <!--
+        Resource: product.price.unit
+        -->
+    <record id="pu1" model="product.price.unit">
+      <field name="name">Price/Unit</field>
+      <field name="code"> </field>
+      <field name="coefficient">1</field>
+    </record>
+
+    <record id="pu2" model="product.price.unit">
+      <field name="name">Price/100 Units</field>
+      <field name="code">%</field>
+      <field name="coefficient">100</field>
+    </record>
+
+    <record id="pu3" model="product.price.unit">
+      <field name="name">Price/1000 Units</field>
+      <field name="code">‰</field>
+      <field name="coefficient">1000</field>
+    </record>
+
+    <record id="pu4" model="product.price.unit">
+           <field name="name">Price in Cents</field>
+           <field name="code">¢</field>
+           <field name="coefficient">100</field>
+    </record>
+
+    </data>
+</openerp>
diff --git a/addons/product_price_unit/product_price_unit_view.xml b/addons/product_price_unit/product_price_unit_view.xml
new file mode 100644
index 00000000000..958b4b7f6d6
--- /dev/null
+++ b/addons/product_price_unit/product_price_unit_view.xml
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+		<!--  Product Form -->
+        <record id="product_normal_form_view" model="ir.ui.view">
+            <field name="name">product_price_unit_form</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="list_price" position="after">
+                   	<field name="price_unit_id" on_change="on_change_price_unit(price_unit_id,standard_price,list_price)"/>
+                   	<field name="standard_price_coeff"/>
+                   	<field name="list_price_coeff"/>
+                </field>
+            </field>
+        </record>
+        
+        <!--  Product Tree -->
+        <record id="product_product_tree_view_value1" model="ir.ui.view">
+            <field name="name">product.product.tree</field>
+            <field name="model">product.product</field>
+            <field name="type">tree</field>
+            <field name="inherit_id" ref="product.product_product_tree_view"/>
+            <field name="arch" type="xml">
+	            <field name="qty_available" position="after">
+	                <field name="average_price" />
+	                <field name="stock_value" sum="Sum Stock Value"/>
+	            </field>
+            </field>
+        </record>
+        
+        <record id="view_category_property_form" model="ir.ui.view">
+            <field name="name">product.category.stock.property.form.inherit</field>
+            <field name="model">product.category</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="product.product_category_form_view"/>
+            <field name="arch" type="xml">
+                <form position="inside">
+                    <group col="2" colspan="2">
+                        <separator string="Accounting Stock Properties" colspan="2"/>
+                        <field name="property_stock_account_input_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                        <field name="property_stock_account_output_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                        <field name="property_stock_journal"/>
+                        <field name="property_stock_location" domain="[('usage','=','internal')]"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+        
+        <record id="view_category_allow_negative_form" model="ir.ui.view">
+            <field name="name">product.category.stock.allow_negative.form.inherit</field>
+            <field name="model">product.category</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="view_category_property_form"/>
+            <field name="arch" type="xml">
+                <field name="sequence" position="after">
+                  <field name="allow_negative_stock" />
+                </field>
+            </field>
+        </record>
+        
+        <record id="view_normal_property_form" model="ir.ui.view">
+            <field name="name">product.normal.stock.property.form.inherit</field>
+            <field name="model">product.product</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="arch" type="xml">
+                <group name="store" position="replace">
+                    <group col="2" colspan="2" name="store">
+                        <separator string="Counter-Part Locations Properties" colspan="2"/>
+                        <field name="property_stock_procurement" widget="selection" domain="[('usage','=','procurement')]"/>
+                        <field name="property_stock_production" widget="selection"/>
+                        <field name="property_stock_inventory" widget="selection"/>
+                        <field name="property_stock_location" domain="[('usage','=','internal')]" widget="selection"/>
+                    </group>
+                </group>
+            </field>
+        </record>
+        
+        <record id="view_template_allow_negative_form" model="ir.ui.view">
+            <field name="name">product.normal.stock.allow_negative.form.inherit</field>
+            <field name="model">product.product</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="view_normal_property_form"/>
+            <field name="arch" type="xml">
+                <field name="active" position="after">
+                  <field name="allow_negative_stock" />
+                </field>
+            </field>
+        </record>
+
+		<!--  Invoice Line Form -->
+        <record id="view_invoice_line_form1" model="ir.ui.view">
+            <field name="name">invoice_price_unit_form</field>
+            <field name="model">account.invoice.line</field>
+            <field name="inherit_id" ref="account.view_invoice_line_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            	<field name="product_id" position="replace">
+                    <field name="product_id"  on_change="price_product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, price_unit_id, parent.address_invoice_id, parent.currency_id, {'company_id': parent.company_id})"  colspan="4"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="view_invoice_line_form" model="ir.ui.view">
+            <field name="name">invoice_price_unit_form1</field>
+            <field name="model">account.invoice.line</field>
+            <field name="inherit_id" ref="view_invoice_line_form1"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="price_unit" position="after">
+                    <field name="price_unit_id"/>
+                </field>
+            </field>
+        </record>
+
+		<!--  Invoice Line Tree -->
+        <record id="view_invoice_line_tree" model="ir.ui.view">
+            <field name="name">invoice_price_unit_tree</field>
+            <field name="model">account.invoice.line</field>
+            <field name="inherit_id" ref="account.view_invoice_line_tree"/>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <field name="discount" position="after">
+                    <field name="price_unit_id"/>
+                </field>
+            </field>
+        </record>
+
+		<!--  HR Expense Line Form -->
+        <record id="view_expenses_form" model="ir.ui.view">
+            <field name="name">hr_expense_line_price_unit_form</field>
+            <field name="model">hr.expense.expense</field>
+            <field name="inherit_id" ref="hr_expense.view_expenses_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="unit_amount" position="after">
+                    <field name="price_unit_id"/>
+                </field>
+            </field>
+        </record>
+
+		<!--  HR Expense Line Tree -->
+        <record id="view_expenses_line_tree" model="ir.ui.view">
+            <field name="name">hr_expense_line_price_unit_tree</field>
+            <field name="model">hr.expense.line</field>
+            <field name="inherit_id" ref="hr_expense.view_expenses_line_tree"/>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <field name="unit_amount" position="after">
+                    <field name="price_unit_id"/>
+                </field>
+            </field>
+        </record>
+        
+        <!--  MRP bom Form -->
+        <record id="mrp_bom_form_view_inherit" model="ir.ui.view">
+            <field name="name">mrp.bom.form.inherit</field>
+            <field name="model">mrp.bom</field>
+            <field name="inherit_id" ref="mrp.mrp_bom_form_view"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="company_id" position="after">
+                    <field name="price_unit_id"/>
+                </field>
+            </field>
+        </record>
+        
+        <!--  Sale order Form -->
+        <record id="view_sale_order_form_inherit1" model="ir.ui.view">
+            <field name="name">sale.order.form.inherit</field>
+            <field name="model">sale.order</field>
+            <field name="inherit_id" ref="sale.view_order_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page/field[@name='order_line']/form/notebook/page/field[@name='product_id']" position="replace">
+        	       <field colspan="4"
+			           context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
+			           name="product_id"
+			           on_change="product_id_change(parent.pricelist_id,price_unit_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], True, parent.date_order, product_packaging, parent.fiscal_position)"
+			           select="1"/>
+                </xpath>
+            </field>
+        </record>
+        
+        <record id="view_sale_order_form_inherit2" model="ir.ui.view">
+            <field name="name">sale.order.form.inherit2</field>
+            <field name="model">sale.order</field>
+            <field name="inherit_id" ref="sale.view_order_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page/field[@name='order_line']/form/notebook/page/field[@name='product_uom_qty']" position="replace">
+			       <field
+			           context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
+			           name="product_uom_qty"
+			           on_change="product_id_change(parent.pricelist_id,price_unit_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging, parent.fiscal_position, True)"
+			           select="1"/>
+			     </xpath>
+            </field>
+        </record>
+           
+        <record id="view_order_form_inherit5" model="ir.ui.view">
+            <field name="name">sale.order.form.inherit5</field>
+            <field name="model">sale.order</field>
+            <field name="inherit_id" ref="sale.view_order_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page/field[@name='order_line']/form/notebook/page/field[@name='price_unit']" position="after">
+                    <field name="price_unit_id"/>
+                </xpath>
+            </field>
+        </record>
+
+		<!--  Purchase Order Line Form -->
+        <record id="purchase_order_line_form1" model="ir.ui.view">
+            <field name="name">purchase_order_line_price_unit_form</field>
+            <field name="model">purchase.order.line</field>
+            <field name="inherit_id" ref="purchase.purchase_order_line_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="price_unit" position="after">
+                    <field name="price_unit_id"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="purchase_order_line_form" model="ir.ui.view">
+            <field name="name">purchase_order_line_price_unit_form</field>
+            <field name="model">purchase.order.line</field>
+            <field name="inherit_id" ref="purchase_order_line_form1"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="product_id" position="replace">
+                    <field colspan="4" context="partner_id=parent.partner_id,quantity=product_qty,pricelist=parent.pricelist_id,uom=product_uom,warehouse=parent.warehouse_id" name="product_id" on_change="price_product_id_change(parent.pricelist_id,price_unit_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order, parent.fiscal_position)"/>
+                </field>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index 5b3830fbcb5..bddd08ea3b7 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -56,7 +56,9 @@
              'test/purchase_from_manual.yml',
 #             'test/purchase_from_picking.yml',
     ],
-    'demo_xml': ['purchase_demo.xml','purchase_unit_test.xml'],
+    'demo_xml': ['purchase_demo.xml',
+#                 'purchase_unit_test.xml'
+                 ],
     'installable': True,
     'active': False,
     'certificate': '0057234283549',
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index 2f265b3d6f7..06e4d489f9b 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -60,7 +60,7 @@
         'stock_view.xml',
 #        'process/sale_process.xml',
     ],
-    'demo_xml': ['sale_demo.xml'],
+#    'demo_xml': ['sale_demo.xml'],
     'test': [
              'test/shipping_manual_sale_order.yml',
              'test/prepaid_sale_order.yml',

From 3eb13e257fa730c6edcd07594e9c30256a30aaf6 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Thu, 3 Jun 2010 13:13:49 +0530
Subject: [PATCH 018/121] [IMP] Task-869 Improvement Log Message for account

bzr revid: ksa@tinyerp.co.in-20100603074349-dntnjmu7u98d3opy
---
 addons/account/invoice.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 313ea48433e..105810f4cbb 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -952,6 +952,11 @@ class account_invoice(osv.osv):
 
     def _log_event(self, cr, uid, ids, factor=1.0, name='Open Invoice'):
         #TODO: implement messages system
+         for invoice in self.browse(cr, uid, ids):
+            for (id,number) in self.name_get(cr, uid, ids):
+                inv_number = number.split('/')[-1]
+                message = _('Invoice ') + " '" + _('INV/')+ inv_number + "' "+ _("Opened,")+_('journal entries')+ "' " + invoice.move_id.name + "' "+_("Created")
+                self.log(cr, uid, id, message)
             return True
 
     def name_get(self, cr, uid, ids, context=None):

From 3e2ef2dd1fdd70bba1560359f5f79f900c710c0c Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 3 Jun 2010 15:13:18 +0530
Subject: [PATCH 019/121] [IMP]: mail_gateway: Minor improvements in mailgate
 message view

bzr revid: rpa@tinyerp.com-20100603094318-rhkwrhmxa58x9kf6
---
 addons/mail_gateway/mail_gateway_view.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
index b1daeaa1b57..3c3802ec6f0 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -11,6 +11,7 @@
 	                    <field name="name" required="1" select="1"/>
 	                    <field name="date" required="1" select="1"/>
 	                    <field name="user_id" string="Responsible" select="1"/>
+	                    <field name="partner_id" />
 	                </group>
                     <notebook colspan="4">
 	                    <page string="Details">
@@ -19,7 +20,7 @@
 			                    <field name="email_from" />
 			                    <field name="email_to" />
 			                    <field name="email_cc" />
-			                    <field name="email_bcc" invisible="1"/>
+			                    <field name="email_bcc" groups="base.group_extended"/>
 			               </group>
 			               <group col="2" colspan="2">
                                 <separator string="Message Details" colspan="4"/>
@@ -45,6 +46,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Mailgateway Message">
+                    <field name="name" />
                     <field name="date" />
                     <field name="email_from" />
                     <field name="user_id" />

From 3071ddcd55e22bf9cf96c0fe9d545bada6272309 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Thu, 3 Jun 2010 15:43:35 +0530
Subject: [PATCH 020/121] [FIX] product_price_unit: Fixed name error.

bzr revid: uco@tinyerp.com-20100603101335-3qz216jf2g52s1zz
---
 addons/product_price_unit/product_price_unit.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/product_price_unit/product_price_unit.py b/addons/product_price_unit/product_price_unit.py
index e98599c6cd5..008622e82f1 100644
--- a/addons/product_price_unit/product_price_unit.py
+++ b/addons/product_price_unit/product_price_unit.py
@@ -309,8 +309,6 @@ class product_product(osv.osv):
         'price_unit_id': _get_price_unit_id,
     }
     
-        # FIXME - check does not raise error
-#     allow_negative_stock is defined for product_template
     def _check_allow_negative_stock(self, cr, uid, ids):
         for product in self.browse(cr, uid, ids):
             if product.qty_available < 0.0:
@@ -321,7 +319,7 @@ class product_product(osv.osv):
                    return False
         return True
 
-    _constraints = [ (_check_allow_negative_stock, 'Error: Negative stock quantities are not allowed for this product or product category', ['name']), ]
+    _constraints = [(_check_allow_negative_stock, 'Error: Negative stock quantities are not allowed for this product or product category', ['name']),]
 
     
     def on_change_price_unit(self, cr, uid, ids,price_unit_id,standard_price,list_price):
@@ -772,7 +770,7 @@ class sale_order_line(osv.osv):
         pname =  product_obj.name
         if product_obj.variants: 
             pname = pname + ' ['+product_obj.variants + ']'
-        if product_obj.price_unit_id.coefficient != 1.0:
+        if product_obj.price_unit_id and product_obj.price_unit_id.coefficient != 1.0:
             pname = pname + ' (' + product_obj.price_unit_id.name + ')'
         result['name'] = pname
         return {'value': result, 'domain': domain,'warning': warning}

From e7b678a89f02b8b8dfbaf1876ca88d931426c2b3 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 3 Jun 2010 15:56:06 +0530
Subject: [PATCH 021/121] [IMP]: document: Implemented docx2txt, pptx2txt,
 xlsx2txt for document index content

bzr revid: rpa@tinyerp.com-20100603102606-piidn11qolihpfpw
---
 addons/document/document_view.xml |  7 +--
 addons/document/std_index.py      | 92 +++++++++++++++++++++++--------
 2 files changed, 72 insertions(+), 27 deletions(-)

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index fd424ad7d52..db15ef3bf93 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -193,10 +193,7 @@
                         <group col="2" colspan="2" attrs="{'invisible':[('type','=','binary')]}">
                         <field name="url" widget="url"/>
                         </group>
-
                     </group>
-
-
                     <group col="2" colspan="2">
                         <separator string="Relation" colspan="2"/>
                          <field name="res_name" readonly="1"/>
@@ -219,7 +216,9 @@
                 <page string="Security">
                     <field name="group_ids" colspan="4" nolabel="1"/>
                 </page>
-
+                <page string="Indexed Content" groups="base.group_extended">
+                    <field name="index_content" colspan="4" nolabel="1"/>
+                </page>
                 <page string="Notes">
                     <field colspan="4" name="description" nolabel="1"/>
                 </page>
diff --git a/addons/document/std_index.py b/addons/document/std_index.py
index 2f2f2094bc3..2facb14eeb3 100644
--- a/addons/document/std_index.py
+++ b/addons/document/std_index.py
@@ -19,10 +19,11 @@
 #
 ##############################################################################
 
+from content_index import indexer, cntIndex
+from subprocess import Popen, PIPE
 import StringIO
 import odt2txt
-from subprocess import Popen, PIPE
-from content_index import indexer, cntIndex
+import sys, zipfile, xml.dom.minidom
 
 def _to_unicode(s):
     try:
@@ -36,6 +37,15 @@ def _to_unicode(s):
             except UnicodeError:
                 return s
 
+def textToString(element) :
+    buffer = u""
+    for node in element.childNodes :
+        if node.nodeType == xml.dom.Node.TEXT_NODE :
+            buffer += node.nodeValue
+        elif node.nodeType == xml.dom.Node.ELEMENT_NODE :
+            buffer += textToString(node)
+    return buffer
+        
 class TxtIndex(indexer):
     def _getMimeTypes(self):
         return ['text/plain','text/html','text/diff','text/xml', 'text/*', 
@@ -57,14 +67,23 @@ class PptxIndex(indexer):
         return ['.pptx']
 
     def _doIndexFile(self,fname):
-        # pptx2txt.pl package not support in windows platform.
-        # Download pptx2txt package from  http://sourceforge.net/projects/pptx2txt/" link.
-        # To install this tool, just copy pptx2txt.pl to appropriate place (e.g. /usr/bin directory)
-        fp = Popen(['pptx2txt.pl', fname], shell=False, stdout=PIPE).stdout
-        fp.read()
-        file_obj = open(str(fname + ".txt"), "r")
-        data = file_obj.read()
-        return _to_unicode(data)
+        def toString () :
+            """ Converts the document to a string. """
+            buffer = u""
+            for val in ["a:t"]:
+                for paragraph in content.getElementsByTagName(val) :
+                    buffer += textToString(paragraph) + "\n"
+            return buffer
+
+        data = []
+        zip = zipfile.ZipFile(fname)
+        files = filter(lambda x: x.startswith('ppt/slides/slide'), zip.namelist())
+        for i in range(1, len(files) + 1):
+            content = xml.dom.minidom.parseString(zip.read('ppt/slides/slide%s.xml' % str(i)))
+            res = toString().encode('ascii','replace')
+            data.append(res)
+
+        return _to_unicode('\n'.join(data))
 
 cntIndex.register(PptxIndex())
 
@@ -76,33 +95,60 @@ class DocIndex(indexer):
         return ['.doc']
 
     def _doIndexFile(self,fname):
-        fp = Popen(['antiword', fname], shell=False, stdout=PIPE).stdout
-        return _to_unicode( fp.read())
+        #fp = Popen(['antiword', fname], shell=False, stdout=PIPE).stdout
+        return _to_unicode( 'None')
 
 cntIndex.register(DocIndex())
 
 class DocxIndex(indexer):
     def _getMimeTypes(self):
         return [ 'application/vnd.openxmlformats-officedocument.wordprocessingml.document']
-    
+
     def _getExtensions(self):
         return ['.docx']
 
     def _doIndexFile(self,fname):
-        # docx2txt.pl package not support in windows platform.
-        # Download docx2txt package from  "http://sourceforge.net/projects/docx2txt/" link.   
-        # In case, you don't want to use Makefile for installation, you can follow these steps for manual installation.
-        # Copy docx2txt.pl, docx2txt.sh and docx2txt.config to appropriate place (e.g. /usr/bin directory) . used following command.
-        # --> cp docx2txt.pl docx2txt.sh docx2txt.config /usr/bin/
+        zip = zipfile.ZipFile(fname)
+        content = xml.dom.minidom.parseString(zip.read("word/document.xml"))
+        def toString () :
+            """ Converts the document to a string. """
+            buffer = u""
+            for val in ["w:p", "w:h", "text:list"]:
+                for paragraph in content.getElementsByTagName(val) :
+                    buffer += textToString(paragraph) + "\n"
+            return buffer
 
-        fp = Popen(['docx2txt.pl', fname], shell=False, stdout=PIPE).stdout
-        fp.read()
-        file_obj = open(str(fname + ".txt"), "r")
-        data = file_obj.read()
-        return _to_unicode(data)
+        res = toString().encode('ascii','replace')
+
+        return _to_unicode(res)
 
 cntIndex.register(DocxIndex())
 
+
+class XlsxIndex(indexer):
+    def _getMimeTypes(self):
+        return [ 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']
+
+    def _getExtensions(self):
+        return ['.xlsx']
+
+    def _doIndexFile(self,fname):
+        zip = zipfile.ZipFile(fname)
+        content = xml.dom.minidom.parseString(zip.read("xl/sharedStrings.xml"))
+        def toString () :
+            """ Converts the document to a string. """
+            buffer = u""
+            for val in ["t"]:
+                for paragraph in content.getElementsByTagName(val) :
+                    buffer += textToString(paragraph) + "\n"
+            return buffer
+
+        res = toString().encode('ascii','replace')
+
+        return _to_unicode(res)
+
+cntIndex.register(XlsxIndex())
+
 class PdfIndex(indexer):
     def _getMimeTypes(self):
         return [ 'application/pdf']

From 5dbc503e252563da896c6f18783c18f9b18ec8ec Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Thu, 3 Jun 2010 16:42:14 +0530
Subject: [PATCH 022/121] [REF] product_price_unit: Product form view
 corrected.

bzr revid: uco@tinyerp.com-20100603111214-pq9wyr9y3cf7ryst
---
 .../product_price_unit_view.xml               | 36 +++++++------------
 1 file changed, 12 insertions(+), 24 deletions(-)

diff --git a/addons/product_price_unit/product_price_unit_view.xml b/addons/product_price_unit/product_price_unit_view.xml
index 958b4b7f6d6..1d7cb404df6 100644
--- a/addons/product_price_unit/product_price_unit_view.xml
+++ b/addons/product_price_unit/product_price_unit_view.xml
@@ -30,21 +30,15 @@
             </field>
         </record>
         
-        <record id="view_category_property_form" model="ir.ui.view">
+        <record id="view_category_property_form_price_unit" model="ir.ui.view">
             <field name="name">product.category.stock.property.form.inherit</field>
             <field name="model">product.category</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="product.product_category_form_view"/>
+            <field name="inherit_id" ref="stock.view_category_property_form"/>
             <field name="arch" type="xml">
-                <form position="inside">
-                    <group col="2" colspan="2">
-                        <separator string="Accounting Stock Properties" colspan="2"/>
-                        <field name="property_stock_account_input_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                        <field name="property_stock_account_output_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                        <field name="property_stock_journal"/>
-                        <field name="property_stock_location" domain="[('usage','=','internal')]"/>
-                    </group>
-                </form>
+                <field name="property_stock_journal" position="after">
+                    <field name="property_stock_location" domain="[('usage','=','internal')]"/>
+                </field>
             </field>
         </record>
         
@@ -52,7 +46,7 @@
             <field name="name">product.category.stock.allow_negative.form.inherit</field>
             <field name="model">product.category</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="view_category_property_form"/>
+            <field name="inherit_id" ref="view_category_property_form_price_unit"/>
             <field name="arch" type="xml">
                 <field name="sequence" position="after">
                   <field name="allow_negative_stock" />
@@ -60,21 +54,15 @@
             </field>
         </record>
         
-        <record id="view_normal_property_form" model="ir.ui.view">
+        <record id="view_normal_property_form_price_unit" model="ir.ui.view">
             <field name="name">product.normal.stock.property.form.inherit</field>
             <field name="model">product.product</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="inherit_id" ref="stock.view_normal_property_form"/>
             <field name="arch" type="xml">
-                <group name="store" position="replace">
-                    <group col="2" colspan="2" name="store">
-                        <separator string="Counter-Part Locations Properties" colspan="2"/>
-                        <field name="property_stock_procurement" widget="selection" domain="[('usage','=','procurement')]"/>
-                        <field name="property_stock_production" widget="selection"/>
-                        <field name="property_stock_inventory" widget="selection"/>
-                        <field name="property_stock_location" domain="[('usage','=','internal')]" widget="selection"/>
-                    </group>
-                </group>
+	           <field name="property_stock_inventory" position="after">
+	               <field name="property_stock_location" domain="[('usage','=','internal')]" widget="selection"/>
+	           </field>
             </field>
         </record>
         
@@ -82,7 +70,7 @@
             <field name="name">product.normal.stock.allow_negative.form.inherit</field>
             <field name="model">product.product</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="view_normal_property_form"/>
+            <field name="inherit_id" ref="view_normal_property_form_price_unit"/>
             <field name="arch" type="xml">
                 <field name="active" position="after">
                   <field name="allow_negative_stock" />

From 51dbc8c418dbc5e6c149f4300840fb0e66d8d1c8 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Thu, 3 Jun 2010 17:26:42 +0530
Subject: [PATCH 023/121] [IMP] Task-849 Improvement log Message for account
 and mrp

bzr revid: ksa@tinyerp.co.in-20100603115642-p6dqe7d57a1adekm
---
 addons/account/invoice.py | 21 +++++++++++++--------
 addons/mrp/mrp.py         | 26 +++++++++++++++-----------
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 105810f4cbb..2ff9759a434 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -862,7 +862,6 @@ class account_invoice(osv.osv):
             # make the invoice point to that move
             self.write(cr, uid, [inv.id], {'move_id': move_id,'period_id':period_id, 'move_name':new_move_name})
             self.pool.get('account.move').post(cr, uid, [move_id])
-        self._log_event(cr, uid, ids)
         return True
 
     def line_get_convert(self, cr, uid, x, part, date, context=None):
@@ -916,6 +915,7 @@ class account_invoice(osv.osv):
                         'WHERE account_move_line.move_id = %s ' \
                             'AND account_analytic_line.move_id = account_move_line.id',
                             (ref, move_id))
+                self._log_event(cr, uid, ids)
         return True
 
     def action_cancel(self, cr, uid, ids, *args):
@@ -951,13 +951,18 @@ class account_invoice(osv.osv):
         return taxes.values()
 
     def _log_event(self, cr, uid, ids, factor=1.0, name='Open Invoice'):
-        #TODO: implement messages system
-         for invoice in self.browse(cr, uid, ids):
-            for (id,number) in self.name_get(cr, uid, ids):
-                inv_number = number.split('/')[-1]
-                message = _('Invoice ') + " '" + _('INV/')+ inv_number + "' "+ _("Opened,")+_('journal entries')+ "' " + invoice.move_id.name + "' "+_("Created")
-                self.log(cr, uid, id, message)
-            return True
+        for (invoice_id,number) in self.name_get(cr, uid, ids):
+                invoice = self.browse(cr,uid,invoice_id)
+                message = ("%s %s %s %s %s %s %s") % (
+                    _('Invoice'),
+                    _("INV/"),
+                    number.split('/')[-1],
+                    _("Opened,"),
+                    _('journal entries'),
+                    invoice.move_id.name,
+                    _("Created"))
+                self.log(cr, uid, invoice_id, message)
+        return True
 
     def name_get(self, cr, uid, ids, context=None):
         if not len(ids):
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 701438f4c5b..488132a8b78 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -647,19 +647,23 @@ class mrp_production(osv.osv):
         """ Changes the production state to Ready and location id of stock move.
         @return: True
         """
-        for production in self.browse(cr, uid, ids):
-            production = self.browse(cr, uid, [production.id])[0]
-            s_date = datetime.strptime(production.date_planned,'%Y-%m-%d %H:%M:%S')
-
-        for (id,name) in self.name_get(cr, uid, ids):
-            message = _('Manufacturing Order ') + " '" + name + "' "+ _("scheduled the") + " "
-            message += s_date.strftime('%Y-%m-%d') + " " + _("for") + " " + production.product_id.default_code
-            self.log(cr, uid, id, message)
         move_obj = self.pool.get('stock.move')
         self.write(cr, uid, ids, {'state': 'ready'})
-        if production.move_prod_id:
-             move_obj.write(cr, uid, [production.move_prod_id.id],
-                   {'location_id': production.location_dest_id.id})
+
+        for (production_id,name) in self.name_get(cr, uid, ids):
+            production = self.browse(cr, uid, production_id)
+            if production.move_prod_id:
+                move_obj.write(cr, uid, [production.move_prod_id.id],
+                        {'location_id': production.location_dest_id.id})
+
+            message = ("%s %s %s %s %s %s") % (
+                    _('Manufacturing Order '),
+                    name,
+                    _("scheduled the"),
+                    datetime.strptime(production.date_planned,'%Y-%m-%d %H:%M:%S').strftime('%Y-%m-%d'),
+                    _("for"),
+                    production.product_id.default_code)
+            self.log(cr, uid, production_id, message)
         return True
 
     def action_production_end(self, cr, uid, ids):

From ef11fc39add57bdc23994317b22e32d4f51a6db5 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Thu, 3 Jun 2010 18:55:23 +0530
Subject: [PATCH 024/121] [IMP] product_price_unit: Improvement in overriding
 methods by calling its super method.

bzr revid: uco@tinyerp.com-20100603132523-plrgpj1c40jfdm5e
---
 .../product_price_unit/product_price_unit.py  | 319 ++----------------
 .../product_price_unit_view.xml               |  33 --
 2 files changed, 26 insertions(+), 326 deletions(-)

diff --git a/addons/product_price_unit/product_price_unit.py b/addons/product_price_unit/product_price_unit.py
index 008622e82f1..9922c3ab94e 100644
--- a/addons/product_price_unit/product_price_unit.py
+++ b/addons/product_price_unit/product_price_unit.py
@@ -24,6 +24,8 @@ from osv import fields
 from tools.translate import _
 import decimal_precision as dp
 import time
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
 
 class product_price_unit(osv.osv):
     _name = "product.price.unit"
@@ -184,110 +186,6 @@ class product_product(osv.osv):
                 res[id][f] = stock.get(id, 0.0)
         return res
     
-    def get_product_available(self, cr, uid, ids, context=None):
-        if not context:
-            context = {}
-        states=context.get('states',[])
-        what=context.get('what',())
-        if not ids:
-            ids = self.search(cr, uid, [])
-        res = {}.fromkeys(ids, 0.0)
-        if not ids:
-            return res
-
-        if context.get('shop', False):
-            cr.execute('select warehouse_id from sale_shop where id=%s', (int(context['shop']),))
-            res2 = cr.fetchone()
-            if res2:
-                context['warehouse'] = res2[0]
-
-        if context.get('warehouse', False):
-            cr.execute('select lot_stock_id from stock_warehouse where id=%s', (int(context['warehouse']),))
-            res2 = cr.fetchone()
-            if res2:
-                context['location'] = res2[0]
-
-        if context.get('location', False):
-            if type(context['location']) == type(1):
-                location_ids = [context['location']]
-            else:
-                location_ids = context['location']
-        else:
-            location_ids = []
-            wids = self.pool.get('stock.warehouse').search(cr, uid, [], context=context)
-            for w in self.pool.get('stock.warehouse').browse(cr, uid, wids, context=context):
-                location_ids.append(w.lot_stock_id.id)
-
-        # build the list of ids of children of the location given by id
-        if context.get('compute_child',True):
-            child_location_ids = self.pool.get('stock.location').search(cr, uid, [('location_id', 'child_of', location_ids)])
-            location_ids= len(child_location_ids) and child_location_ids or location_ids
-        else:
-            location_ids= location_ids
-
-        uoms_o = {}
-        product2uom = {}
-        for product in self.browse(cr, uid, ids, context=context):
-            product2uom[product.id] = product.uom_id.id
-            uoms_o[product.uom_id.id] = product.uom_id
-
-        results = []
-        results2 = []
-
-        from_date=context.get('from_date',False)
-        to_date=context.get('to_date',False)
-        date_str=False
-        if from_date and to_date:
-            date_str="date_planned>='%s' and date_planned<='%s'"%(from_date,to_date)
-        elif from_date:
-            date_str="date_planned>='%s'"%(from_date)
-        elif to_date:
-            date_str="date_planned<='%s'"%(to_date)
-
-        if 'in' in what:
-            # all moves from a location out of the set to a location in the set
-            cr.execute(
-                'select sum(product_qty), product_id, product_uom,sum(move_value) '\
-                'from stock_move '\
-                'where location_id <> ANY(%s)'\
-                'and location_dest_id =ANY(%s)'\
-                'and product_id =ANY(%s)'\
-                'and state in %s' + (date_str and 'and '+date_str+' ' or '') +''\
-                'group by product_id,product_uom',(location_ids,location_ids,ids,tuple(states),)
-            )
-            results = cr.fetchall()
-        if 'out' in what:
-            # all moves from a location in the set to a location out of the set
-            cr.execute(
-                'select sum(product_qty), product_id, product_uom,sum(move_value) '\
-                'from stock_move '\
-                'where location_id = ANY(%s)'\
-                'and location_dest_id <> ANY(%s) '\
-                'and product_id =ANY(%s)'\
-                'and state in %s' + (date_str and 'and '+date_str+' ' or '') + ''\
-                'group by product_id,product_uom',(location_ids,location_ids,ids,tuple(states),)
-            )
-            results2 = cr.fetchall()
-        uom_obj = self.pool.get('product.uom')
-        uoms = map(lambda x: x[2], results) + map(lambda x: x[2], results2)
-        if context.get('uom', False):
-            uoms += [context['uom']]
-
-        uoms = filter(lambda x: x not in uoms_o.keys(), uoms)
-        if uoms:
-            uoms = uom_obj.browse(cr, uid, list(set(uoms)), context=context)
-        for o in uoms:
-            uoms_o[o.id] = o
-        for amount, prod_id, prod_uom,move_value in results:
-            amount = uom_obj._compute_qty_obj(cr, uid, uoms_o[prod_uom], amount,
-                    uoms_o[context.get('uom', False) or product2uom[prod_id]])
-            res[prod_id] += amount
-        for amount, prod_id, prod_uom,move_value in results2:
-            amount = uom_obj._compute_qty_obj(cr, uid, uoms_o[prod_uom], amount,
-                    uoms_o[context.get('uom', False) or product2uom[prod_id]])
-            res[prod_id] -= amount
-        return res
-    
     def _product_available(self, cr, uid, ids, field_names=None, arg=False, context={}):
         res = super(product_product, self)._product_available(cr, uid, ids, field_names, arg, context)
         for f in field_names:
@@ -388,51 +286,24 @@ class account_invoice_tax(osv.osv):
     _inherit = "account.invoice.tax"
     
     def compute(self, cr, uid, invoice_id, context={}):
-        tax_grouped = {}
+        tax_grouped = super(account_invoice_tax, self).compute(cr, uid, invoice_id, context)
         tax_obj = self.pool.get('account.tax')
         cur_obj = self.pool.get('res.currency')
         inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id, context)
-        cur = inv.currency_id
         company_currency = inv.company_id.currency_id.id
-
+        for t in tax_grouped.values():
+            t['base'] = 0.0
+            t['base_amount'] = 0.0
         for line in inv.invoice_line:
             for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, (line.price_unit* (1-(line.discount or 0.0)/100.0/line.price_unit_id.coefficient)), line.quantity, inv.address_invoice_id.id, line.product_id, inv.partner_id):
-                val={}
-                val['invoice_id'] = inv.id
-                val['name'] = tax['name']
-                val['amount'] = tax['amount']
-                val['manual'] = False
-                val['sequence'] = tax['sequence']
-                val['base'] = tax['price_unit'] * line['quantity'] / line['price_unit_id'].coefficient
-
-                if inv.type in ('out_invoice','in_invoice'):
-                    val['base_code_id'] = tax['base_code_id']
-                    val['tax_code_id'] = tax['tax_code_id']
-                    val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
-                    val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
-                    val['account_id'] = tax['account_collected_id'] or line.account_id.id
-                else:
-                    val['base_code_id'] = tax['ref_base_code_id']
-                    val['tax_code_id'] = tax['ref_tax_code_id']
-                    val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['ref_base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
-                    val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['ref_tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
-                    val['account_id'] = tax['account_paid_id'] or line.account_id.id
-
-                key = (val['tax_code_id'], val['base_code_id'], val['account_id'])
-                if not key in tax_grouped:
-                    tax_grouped[key] = val
-                else:
-                    tax_grouped[key]['amount'] += val['amount']
-                    tax_grouped[key]['base'] += val['base']
-                    tax_grouped[key]['base_amount'] += val['base_amount']
-                    tax_grouped[key]['tax_amount'] += val['tax_amount']
-
-        for t in tax_grouped.values():
-            t['amount'] = cur_obj.round(cr, uid, cur, t['amount'])
-            t['base_amount'] = cur_obj.round(cr, uid, cur, t['base_amount'])
-            t['tax_amount'] = cur_obj.round(cr, uid, cur, t['tax_amount'])
+                for t in tax_grouped.values():
+                    t['base'] += tax['price_unit'] * line['quantity'] / line['price_unit_id'].coefficient
+                    if inv.type in ('out_invoice','in_invoice'):
+                        t['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, t['base'] * tax['base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
+                    else:
+                        t['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, t['base'] * tax['ref_base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
         return tax_grouped
-
+    
 account_invoice_tax()
 
 class hr_expense_line(osv.osv):
@@ -635,158 +506,28 @@ class sale_order_line(osv.osv):
             inv_line_obj.write(cr, uid, created_ids, {'price_unit_id': pu_id})
         return created_ids
     
-    def product_id_change(self, cr, uid, ids, pricelist, price_unit_id, product, qty=0,
+    def product_id_change(self, cr, uid, ids, pricelist, product, qty=0,
             uom=False, qty_uos=0, uos=False, name='', partner_id=False,
             lang=False, update_tax=True, date_order=False, packaging=False, 
             fiscal_position=False, flag=False):
-        if not partner_id:
-            raise osv.except_osv(_('No Customer Defined !'), _('You have to select a customer in the sale form !\nPlease set one customer before choosing a product.'))
-        warning = {}
-        product_uom_obj = self.pool.get('product.uom')
-        partner_obj = self.pool.get('res.partner')
-        product_obj = self.pool.get('product.product')
-        if partner_id:
-            lang = partner_obj.browse(cr, uid, partner_id).lang
-        context = {'lang': lang, 'partner_id': partner_id}
-
+        result = super(sale_order_line, self).product_id_change(cr, uid, ids, pricelist, 
+            product, qty, uom, qty_uos, uos, name, partner_id, lang, 
+            update_tax, date_order, packaging, fiscal_position, flag)
         if not product:
-            return {'value': {'th_weight': 0, 'product_packaging': False,
-                'product_uos_qty': qty}, 'domain': {'product_uom': [],
-                   'product_uos': []}}
+            return result
 
-        if not date_order:
-            date_order = time.strftime('%Y-%m-%d')
+        product_obj = self.pool.get('product.product')
+        product_obj = product_obj.browse(cr, uid, product)
+        pu_id = product_obj.price_unit_id.id
+        result['value']['price_unit_id'] = pu_id
 
-        result = {}
-        product_obj = product_obj.browse(cr, uid, product, context=context)
-        if product:
-            pu = self.pool.get('product.product').browse(cr, uid, product)
-            pu_id = pu.price_unit_id.id
-            #result['value']['price_unit_id'] = pu_id
-            result['price_unit_id'] = pu_id
-
-        if not packaging and product_obj.packaging:
-            packaging = product_obj.packaging[0].id
-            result['product_packaging'] = packaging
-
-        if packaging:
-            default_uom = product_obj.uom_id and product_obj.uom_id.id
-            pack = self.pool.get('product.packaging').browse(cr, uid, packaging, context)
-            q = product_uom_obj._compute_qty(cr, uid, uom, pack.qty, default_uom)
-#            qty = qty - qty % q + q
-            if qty and (q and not (qty % q) == 0):
-                ean = pack.ean
-                qty_pack = pack.qty
-                type_ul = pack.ul
-                warn_msg = _("You selected a quantity of %d Units.\nBut it's not compatible with the selected packaging.\nHere is a proposition of quantities according to the packaging: ") % (qty)
-                warn_msg = warn_msg + "\n\n" + _("EAN: ") + str(ean) + _(" Quantity: ") + str(qty_pack) + _(" Type of ul: ") + str(type_ul.name)
-                warning = {
-                    'title': _('Picking Information !'),
-                    'message': warn_msg
-                    }
-            result['product_uom_qty'] = qty
-
-        if uom:
-            uom2 = product_uom_obj.browse(cr, uid, uom)
-            if product_obj.uom_id.category_id.id != uom2.category_id.id:
-                uom = False
-
-        if uos:
-            if product_obj.uos_id:
-                uos2 = product_uom_obj.browse(cr, uid, uos)
-                if product_obj.uos_id.category_id.id != uos2.category_id.id:
-                    uos = False
-            else:
-                uos = False        
-        if product_obj.description_sale:
-            result['notes'] = product_obj.description_sale
-        fpos = fiscal_position and self.pool.get('account.fiscal.position').browse(cr, uid, fiscal_position) or False
-        if update_tax: #The quantity only have changed
-            result['delay'] = (product_obj.sale_delay or 0.0)
-            partner = partner_obj.browse(cr, uid, partner_id)
-            result['tax_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, product_obj.taxes_id)
-            result.update({'type': product_obj.procure_method})
-
-        if not flag:
-            result['name'] = self.pool.get('product.product').name_get(cr, uid, [product_obj.id], context=context)[0][1]
-        domain = {}
-        if (not uom) and (not uos):
-            result['product_uom'] = product_obj.uom_id.id
-            if product_obj.uos_id:
-                result['product_uos'] = product_obj.uos_id.id
-                result['product_uos_qty'] = qty * product_obj.uos_coeff
-                uos_category_id = product_obj.uos_id.category_id.id
-            else:
-                result['product_uos'] = False
-                result['product_uos_qty'] = qty
-                uos_category_id = False
-            result['th_weight'] = qty * product_obj.weight
-            domain = {'product_uom':
-                        [('category_id', '=', product_obj.uom_id.category_id.id)],
-                        'product_uos':
-                        [('category_id', '=', uos_category_id)]}
-
-        elif uos: # only happens if uom is False
-            result['product_uom'] = product_obj.uom_id and product_obj.uom_id.id
-            result['product_uom_qty'] = qty_uos / product_obj.uos_coeff
-            result['th_weight'] = result['product_uom_qty'] * product_obj.weight
-        elif uom: # whether uos is set or not
-            default_uom = product_obj.uom_id and product_obj.uom_id.id
-            q = product_uom_obj._compute_qty(cr, uid, uom, qty, default_uom)
-            if product_obj.uos_id:
-                result['product_uos'] = product_obj.uos_id.id
-                result['product_uos_qty'] = qty * product_obj.uos_coeff
-            else:
-                result['product_uos'] = False
-                result['product_uos_qty'] = qty
-            result['th_weight'] = q * product_obj.weight        # Round the quantity up
-
-        # get unit price
-
-        if not pricelist:
-            warning = {
-                'title': 'No Pricelist !',
-                'message':
-                    'You have to select a pricelist in the sale form !\n'
-                    'Please set one before choosing a product.'
-                }
-        else:
-            price = self.pool.get('product.pricelist').price_get(cr, uid, [pricelist],
-                    product, qty or 1.0, partner_id, {
-                        'uom': uom,
-                        'date': date_order,
-                        })[pricelist]
-            if price is False:
-                warning = {
-                    'title': 'No valid pricelist line found !',
-                    'message':
-                        "Couldn't find a pricelist line matching this product and quantity.\n"
-                        "You have to change either the product, the quantity or the pricelist."
-                    }
-            else:
-                result.update({'price_unit': price})
-
-        # FIX ME
         pname =  product_obj.name
         if product_obj.variants: 
             pname = pname + ' ['+product_obj.variants + ']'
         if product_obj.price_unit_id and product_obj.price_unit_id.coefficient != 1.0:
             pname = pname + ' (' + product_obj.price_unit_id.name + ')'
         result['name'] = pname
-        return {'value': result, 'domain': domain,'warning': warning}
-    
-    def product_uom_change(self, cursor, user, ids, pricelist,  product, price_unit_id=False, qty=0,
-            uom=False, qty_uos=0, uos=False, name='', partner_id=False,
-            lang=False, update_tax=True, date_order=False):
-        res = self.product_id_change(cursor, user, ids, pricelist, price_unit_id,product,
-                qty=0, uom=uom, qty_uos=qty_uos, uos=uos, name=name,
-                partner_id=partner_id, lang=lang, update_tax=update_tax,
-                date_order=date_order)
-        if 'product_uom' in res['value']:
-            del res['value']['product_uom']
-        if not uom:
-            res['value']['price_unit'] = 0.0
-        return res
+        return result
     
 sale_order_line()
 
@@ -844,17 +585,9 @@ class purchase_order(osv.osv):
     }
     
     def inv_line_create(self, cr, uid, a, ol):
-        return (0, False, {
-            'name': ol.name,
-            'account_id': a,
-            'price_unit': ol.price_unit or 0.0,
-            'price_unit_id': ol.price_unit_id.id ,
-            'quantity': ol.product_qty,
-            'product_id': ol.product_id.id or False,
-            'uos_id': ol.product_uom.id or False,
-            'invoice_line_tax_id': [(6, 0, [x.id for x in ol.taxes_id])],
-            'account_analytic_id': ol.account_analytic_id.id,
-        })
+        result = super(purchase_order, self).inv_line_create(cr, uid, a, ol)
+        result[2].update({'price_unit_id': ol.price_unit_id.id})
+        return result
     
     def action_picking_create(self,cr, uid, ids, *args):
         picking_id = super(purchase_order, self).action_picking_create(cr, uid, ids, *args)
diff --git a/addons/product_price_unit/product_price_unit_view.xml b/addons/product_price_unit/product_price_unit_view.xml
index 1d7cb404df6..27b258dd156 100644
--- a/addons/product_price_unit/product_price_unit_view.xml
+++ b/addons/product_price_unit/product_price_unit_view.xml
@@ -155,39 +155,6 @@
             </field>
         </record>
         
-        <!--  Sale order Form -->
-        <record id="view_sale_order_form_inherit1" model="ir.ui.view">
-            <field name="name">sale.order.form.inherit</field>
-            <field name="model">sale.order</field>
-            <field name="inherit_id" ref="sale.view_order_form"/>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='order_line']/form/notebook/page/field[@name='product_id']" position="replace">
-        	       <field colspan="4"
-			           context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
-			           name="product_id"
-			           on_change="product_id_change(parent.pricelist_id,price_unit_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], True, parent.date_order, product_packaging, parent.fiscal_position)"
-			           select="1"/>
-                </xpath>
-            </field>
-        </record>
-        
-        <record id="view_sale_order_form_inherit2" model="ir.ui.view">
-            <field name="name">sale.order.form.inherit2</field>
-            <field name="model">sale.order</field>
-            <field name="inherit_id" ref="sale.view_order_form"/>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='order_line']/form/notebook/page/field[@name='product_uom_qty']" position="replace">
-			       <field
-			           context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
-			           name="product_uom_qty"
-			           on_change="product_id_change(parent.pricelist_id,price_unit_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging, parent.fiscal_position, True)"
-			           select="1"/>
-			     </xpath>
-            </field>
-        </record>
-           
         <record id="view_order_form_inherit5" model="ir.ui.view">
             <field name="name">sale.order.form.inherit5</field>
             <field name="model">sale.order</field>

From 7990290f9cc960585f84fb9f7d6ad28992b1c68d Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Fri, 4 Jun 2010 12:57:16 +0530
Subject: [PATCH 025/121] Task 594: product/sale: support price_unit from
 ChriCar or something alike.     *[ADD] product_price_unit: New module added
 with reference to
 lp:~openerp-commiter/openobject-addons/chricar_price_unit_trunk_1 branch.

bzr revid: uco@tinyerp.com-20100604072716-calaasgcm1nliynz
---
 addons/account/__openerp__.py                 |   2 +-
 addons/product_price_unit/__init__.py         |  23 +
 addons/product_price_unit/__openerp__.py      |  39 +
 .../product_price_unit/product_price_unit.py  | 851 ++++++++++++++++++
 .../product_price_unit_data.xml               |  32 +
 .../product_price_unit_view.xml               | 196 ++++
 addons/purchase/__openerp__.py                |   4 +-
 addons/sale/__openerp__.py                    |   2 +-
 8 files changed, 1146 insertions(+), 3 deletions(-)
 create mode 100644 addons/product_price_unit/__init__.py
 create mode 100644 addons/product_price_unit/__openerp__.py
 create mode 100644 addons/product_price_unit/product_price_unit.py
 create mode 100644 addons/product_price_unit/product_price_unit_data.xml
 create mode 100644 addons/product_price_unit/product_price_unit_view.xml

diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 51724f47d33..b921828f47d 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -119,7 +119,7 @@ module named account_voucherss
         'project/project_demo.xml',
         'project/analytic_account_demo.xml',
         'demo/account_minimal.xml',
-        'account_unit_test.xml',
+#        'account_unit_test.xml',
     ],
     'test': [
         'test/account_customer_invoice.yml',
diff --git a/addons/product_price_unit/__init__.py b/addons/product_price_unit/__init__.py
new file mode 100644
index 00000000000..1ef4ebd8563
--- /dev/null
+++ b/addons/product_price_unit/__init__.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+import product_price_unit
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/product_price_unit/__openerp__.py b/addons/product_price_unit/__openerp__.py
new file mode 100644
index 00000000000..a4be771312d
--- /dev/null
+++ b/addons/product_price_unit/__openerp__.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+{
+    "name" : "Product Price Unit",
+    "version" : "1.1",
+    "author" : "Tiny",
+    "category" : "",
+    "depends" : ["base", 'account','hr_expense','mrp', 'sale'],
+    "init_xml" : [],
+    "demo_xml" : [],
+    "description": """
+    """,
+    'update_xml': [
+        'product_price_unit_data.xml',
+        'product_price_unit_view.xml',
+    ],
+    'installable': True,
+    'active': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product_price_unit/product_price_unit.py b/addons/product_price_unit/product_price_unit.py
new file mode 100644
index 00000000000..11629dca6fb
--- /dev/null
+++ b/addons/product_price_unit/product_price_unit.py
@@ -0,0 +1,851 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv
+from osv import fields
+from tools.translate import _
+import decimal_precision as dp
+import time
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
+
+class product_price_unit(osv.osv):
+    _name = "product.price.unit"
+    _description = 'Product Price Unit'
+    _order = "coefficient asc,name"
+    _columns = {
+       'code': fields.char('PU', size=3, required=True, translate=True, help="A three characters code to be placed next to the price"),
+       'coefficient': fields.integer('Coefficient', required=True, help="Values will be calculated as price / coefficient"),
+       'name': fields.char('Price per Unit', size=32, required=True, translate=True, help="Enter something like: Price for 100 units"),
+    }
+
+product_price_unit()
+
+class product_category(osv.osv):
+    _inherit = "product.category"
+    _name = "product.category"
+
+    _columns = {
+        'property_stock_location': fields.property('stock.location',
+            relation='stock.location', type='many2one',
+            string='Stock Location', method=True, view_load=True,
+            help="This location will be proposed for the stock move"),
+        'allow_negative_stock' : fields.boolean('Allow Negative Stock', help="Allows negative stock quantities for this category - use with care !"),
+    }
+product_category()
+
+class product_template(osv.osv):
+    _inherit = "product.template"
+    _name = "product.template"
+
+    def _get_price_unit_id(self, cr, uid, *args):
+        cr.execute('select id from product_price_unit where coefficient = 1')
+        res = cr.fetchone()
+        return res and res[0] or False
+    
+    _columns = {
+        'price_unit_id': fields.many2one('product.price.unit','Price Unit', help="Use if Price is not defined for UoM"),
+        'standard_price_coeff': fields.float(string='Standard Price/Coeff',digits=(16,8)) ,
+        'list_price_coeff': fields.float(string='List Price/Coeff',digits=(16,8)),
+        'property_stock_location': fields.property('stock.location',
+            relation='stock.location', type='many2one',
+            string='Stock Location', method=True, view_load=True,
+            help="This location will be proposed for the stock move"),
+        'allow_negative_stock' : fields.boolean('Allow Negative Stock', help="Allows negative stock quantities - use with care !"),
+
+    }
+    
+    _defaults = {
+        'price_unit_id': _get_price_unit_id,
+    }
+    
+    def init(self, cr):
+        cr.execute("""
+            update product_template
+               set price_unit_id = (select id from product_price_unit where coefficient = 1)
+             where price_unit_id is null
+               and exists (select id from product_price_unit where coefficient = 1)"""
+            )
+
+product_template()
+
+class product_product(osv.osv):
+    _name = "product.product"
+    _inherit = "product.product"
+
+    def _avg_price(self, cr, uid, ids, field_names=None, arg=False, context={}):
+        res = {} 
+        for product in self.browse(cr, uid, ids, context=context):
+            avg_price = 0.0
+            value = self._stock_value( cr, uid, [product.id], ['stock_value',], arg, context)[product.id]['stock_value']
+            qty = self._product_available( cr, uid, ids, ['qty_available',], arg, context)[product.id]['qty_available']
+            if qty > 0.0 and value > 0.0:
+               pu = self.pool.get('product.price.unit').browse(cr, uid, product.price_unit_id.id)
+               coeff = pu.coefficient
+               avg_price = value / qty * coeff
+            res[product.id] = avg_price  
+        return res
+    
+    def get_stock_value(self, cr, uid, ids, context=None):
+            if not context:
+                context = {}
+            states=context.get('states',[])
+            what=context.get('what',())
+            if not ids:
+                ids = self.search(cr, uid, [])
+            res = {}.fromkeys(ids, 0.0)
+            if not ids:
+                return res
+
+            if context.get('shop', False):
+                cr.execute('select warehouse_id from sale_shop where id=%s', (int(context['shop']),))
+                res2 = cr.fetchone()
+                if res2:
+                    context['warehouse'] = res2[0]
+
+            if context.get('warehouse', False):
+                cr.execute('select lot_stock_id from stock_warehouse where id=%s', (int(context['warehouse']),))
+                res2 = cr.fetchone()
+                if res2:
+                    context['location'] = res2[0]
+
+            if context.get('location', False):
+                if type(context['location']) == type(1):
+                    location_ids = [context['location']]
+                else:
+                    location_ids = context['location']
+            else:
+                cr.execute("select lot_stock_id from stock_warehouse")
+                location_ids = [id for (id,) in cr.fetchall()]
+
+            # build the list of ids of children of the location given by id
+            if context.get('compute_child',True):
+                child_location_ids = self.pool.get('stock.location').search(cr, uid, [('location_id', 'child_of', location_ids)])
+                location_ids= len(child_location_ids) and child_location_ids or location_ids
+            else:
+                location_ids= location_ids
+
+            states_str = ','.join(map(lambda s: "'%s'" % s, states))
+
+            uoms_o = {}
+            product2uom = {}
+            for product in self.browse(cr, uid, ids, context=context):
+                product2uom[product.id] = product.uom_id.id
+                uoms_o[product.uom_id.id] = product.uom_id
+
+            prod_ids_str = ','.join(map(str, ids))
+            location_ids_str = ','.join(map(str, location_ids))
+            results = []
+            results2 = []
+
+            from_date=context.get('from_date',False)
+            to_date=context.get('to_date',False)
+            date_str=False
+            if from_date and to_date:
+                date_str="date_planned>='%s' and date_planned<='%s'"%(from_date,to_date)
+            elif from_date:
+                date_str="date_planned>='%s'"%(from_date)
+            elif to_date:
+                date_str="date_planned<='%s'"%(to_date)
+
+            cr.execute(
+                    'select sum('\
+                    'case when location_dest_id in ('+location_ids_str+') then  move_value else 0 end + '\
+                    'case when location_id      in ('+location_ids_str+') then -move_value else 0 end '\
+                    '), product_id '\
+                    'from stock_move '\
+                    'where (location_id  in ('+location_ids_str+') '\
+                    'or location_dest_id in ('+location_ids_str+')) '\
+                    'and product_id in ('+prod_ids_str+') '\
+                    'and state in ('+states_str+') '+ (date_str and 'and '+date_str+' ' or '') +''\
+                    'group by product_id'
+                )
+            results = cr.fetchall()
+
+            for amount, prod_id in results:
+                if amount: res[prod_id] += amount
+            return res
+    
+    def _stock_value(self, cr, uid, ids, field_names=None, arg=False, context={}):
+        if not field_names:
+            field_names=[]
+        res = {}
+        for id in ids:
+            res[id] = {}.fromkeys(field_names, 0.0)
+        for f in field_names:
+            c = context.copy()
+            if f=='stock_value':
+                c.update({ 'states':('done',), 'what':('in', 'out') })
+            stock=self.get_stock_value(cr,uid,ids,context=c)
+            for id in ids:
+                res[id][f] = stock.get(id, 0.0)
+        return res
+    
+    def _product_available(self, cr, uid, ids, field_names=None, arg=False, context={}):
+        res = super(product_product, self)._product_available(cr, uid, ids, field_names, arg, context)
+        for f in field_names:
+            c = context.copy()
+            if f=='stock_value':
+                c.update({ 'states':('done',), 'what':('in', 'out') })
+            stock = self.get_product_available(cr, uid, ids, context=c)
+            for id in ids:
+                res[id][f] = stock.get(id, 0.0)
+        return res
+    
+    _columns = {
+        'stock_value': fields.function(_stock_value, method=True, type='float', string='Value', help="Current Value products in selected locations or all internal if none have been selected.", multi='stock_value'),
+        'average_price': fields.function(_avg_price, method=True, type='float', string='Average Price',digits=(16,4)),
+    }
+
+    def _check_allow_negative_stock(self, cr, uid, ids):
+        for product in self.browse(cr, uid, ids):
+            if product.qty_available < 0.0:
+               allow_negative = product.allow_negative_stock
+               if not allow_negative:
+                  allow_neagtive = product.categ_id.allow_negative_stock
+               if allow_negative != True :
+                   return False
+        return True
+
+    _constraints = [(_check_allow_negative_stock, 'Error: Negative stock quantities are not allowed for this product or product category', ['name']),]
+
+    
+    def on_change_price_unit(self, cr, uid, ids,price_unit_id,standard_price,list_price):
+         standard_price_coeff = ''
+         list_price_coeff=''
+         if price_unit_id:
+             pu = self.pool.get('product.price.unit').browse(cr, uid, [price_unit_id])[0]
+             coeff =  pu.coefficient
+             standard_price_coeff = standard_price / coeff
+             list_price_coeff     = list_price     / coeff
+             return {'value':{'standard_price_coeff': standard_price_coeff, 'list_price_coeff': list_price_coeff }}
+
+    def name_get(self, cr, uid, ids, context={}):
+        results = super(product_product, self).name_get(cr, uid, ids, context)
+        new_results = []
+        for product_id, product_name in results:           
+            product = self.browse(cr, uid, product_id, context)
+            if product.price_unit_id and product.price_unit_id.name:
+                product_name = "%s (%s)" %(product_name, product.price_unit_id.name)
+            new_results.append((product_id, product_name))
+        return new_results
+
+product_product()
+
+class account_invoice_line(osv.osv):
+    _name = "account.invoice.line"
+    _inherit = "account.invoice.line"
+
+    def _get_price_unit_id(self, cr, uid, *args):
+        cr.execute('select id from product_price_unit where coefficient = 1')
+        res = cr.fetchone()
+        return res and res[0] or False
+
+    def _amount_line(self, cr, uid, ids, prop, unknow_none,unknow_dict):
+        res = {}
+        cur_obj=self.pool.get('res.currency')
+        for line in self.browse(cr, uid, ids):
+            if line.price_unit_id:
+                if line.invoice_id:
+                    res[line.id] = line.price_unit * line.quantity * (1-(line.discount or 0.0)/100.0) / line.price_unit_id.coefficient
+                    cur = line.invoice_id.currency_id
+                    res[line.id] = cur_obj.round(cr, uid, cur, res[line.id])
+                else:
+                    res[line.id] = round(line.price_unit * line.quantity * (1-(line.discount or 0.0)/100.0)/ line.price_unit_id.coefficient,self.pool.get('decimal.precision').precision_get(cr, uid, 'Account'))
+        return res
+
+    _columns = {
+        'price_unit_id': fields.many2one('product.price.unit','Price Unit', help="Use if Price is not defined for UoM"),
+        'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal',store=True, type="float", digits_compute= dp.get_precision('Account')),
+    }
+    _defaults = {
+        'price_unit_id': _get_price_unit_id,
+    }
+
+    def price_product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, price_unit_id=False, address_invoice_id=False, currency_id=False, context=None):
+        result = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context)
+        if product and 'value' in result:
+            pu = self.pool.get('product.product').browse(cr, uid, product)
+            if pu.price_unit_id:
+                result['value']['price_unit_id'] = pu.price_unit_id.id
+        return result
+
+account_invoice_line()
+
+class account_invoice_tax(osv.osv):
+    _inherit = "account.invoice.tax"
+    
+    def compute(self, cr, uid, invoice_id, context={}):
+        tax_grouped = super(account_invoice_tax, self).compute(cr, uid, invoice_id, context)
+        tax_obj = self.pool.get('account.tax')
+        cur_obj = self.pool.get('res.currency')
+        inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id, context)
+        company_currency = inv.company_id.currency_id.id
+        for t in tax_grouped.values():
+            t['base'] = 0.0
+            t['base_amount'] = 0.0
+        for line in inv.invoice_line:
+            for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, (line.price_unit* (1-(line.discount or 0.0)/100.0/line.price_unit_id.coefficient)), line.quantity, inv.address_invoice_id.id, line.product_id, inv.partner_id):
+                for t in tax_grouped.values():
+                    t['base'] += tax['price_unit'] * line['quantity'] / line['price_unit_id'].coefficient
+                    if inv.type in ('out_invoice','in_invoice'):
+                        t['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, t['base'] * tax['base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
+                    else:
+                        t['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, t['base'] * tax['ref_base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
+        return tax_grouped
+    
+account_invoice_tax()
+
+class hr_expense_line(osv.osv):
+    _name = "hr.expense.line"
+    _inherit = "hr.expense.line"
+
+    def _get_price_unit_id(self, cr, uid, *args):
+        cr.execute('select id from product_price_unit where coefficient = 1')
+        res = cr.fetchone()
+        return res and res[0] or False
+
+    def _amount(self, cr, uid, ids, field_name, arg, context):
+        if not len(ids):
+            return {}
+        cr.execute("SELECT l.id,COALESCE(SUM(l.unit_amount*l.unit_quantity/pu.coefficient),0) AS amount FROM hr_expense_line l ,product_price_unit pu WHERE pu.id = l.price_unit_id and l.id =ANY(%s) GROUP BY l.id ",(ids,))
+        res = dict(cr.fetchall())
+        return res
+
+    _columns = {
+        'price_unit_id': fields.many2one('product.price.unit','Price Unit', help="Use if Price is not defined for UoM"),
+        'total_amount': fields.function(_amount, method=True, string='Total'),
+    }    
+    _defaults = {
+        'price_unit_id': _get_price_unit_id,
+    }
+hr_expense_line()
+
+class hr_expense_expense(osv.osv):
+    _name = "hr.expense.expense"
+    _inherit = "hr.expense.expense"
+
+    def _amount(self, cr, uid, ids, field_name, arg, context):
+        if not len(ids):
+            return {}
+        cr.execute("SELECT s.id,COALESCE(SUM(l.unit_amount*l.unit_quantity/pu.coefficient),0) AS amount FROM hr_expense_expense s LEFT OUTER JOIN hr_expense_line l ON (s.id=l.expense_id) LEFT JOIN product_price_unit pu ON (pu.id=l.price_unit_id) WHERE s.id = ANY(%s) GROUP BY s.id ",(ids,))
+        res = dict(cr.fetchall())
+        return res
+
+    _columns = {
+        'amount': fields.function(_amount, method=True, string='Total Amount'),
+    }
+
+hr_expense_expense()
+
+class mrp_bom(osv.osv):
+    _inherit = 'mrp.bom'
+    
+    def _get_price_unit_id(self, cr, uid, *args):
+        cr.execute('select id from product_price_unit where coefficient = 1')
+        res = cr.fetchone()
+        return res and res[0] or False
+    
+    _columns = {
+        'price_unit_id': fields.many2one('product.price.unit','Price Unit' ),
+    }
+    
+    _defaults = {
+        'price_unit_id': _get_price_unit_id,
+    }
+mrp_bom()
+
+class stock_move(osv.osv):
+    _inherit = 'stock.move'
+    _columns = {
+        'price_unit_id': fields.many2one('product.price.unit','Price Unit internal'),
+        'price_unit_sale_id': fields.many2one('product.price.unit','Price Unit Sale' ),
+        'move_value': fields.float('Amount', digits_compute= dp.get_precision('Account')),
+        'move_value_sale': fields.float('Amount Sale',digits_compute= dp.get_precision('Account') ),
+    }
+stock_move()
+
+class stock_avg_price(osv.osv):
+    _name = "stock_avg_price"
+    def init(self, cr):
+        cr.execute("SELECT true FROM pg_catalog.pg_language WHERE lanname = 'plpgsql';")
+        if not cr.fetchall():
+            cr.execute("create language plpgsql;")
+
+        cr.execute("""
+CREATE OR REPLACE FUNCTION get_stock_avg_price(product_id_i integer,location_id_i  integer) RETURNS numeric AS $$
+DECLARE 
+ avg_price decimal(16,8);                    
+ value     float;                    
+ qty       float;                    
+ usage_p   varchar(32);
+
+BEGIN
+
+select into usage_p usage
+  from stock_location
+ where id = location_id_i;
+
+if usage_p = 'internal'
+then 
+select into value,qty
+       sum(case when location_id = location_id_i then -move_value
+                when location_dest_id = location_id_i then move_value 
+                else 0 end),
+       sum(case when location_id = location_id_i then -product_qty
+                when location_dest_id = location_id_i then product_qty 
+                else 0 end)
+  from stock_move
+ where product_id = product_id_i
+   and (location_id = location_id_i or location_dest_id = location_id_i)
+   and state = 'done'; 
+
+if qty = 0
+ then avg_price = 0;
+ else avg_price = value/qty;
+end if;
+end if;
+
+if avg_price is null
+ then avg_price = 0;
+end if;
+         
+                       
+RETURN avg_price;
+END;
+$$ LANGUAGE plpgsql;""")
+stock_avg_price()
+
+class sale_order(osv.osv):
+    _inherit = 'sale.order'
+    
+    def _amount_line_tax(self, cr, uid, line, context={}):
+        val = 0.0
+        for c in self.pool.get('account.tax').compute(cr, uid, line.tax_id, line.price_unit * (1-(line.discount or 0.0)/100.0)/ line.price_unit_id.coefficient, line.product_uom_qty, line.order_id.partner_invoice_id.id, line.product_id, line.order_id.partner_id):
+            val+= c['amount']
+        return val
+    
+    def action_ship_create(self, cr, uid, ids, *args):
+        val = super(sale_order, self).action_ship_create(cr, uid, ids, *args)
+        move_obj = self.pool.get('stock.move')
+        for order in self.browse(cr, uid, ids, context={}):
+            for line in order.order_line:
+                now = datetime.now()
+                order_date = datetime.strptime(order.date_order,"%Y-%m-%d")
+                date_planned = order_date + relativedelta(days=line.delay or 0.0)
+                if date_planned < now:
+                   date_planned = now
+
+                users_roles = self.pool.get('res.users').browse(cr, uid, uid).roles_id
+                for role in users_roles:
+                   if role.name=='Document date manual data':
+                       date_planned = order_date
+                if line.product_id and line.product_id.product_tmpl_id.type in ('product', 'consu'):
+                    location_id = line.product_id.property_stock_location.id
+                    if not location_id:
+                        location_id = line.product_id.categ_id.property_stock_location.id
+                    if not location_id:
+                        location_id = order.shop_id.warehouse_id.lot_stock_id.id
+                    move_ids = move_obj.search(cr, uid, [('sale_line_id','=',line.id)])
+                    cr.execute("""select get_stock_avg_price(%s,%s) ; """ % (line.product_id.id,location_id))
+                    res = cr.fetchone()
+                    stock_avg_price = (res and res[0]) or False
+                    move_obj.write(cr, uid, move_ids, {
+                                                       'date': line.order_id.date_order,
+                                                       'price_unit' : stock_avg_price,
+                                                       'price_unit_id': line.product_id.price_unit_id.id,
+                                                       'price_unit_sale_id': line.price_unit_id.id,
+                                                       'move_value' : line.product_uom_qty * stock_avg_price,
+                                                       'move_value_sale': line.price_subtotal,
+                                                       })
+        return True
+sale_order()
+
+class sale_order_line(osv.osv):
+    _inherit = 'sale.order.line'
+    
+    def _get_price_unit_id(self, cr, uid, *args):
+        cr.execute('select id from product_price_unit where coefficient = 1')
+        res = cr.fetchone()
+        return res and res[0] or False
+    
+    def _amount_line(self, cr, uid, ids, field_name, arg, context):
+        res = {}
+        cur_obj = self.pool.get('res.currency')
+        for line in self.browse(cr, uid, ids):
+            res[line.id] = line.price_unit * line.product_uom_qty * (1 - (line.discount or 0.0) / 100.0) / line.price_unit_id.coefficient
+            cur = line.order_id.pricelist_id.currency_id
+            res[line.id] = cur_obj.round(cr, uid, cur, res[line.id])
+        return res
+    
+    _columns = {
+        'price_unit_id': fields.many2one('product.price.unit','Price Unit', required=True),
+    }
+    
+    _defaults = {
+        'price_unit_id': _get_price_unit_id,
+    }
+    
+    def invoice_line_create(self, cr, uid, ids, context={}):
+        created_ids = super(sale_order_line,self).invoice_line_create(cr, uid, ids, context=context)
+        inv_line_obj = self.pool.get('account.invoice.line')
+        def _get_line_pu_id(line):
+            return line.price_unit_id.id
+        for line in self.browse(cr, uid, ids, context):
+            pu_id = _get_line_pu_id(line)
+            inv_line_obj.write(cr, uid, created_ids, {'price_unit_id': pu_id})
+        return created_ids
+    
+    def product_id_change(self, cr, uid, ids, pricelist, product, qty=0,
+            uom=False, qty_uos=0, uos=False, name='', partner_id=False,
+            lang=False, update_tax=True, date_order=False, packaging=False, 
+            fiscal_position=False, flag=False):
+        result = super(sale_order_line, self).product_id_change(cr, uid, ids, pricelist, 
+            product, qty, uom, qty_uos, uos, name, partner_id, lang, 
+            update_tax, date_order, packaging, fiscal_position, flag)
+        if not product:
+            return result
+
+        product_obj = self.pool.get('product.product')
+        product_obj = product_obj.browse(cr, uid, product)
+        pu_id = product_obj.price_unit_id.id
+        result['value']['price_unit_id'] = pu_id
+
+        pname =  product_obj.name
+        if product_obj.variants: 
+            pname = pname + ' ['+product_obj.variants + ']'
+        if product_obj.price_unit_id and product_obj.price_unit_id.coefficient != 1.0:
+            pname = pname + ' (' + product_obj.price_unit_id.name + ')'
+        result['name'] = pname
+        return result
+    
+sale_order_line()
+
+class purchase_order(osv.osv):
+    _name = "purchase.order"
+    _inherit = "purchase.order"
+    
+    def _calc_amount(self, cr, uid, ids, prop, unknow_none, unknow_dict):
+        res = {}
+        for order in self.browse(cr, uid, ids):
+            res[order.id] = 0
+            for oline in order.order_line:
+                res[order.id] += oline.price_unit * oline.product_qty / oline.price_unit_id.coefficient
+        return res
+
+    def _amount_all(self, cr, uid, ids, field_name, arg, context):
+        res = {}
+        cur_obj=self.pool.get('res.currency')
+        for order in self.browse(cr, uid, ids):
+            res[order.id] = {
+                'amount_untaxed': 0.0,
+                'amount_tax': 0.0,
+                'amount_total': 0.0,
+            }
+            val = val1 = 0.0
+            cur=order.pricelist_id.currency_id
+            for line in order.order_line:
+                for c in self.pool.get('account.tax').compute(cr, uid, line.taxes_id, line.price_unit, line.product_qty, order.partner_address_id.id, line.product_id, order.partner_id):
+                    val+= c['amount'] / line.price_unit_id.coefficient
+                val1 += line.price_subtotal
+            res[order.id]['amount_tax']=cur_obj.round(cr, uid, cur, val)
+            res[order.id]['amount_untaxed']=cur_obj.round(cr, uid, cur, val1)
+            res[order.id]['amount_total']=res[order.id]['amount_untaxed'] + res[order.id]['amount_tax']
+        return res
+
+    def _get_order(self, cr, uid, ids, context={}):
+        result = {}
+        for line in self.pool.get('purchase.order.line').browse(cr, uid, ids, context=context):
+            result[line.order_id.id] = True
+        return result.keys()
+
+    _columns = {
+        'amount_untaxed': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Purchase Price'), string='Untaxed Amount',
+            store={
+                'purchase.order.line': (_get_order, None, 10),
+            }, multi="sums"),
+        'amount_tax': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Purchase Price'), string='Taxes',
+            store={
+                'purchase.order.line': (_get_order, None, 10),
+            }, multi="sums"),
+        'amount_total': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Purchase Price'), string='Total',
+            store={
+                'purchase.order.line': (_get_order, None, 10),
+            }, multi="sums"),
+    }
+    
+    def inv_line_create(self, cr, uid, a, ol):
+        result = super(purchase_order, self).inv_line_create(cr, uid, a, ol)
+        result[2].update({'price_unit_id': ol.price_unit_id.id})
+        return result
+    
+    def action_picking_create(self,cr, uid, ids, *args):
+        picking_id = super(purchase_order, self).action_picking_create(cr, uid, ids, *args)
+        move_obj = self.pool.get('stock.move')
+        for order in self.browse(cr, uid, ids):
+            for line in order.order_line:
+                move_ids = move_obj.search(cr, uid, [('purchase_line_id','=',line.id),('picking_id','=',picking_id)])
+                move_obj.write(cr, uid, move_ids, {
+                                                   'price_unit_id': line.price_unit_id.id,
+                                                   })
+        return picking_id
+
+purchase_order()
+
+class purchase_order_line(osv.osv):
+    _name = 'purchase.order.line'
+    _inherit = 'purchase.order.line'
+
+    def _get_price_unit_id(self, cr, uid, *args):
+        cr.execute('select id from product_price_unit where coefficient = 1')
+        res = cr.fetchone()
+        return res and res[0] or False
+
+    def _amount_line(self, cr, uid, ids, prop, unknow_none, unknow_dict):
+        res = {}
+        cur_obj=self.pool.get('res.currency')
+        for line in self.browse(cr, uid, ids):
+            cur = line.order_id.pricelist_id.currency_id
+            res[line.id] = cur_obj.round(cr, uid, cur, line.price_unit * line.product_qty / line.price_unit_id.coefficient) 
+        return res
+
+    _columns = {
+        'price_unit_id' : fields.many2one('product.price.unit','Price Unit', required=True),
+        'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', digits_compute= dp.get_precision('Purchase Price')),
+    }
+    _defaults = {
+        'price_unit_id': _get_price_unit_id,
+    }
+
+    def price_product_id_change(self, cr, uid, ids, pricelist, price_unit_id, product, qty, uom,
+            partner_id, date_order=False, fiscal_position=False, date_planned=False,
+            name=False, price_unit=False, notes=False):
+        result = super(purchase_order_line, self).product_id_change(cr, uid, ids, pricelist, product, qty, uom,
+            partner_id, date_order, fiscal_position, date_planned, name, price_unit, notes)
+        if product and 'value' in result:
+            pu = self.pool.get('product.product').browse(cr, uid, product)
+            if pu.price_unit_id:
+                result['value']['price_unit_id'] = pu.price_unit_id.id
+        return result
+
+purchase_order_line()
+
+class stock_partial_picking(osv.osv_memory):
+    _inherit = "stock.partial.picking"
+
+    def view_init(self, cr, uid, fields_list, context=None):
+        res = super(stock_partial_picking, self).view_init(cr, uid, fields_list, context=context)
+        pick_obj = self.pool.get('stock.picking')        
+        if not context:
+            context={}
+        moveids = []
+        for pick in pick_obj.browse(cr, uid, context.get('active_ids', [])):            
+            for m in pick.move_lines:
+                if m.state in ('done', 'cancel'):
+                    continue
+                if 'move%s_product_id'%(m.id) not in self._columns:
+                    self._columns['move%s_product_id'%(m.id)] = fields.many2one('product.product',string="Product")
+                if 'move%s_product_qty'%(m.id) not in self._columns:
+                    self._columns['move%s_product_qty'%(m.id)] = fields.float("Quantity")
+                if 'move%s_product_uom'%(m.id) not in self._columns:
+                    self._columns['move%s_product_uom'%(m.id)] = fields.many2one('product.uom',string="Product UOM")
+
+                if (pick.type == 'in') and (m.product_id.cost_method == 'average'):
+                    if 'move%s_product_price'%(m.id) not in self._columns:
+                        self._columns['move%s_product_price'%(m.id)] = fields.float("Price")
+                    if 'move%s_product_currency'%(m.id) not in self._columns:
+                        self._columns['move%s_product_currency'%(m.id)] = fields.many2one('res.currency',string="Currency")
+                    if 'move%s_product_price_unit_id'%(m.id) not in self._columns:
+                        self._columns['move%s_product_price_unit_id'%(m.id)] = fields.float("Price Unit")
+        return res   
+
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False,submenu=False):
+        result = super(stock_partial_picking, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu)        
+        pick_obj = self.pool.get('stock.picking')
+        picking_ids = context.get('active_ids', False) 
+        picking_ids = pick_obj.search(cr, uid, [('id', 'in', picking_ids)])               
+        _moves_arch_lst = """<form string="Deliver Products">
+                        <separator colspan="4" string="Delivery Information"/>
+                        <field name="date" colspan="4" />
+                        <field name="partner_id"/>
+                        <field name="address_id"/>
+                        <newline/>
+                        <separator colspan="4" string="Move Detail"/>
+                        """
+        _moves_fields = result['fields']
+        if picking_ids and view_type in ['form']:
+            for pick in pick_obj.browse(cr, uid, picking_ids, context):
+                for m in pick.move_lines:
+                    if m.state in ('done', 'cancel'):
+                        continue
+                    _moves_fields.update({
+                        'move%s_product_id'%(m.id)  : {
+                                    'string': _('Product'),
+                                    'type' : 'many2one', 
+                                    'relation': 'product.product', 
+                                    'required' : True, 
+                                    'readonly' : True,                                    
+                                    },
+                        'move%s_product_qty'%(m.id) : {
+                                    'string': _('Quantity'),
+                                    'type' : 'float',
+                                    'required': True,                                    
+                                    },
+                        'move%s_product_uom'%(m.id) : {
+                                    'string': _('Product UOM'),
+                                    'type' : 'many2one', 
+                                    'relation': 'product.uom', 
+                                    'required' : True, 
+                                    'readonly' : True,                                    
+                                    }
+                    })                
+                    
+                    _moves_arch_lst += """
+                        <group colspan="4" col="12">
+                        <field name="move%s_product_id" nolabel="1"/>
+                        <field name="move%s_product_qty" string="Qty" />
+                        <field name="move%s_product_uom" nolabel="1" />
+                    """%(m.id, m.id, m.id)
+                    if (pick.type == 'in') and (m.product_id.cost_method == 'average'):                        
+                        _moves_fields.update({
+                            'move%s_product_price'%(m.id) : {
+                                    'string': _('Price'),
+                                    'type' : 'float',
+                                    },
+                            'move%s_product_currency'%(m.id): {
+                                    'string': _('Currency'),
+                                    'type' : 'many2one', 
+                                    'relation': 'res.currency',
+                                    },
+                            'move%s_product_price_unit_id'%(m.id): {
+                                    'string': _('Price Unit'),
+                                    'type': 'many2one',
+                                    'relation': 'product.price.unit', 
+                                    'required': True,
+                                    },
+                        })
+                        _moves_arch_lst += """
+                            <field name="move%s_product_price" />
+                            <field name="move%s_product_currency" nolabel="1"/>
+                            <field name="move%s_product_price_unit_id" nolabel="1"/>
+                        """%(m.id, m.id, m.id)
+                    _moves_arch_lst += """
+                        </group>
+                        """
+        _moves_arch_lst += """
+                <separator string="" colspan="4" />
+                <label string="" colspan="2"/>
+                <group col="2" colspan="2">
+                <button icon='gtk-cancel' special="cancel"
+                    string="_Cancel" />
+                <button name="do_partial" string="_Deliver"
+                    colspan="1" type="object" icon="gtk-apply" />
+            </group>                    
+        </form>"""
+        result['arch'] = _moves_arch_lst
+        result['fields'] = _moves_fields           
+        return result
+
+    def default_get(self, cr, uid, fields, context=None):
+        """ 
+             To get default values for the object.
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param fields: List of fields for which we want default values 
+             @param context: A standard dictionary 
+             
+             @return: A dictionary which of fields with values. 
+        
+        """ 
+
+        res = super(stock_partial_picking, self).default_get(cr, uid, fields, context=context)
+        pick_obj = self.pool.get('stock.picking')        
+        if not context:
+            context={}
+        moveids = []
+        if 'date' in fields:
+            res.update({'date': time.strftime('%Y-%m-%d %H:%M:%S')})
+        for pick in pick_obj.browse(cr, uid, context.get('active_ids', [])):
+            if 'partner_id' in fields:
+                res.update({'partner_id': pick.address_id.partner_id.id})                
+            if 'address_id' in fields:
+                res.update({'address_id': pick.address_id.id})            
+            for m in pick.move_lines:
+                if m.state in ('done', 'cancel'):
+                    continue
+                if 'move%s_product_id'%(m.id) in fields:
+                    res['move%s_product_id'%(m.id)] = m.product_id.id
+                if 'move%s_product_qty'%(m.id) in fields:
+                    res['move%s_product_qty'%(m.id)] = m.product_qty
+                if 'move%s_product_uom'%(m.id) in fields:
+                    res['move%s_product_uom'%(m.id)] = m.product_uom.id
+
+                if (pick.type == 'in') and (m.product_id.cost_method == 'average'):
+                    price = 0
+                    if hasattr(m, 'purchase_line_id') and m.purchase_line_id:
+                        price = m.purchase_line_id.price_unit
+                    if hasattr(m, 'purchase_line_id') and m.price_unit_id:
+                        price_unit_id = m.purchase_line_id.price_unit_id.id
+
+                    currency = False
+                    if hasattr(pick, 'purchase_id') and pick.purchase_id:
+                        currency = pick.purchase_id.pricelist_id.currency_id.id
+        
+                    if 'move%s_product_price'%(m.id) in fields:
+                        res['move%s_product_price'%(m.id)] = price
+                    if 'move%s_product_currency'%(m.id) in fields:
+                        res['move%s_product_currency'%(m.id)] = currency
+                    if 'move%s_product_price_unit_id'%(m.id) in fields:
+                        res['move%s_product_price_unit_id'%(m.id)] = price_unit_id
+        return res   
+
+    def do_partial(self, cr, uid, ids, context):    
+        pick_obj = self.pool.get('stock.picking')    
+        picking_ids = context.get('active_ids', False)
+        partial = self.browse(cr, uid, ids[0], context)
+        partial_datas = {
+            'partner_id' : partial.partner_id and partial.partner_id.id or False,
+            'address_id' : partial.address_id and partial.address_id.id or False,
+            'delivery_date' : partial.date         
+        }
+        for pick in pick_obj.browse(cr, uid, picking_ids):
+            for m in pick.move_lines:
+                if m.state in ('done', 'cancel'):
+                    continue
+                partial_datas['move%s'%(m.id)] = {
+                    'product_id' : getattr(partial, 'move%s_product_id'%(m.id)).id,
+                    'product_qty' : getattr(partial, 'move%s_product_qty'%(m.id)),
+                    'product_uom' : getattr(partial, 'move%s_product_uom'%(m.id)).id
+                }
+
+                if (pick.type == 'in') and (m.product_id.cost_method == 'average'):   
+                    partial_datas['move%s'%(m.id)].update({             
+                        'product_price' : getattr(partial, 'move%s_product_price'%(m.id)),
+                        'product_currency': getattr(partial, 'move%s_product_currency'%(m.id)).id,
+                        'product_price_unit_id' : getattr(partial, 'move%s_product_price_unit_id'%(m.id)).id,
+                    })          
+        res = pick_obj.do_partial(cr, uid, picking_ids, partial_datas, context=context)
+        return {}
+ 
+stock_partial_picking()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product_price_unit/product_price_unit_data.xml b/addons/product_price_unit/product_price_unit_data.xml
new file mode 100644
index 00000000000..fca300c7009
--- /dev/null
+++ b/addons/product_price_unit/product_price_unit_data.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+         <!--
+        Resource: product.price.unit
+        -->
+    <record id="pu1" model="product.price.unit">
+      <field name="name">Price/Unit</field>
+      <field name="code"> </field>
+      <field name="coefficient">1</field>
+    </record>
+
+    <record id="pu2" model="product.price.unit">
+      <field name="name">Price/100 Units</field>
+      <field name="code">%</field>
+      <field name="coefficient">100</field>
+    </record>
+
+    <record id="pu3" model="product.price.unit">
+      <field name="name">Price/1000 Units</field>
+      <field name="code">‰</field>
+      <field name="coefficient">1000</field>
+    </record>
+
+    <record id="pu4" model="product.price.unit">
+           <field name="name">Price in Cents</field>
+           <field name="code">¢</field>
+           <field name="coefficient">100</field>
+    </record>
+
+    </data>
+</openerp>
diff --git a/addons/product_price_unit/product_price_unit_view.xml b/addons/product_price_unit/product_price_unit_view.xml
new file mode 100644
index 00000000000..27b258dd156
--- /dev/null
+++ b/addons/product_price_unit/product_price_unit_view.xml
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+		<!--  Product Form -->
+        <record id="product_normal_form_view" model="ir.ui.view">
+            <field name="name">product_price_unit_form</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="list_price" position="after">
+                   	<field name="price_unit_id" on_change="on_change_price_unit(price_unit_id,standard_price,list_price)"/>
+                   	<field name="standard_price_coeff"/>
+                   	<field name="list_price_coeff"/>
+                </field>
+            </field>
+        </record>
+        
+        <!--  Product Tree -->
+        <record id="product_product_tree_view_value1" model="ir.ui.view">
+            <field name="name">product.product.tree</field>
+            <field name="model">product.product</field>
+            <field name="type">tree</field>
+            <field name="inherit_id" ref="product.product_product_tree_view"/>
+            <field name="arch" type="xml">
+	            <field name="qty_available" position="after">
+	                <field name="average_price" />
+	                <field name="stock_value" sum="Sum Stock Value"/>
+	            </field>
+            </field>
+        </record>
+        
+        <record id="view_category_property_form_price_unit" model="ir.ui.view">
+            <field name="name">product.category.stock.property.form.inherit</field>
+            <field name="model">product.category</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="stock.view_category_property_form"/>
+            <field name="arch" type="xml">
+                <field name="property_stock_journal" position="after">
+                    <field name="property_stock_location" domain="[('usage','=','internal')]"/>
+                </field>
+            </field>
+        </record>
+        
+        <record id="view_category_allow_negative_form" model="ir.ui.view">
+            <field name="name">product.category.stock.allow_negative.form.inherit</field>
+            <field name="model">product.category</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="view_category_property_form_price_unit"/>
+            <field name="arch" type="xml">
+                <field name="sequence" position="after">
+                  <field name="allow_negative_stock" />
+                </field>
+            </field>
+        </record>
+        
+        <record id="view_normal_property_form_price_unit" model="ir.ui.view">
+            <field name="name">product.normal.stock.property.form.inherit</field>
+            <field name="model">product.product</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="stock.view_normal_property_form"/>
+            <field name="arch" type="xml">
+	           <field name="property_stock_inventory" position="after">
+	               <field name="property_stock_location" domain="[('usage','=','internal')]" widget="selection"/>
+	           </field>
+            </field>
+        </record>
+        
+        <record id="view_template_allow_negative_form" model="ir.ui.view">
+            <field name="name">product.normal.stock.allow_negative.form.inherit</field>
+            <field name="model">product.product</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="view_normal_property_form_price_unit"/>
+            <field name="arch" type="xml">
+                <field name="active" position="after">
+                  <field name="allow_negative_stock" />
+                </field>
+            </field>
+        </record>
+
+		<!--  Invoice Line Form -->
+        <record id="view_invoice_line_form1" model="ir.ui.view">
+            <field name="name">invoice_price_unit_form</field>
+            <field name="model">account.invoice.line</field>
+            <field name="inherit_id" ref="account.view_invoice_line_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            	<field name="product_id" position="replace">
+                    <field name="product_id"  on_change="price_product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, price_unit_id, parent.address_invoice_id, parent.currency_id, {'company_id': parent.company_id})"  colspan="4"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="view_invoice_line_form" model="ir.ui.view">
+            <field name="name">invoice_price_unit_form1</field>
+            <field name="model">account.invoice.line</field>
+            <field name="inherit_id" ref="view_invoice_line_form1"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="price_unit" position="after">
+                    <field name="price_unit_id"/>
+                </field>
+            </field>
+        </record>
+
+		<!--  Invoice Line Tree -->
+        <record id="view_invoice_line_tree" model="ir.ui.view">
+            <field name="name">invoice_price_unit_tree</field>
+            <field name="model">account.invoice.line</field>
+            <field name="inherit_id" ref="account.view_invoice_line_tree"/>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <field name="discount" position="after">
+                    <field name="price_unit_id"/>
+                </field>
+            </field>
+        </record>
+
+		<!--  HR Expense Line Form -->
+        <record id="view_expenses_form" model="ir.ui.view">
+            <field name="name">hr_expense_line_price_unit_form</field>
+            <field name="model">hr.expense.expense</field>
+            <field name="inherit_id" ref="hr_expense.view_expenses_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="unit_amount" position="after">
+                    <field name="price_unit_id"/>
+                </field>
+            </field>
+        </record>
+
+		<!--  HR Expense Line Tree -->
+        <record id="view_expenses_line_tree" model="ir.ui.view">
+            <field name="name">hr_expense_line_price_unit_tree</field>
+            <field name="model">hr.expense.line</field>
+            <field name="inherit_id" ref="hr_expense.view_expenses_line_tree"/>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <field name="unit_amount" position="after">
+                    <field name="price_unit_id"/>
+                </field>
+            </field>
+        </record>
+        
+        <!--  MRP bom Form -->
+        <record id="mrp_bom_form_view_inherit" model="ir.ui.view">
+            <field name="name">mrp.bom.form.inherit</field>
+            <field name="model">mrp.bom</field>
+            <field name="inherit_id" ref="mrp.mrp_bom_form_view"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="company_id" position="after">
+                    <field name="price_unit_id"/>
+                </field>
+            </field>
+        </record>
+        
+        <record id="view_order_form_inherit5" model="ir.ui.view">
+            <field name="name">sale.order.form.inherit5</field>
+            <field name="model">sale.order</field>
+            <field name="inherit_id" ref="sale.view_order_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page/field[@name='order_line']/form/notebook/page/field[@name='price_unit']" position="after">
+                    <field name="price_unit_id"/>
+                </xpath>
+            </field>
+        </record>
+
+		<!--  Purchase Order Line Form -->
+        <record id="purchase_order_line_form1" model="ir.ui.view">
+            <field name="name">purchase_order_line_price_unit_form</field>
+            <field name="model">purchase.order.line</field>
+            <field name="inherit_id" ref="purchase.purchase_order_line_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="price_unit" position="after">
+                    <field name="price_unit_id"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="purchase_order_line_form" model="ir.ui.view">
+            <field name="name">purchase_order_line_price_unit_form</field>
+            <field name="model">purchase.order.line</field>
+            <field name="inherit_id" ref="purchase_order_line_form1"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="product_id" position="replace">
+                    <field colspan="4" context="partner_id=parent.partner_id,quantity=product_qty,pricelist=parent.pricelist_id,uom=product_uom,warehouse=parent.warehouse_id" name="product_id" on_change="price_product_id_change(parent.pricelist_id,price_unit_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order, parent.fiscal_position)"/>
+                </field>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index 46d7c3296b9..61819744371 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -56,7 +56,9 @@
              'test/purchase_from_manual.yml',
 #             'test/purchase_from_picking.yml',
     ],
-    'demo_xml': ['purchase_demo.xml','purchase_unit_test.xml'],
+    'demo_xml': ['purchase_demo.xml',
+#                 'purchase_unit_test.xml'
+                 ],
     'installable': True,
     'active': False,
     'certificate': '0057234283549',
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index 651945752a7..d2ea6b28458 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -60,7 +60,7 @@
         'stock_view.xml',
 #        'process/sale_process.xml',
     ],
-    'demo_xml': ['sale_demo.xml'],
+#    'demo_xml': ['sale_demo.xml'],
     'test': [
              'test/shipping_manual_sale_order.yml',
              'test/prepaid_sale_order.yml',

From 02457ac6694cbeb641bfaf62c78ad0acc7fda2a2 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Fri, 4 Jun 2010 14:35:17 +0530
Subject: [PATCH 026/121] [ADD] product_price_unit: Inherited
 account.analytic.line object.

bzr revid: uco@tinyerp.com-20100604090517-d7c7pk9fytnfi3ce
---
 .../product_price_unit/product_price_unit.py  | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/addons/product_price_unit/product_price_unit.py b/addons/product_price_unit/product_price_unit.py
index 11629dca6fb..87e793211e3 100644
--- a/addons/product_price_unit/product_price_unit.py
+++ b/addons/product_price_unit/product_price_unit.py
@@ -247,6 +247,19 @@ class product_product(osv.osv):
                 product_name = "%s (%s)" %(product_name, product.price_unit_id.name)
             new_results.append((product_id, product_name))
         return new_results
+    
+    #
+    # returns the price respecting the price unit for multiplications qty * price / coeff
+    # 
+    def price_coeff_get(self, cr, uid, ids, ptype='list_price', context={}):
+        res = {}
+        for product in self.browse(cr, uid, ids, context=context):
+            coeff = 1.0
+            if product.price_unit_id:
+                coeff = product.price_unit_id.coefficient
+            res[product.id] = product.price_get(ptype, context)[product.id] / coeff 
+            
+        return res   
 
 product_product()
 
@@ -290,6 +303,22 @@ class account_invoice_line(osv.osv):
 
 account_invoice_line()
 
+class account_analytic_line(osv.osv):
+    _inherit = 'account.analytic.line'
+    
+    def on_change_unit_amount(self, cr, uid, id, prod_id, unit_amount,company_id,
+            unit=False, context=None):
+        res = super(account_analytic_line, self).on_change_unit_amount(cr, uid, id, prod_id, unit_amount, company_id, unit, context)
+        product_obj = self.pool.get('product.product')
+        if prod_id:
+            prod = product_obj.browse(cr, uid, prod_id)
+            amount_unit = prod.price_coeff_get()[prod.id]
+            amount = amount_unit * unit_amount or 1.0
+            res['value']['amount'] = - round(amount, 2)
+        return res
+    
+account_analytic_line()
+
 class account_invoice_tax(osv.osv):
     _inherit = "account.invoice.tax"
     

From df40cfa40099bd05afc268f4ec5e54df4081e243 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Fri, 4 Jun 2010 15:43:08 +0530
Subject: [PATCH 027/121] [IMP] product_price_unit: Improved methods by
 overriding super methods. Uncommented demo files.

bzr revid: uco@tinyerp.com-20100604101308-2ps8m02nrtn2aw39
---
 addons/account/__openerp__.py                 |   2 +-
 .../product_price_unit/product_price_unit.py  | 239 +++++++++++++++---
 .../product_price_unit_view.xml               |   4 +-
 addons/purchase/__openerp__.py                |   4 +-
 addons/sale/__openerp__.py                    |   2 +-
 5 files changed, 210 insertions(+), 41 deletions(-)

diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index b921828f47d..51724f47d33 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -119,7 +119,7 @@ module named account_voucherss
         'project/project_demo.xml',
         'project/analytic_account_demo.xml',
         'demo/account_minimal.xml',
-#        'account_unit_test.xml',
+        'account_unit_test.xml',
     ],
     'test': [
         'test/account_customer_invoice.yml',
diff --git a/addons/product_price_unit/product_price_unit.py b/addons/product_price_unit/product_price_unit.py
index 87e793211e3..64439056aca 100644
--- a/addons/product_price_unit/product_price_unit.py
+++ b/addons/product_price_unit/product_price_unit.py
@@ -272,9 +272,9 @@ class account_invoice_line(osv.osv):
         res = cr.fetchone()
         return res and res[0] or False
 
-    def _amount_line(self, cr, uid, ids, prop, unknow_none,unknow_dict):
-        res = {}
-        cur_obj=self.pool.get('res.currency')
+    def _amount_line(self, cr, uid, ids, prop, unknow_none, unknow_dict):
+        res = super(account_invoice_line,self)._amount_line(cr, uid, ids, prop, unknow_none, unknow_dict)
+        cur_obj = self.pool.get('res.currency')
         for line in self.browse(cr, uid, ids):
             if line.price_unit_id:
                 if line.invoice_id:
@@ -332,13 +332,14 @@ class account_invoice_tax(osv.osv):
             t['base'] = 0.0
             t['base_amount'] = 0.0
         for line in inv.invoice_line:
-            for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, (line.price_unit* (1-(line.discount or 0.0)/100.0/line.price_unit_id.coefficient)), line.quantity, inv.address_invoice_id.id, line.product_id, inv.partner_id):
-                for t in tax_grouped.values():
-                    t['base'] += tax['price_unit'] * line['quantity'] / line['price_unit_id'].coefficient
-                    if inv.type in ('out_invoice','in_invoice'):
-                        t['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, t['base'] * tax['base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
-                    else:
-                        t['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, t['base'] * tax['ref_base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
+            if line.price_unit_id:
+                for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, (line.price_unit* (1-(line.discount or 0.0)/100.0/line.price_unit_id.coefficient)), line.quantity, inv.address_invoice_id.id, line.product_id, inv.partner_id):
+                    for t in tax_grouped.values():
+                        t['base'] += tax['price_unit'] * line['quantity'] / line['price_unit_id'].coefficient
+                        if inv.type in ('out_invoice','in_invoice'):
+                            t['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, t['base'] * tax['base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
+                        else:
+                            t['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, t['base'] * tax['ref_base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
         return tax_grouped
     
 account_invoice_tax()
@@ -467,9 +468,10 @@ class sale_order(osv.osv):
     _inherit = 'sale.order'
     
     def _amount_line_tax(self, cr, uid, line, context={}):
-        val = 0.0
-        for c in self.pool.get('account.tax').compute(cr, uid, line.tax_id, line.price_unit * (1-(line.discount or 0.0)/100.0)/ line.price_unit_id.coefficient, line.product_uom_qty, line.order_id.partner_invoice_id.id, line.product_id, line.order_id.partner_id):
-            val+= c['amount']
+        val = super(sale_order,self)._amount_line_tax(cr, uid, line, context)
+        if line.price_unit_id:
+            for c in self.pool.get('account.tax').compute(cr, uid, line.tax_id, line.price_unit * (1-(line.discount or 0.0)/100.0)/ line.price_unit_id.coefficient, line.product_uom_qty, line.order_id.partner_invoice_id.id, line.product_id, line.order_id.partner_id):
+                val+= c['amount']
         return val
     
     def action_ship_create(self, cr, uid, ids, *args):
@@ -526,7 +528,7 @@ class sale_order_line(osv.osv):
         return res
     
     _columns = {
-        'price_unit_id': fields.many2one('product.price.unit','Price Unit', required=True),
+        'price_unit_id': fields.many2one('product.price.unit','Price Unit'),
     }
     
     _defaults = {
@@ -581,7 +583,7 @@ class purchase_order(osv.osv):
         return res
 
     def _amount_all(self, cr, uid, ids, field_name, arg, context):
-        res = {}
+        res = super(purchase_order,self)._amount_all(cr, uid, ids, field_name, arg, context)
         cur_obj=self.pool.get('res.currency')
         for order in self.browse(cr, uid, ids):
             res[order.id] = {
@@ -590,10 +592,11 @@ class purchase_order(osv.osv):
                 'amount_total': 0.0,
             }
             val = val1 = 0.0
-            cur=order.pricelist_id.currency_id
+            cur = order.pricelist_id.currency_id
             for line in order.order_line:
                 for c in self.pool.get('account.tax').compute(cr, uid, line.taxes_id, line.price_unit, line.product_qty, order.partner_address_id.id, line.product_id, order.partner_id):
-                    val+= c['amount'] / line.price_unit_id.coefficient
+                    if line.price_unit_id:
+                        val+= c['amount'] / line.price_unit_id.coefficient
                 val1 += line.price_subtotal
             res[order.id]['amount_tax']=cur_obj.round(cr, uid, cur, val)
             res[order.id]['amount_untaxed']=cur_obj.round(cr, uid, cur, val1)
@@ -649,15 +652,16 @@ class purchase_order_line(osv.osv):
         return res and res[0] or False
 
     def _amount_line(self, cr, uid, ids, prop, unknow_none, unknow_dict):
-        res = {}
+        res = super(purchase_order_line,self)._amount_line(cr, uid, ids, prop, unknow_none, unknow_dict)
         cur_obj=self.pool.get('res.currency')
         for line in self.browse(cr, uid, ids):
             cur = line.order_id.pricelist_id.currency_id
-            res[line.id] = cur_obj.round(cr, uid, cur, line.price_unit * line.product_qty / line.price_unit_id.coefficient) 
+            if line.price_unit_id:
+                res[line.id] = cur_obj.round(cr, uid, cur, line.price_unit * line.product_qty / line.price_unit_id.coefficient) 
         return res
 
     _columns = {
-        'price_unit_id' : fields.many2one('product.price.unit','Price Unit', required=True),
+        'price_unit_id' : fields.many2one('product.price.unit','Price Unit'),
         'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', digits_compute= dp.get_precision('Purchase Price')),
     }
     _defaults = {
@@ -677,6 +681,185 @@ class purchase_order_line(osv.osv):
 
 purchase_order_line()
 
+class stock_partial_move(osv.osv_memory):
+    _inherit = "stock.partial.move"
+
+    def view_init(self, cr, uid, fields_list, context=None):
+        res = super(stock_partial_move, self).view_init(cr, uid, fields_list, context=context)
+        move_obj = self.pool.get('stock.move')
+        if not context:
+            context={}
+        moveids = []
+        for m in move_obj.browse(cr, uid, context.get('active_ids', [])):
+            if m.state in ('done', 'cancel'):
+                continue
+            if 'move%s_product_id'%(m.id) not in self._columns:
+                self._columns['move%s_product_id'%(m.id)] = fields.many2one('product.product',string="Product")
+            if 'move%s_product_qty'%(m.id) not in self._columns:
+                self._columns['move%s_product_qty'%(m.id)] = fields.float("Quantity")
+            if 'move%s_product_uom'%(m.id) not in self._columns:
+                self._columns['move%s_product_uom'%(m.id)] = fields.many2one('product.uom',string="Product UOM")
+
+            if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):
+                if 'move%s_product_price'%(m.id) not in self._columns:
+                    self._columns['move%s_product_price'%(m.id)] = fields.float("Price")
+                if 'move%s_product_currency'%(m.id) not in self._columns:
+                    self._columns['move%s_product_currency'%(m.id)] = fields.many2one('res.currency',string="Currency")
+                if 'move%s_product_price_unit_id'%(m.id) not in self._columns:
+                    self._columns['move%s_product_price_unit_id'%(m.id)] = fields.float("Price Unit")
+        return res
+
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False,submenu=False):
+        result = super(stock_partial_move, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu)
+        move_obj = self.pool.get('stock.move')
+        move_ids = context.get('active_ids', False)
+        move_ids = move_obj.search(cr, uid, [('id','in',move_ids)])
+        _moves_arch_lst = """<form string="Deliver Products">
+                        <separator colspan="4" string="Information"/>
+                        <field name="date" colspan="4" />
+                        <newline/>
+                        <separator colspan="4" string="Move Detail"/>
+                        """
+        _moves_fields = result['fields']
+        if move_ids and view_type in ['form']:
+            for m in move_obj.browse(cr, uid, move_ids, context):
+                if m.state in ('done', 'cancel'):
+                    continue
+                _moves_fields.update({
+                    'move%s_product_id'%(m.id)  : {
+                                'string': _('Product'),
+                                'type' : 'many2one',
+                                'relation': 'product.product',
+                                'required' : True,
+                                'readonly' : True,
+                                },
+                    'move%s_product_qty'%(m.id) : {
+                                'string': _('Quantity'),
+                                'type' : 'float',
+                                'required': True,
+                                },
+                    'move%s_product_uom'%(m.id) : {
+                                'string': _('Product UOM'),
+                                'type' : 'many2one',
+                                'relation': 'product.uom',
+                                'required' : True,
+                                'readonly' : True,
+                                }
+                })
+
+                _moves_arch_lst += """
+                    <group colspan="4" col="12">
+                    <field name="move%s_product_id" nolabel="1"/>
+                    <field name="move%s_product_qty" string="Qty" />
+                    <field name="move%s_product_uom" nolabel="1" />
+                """%(m.id, m.id, m.id)
+                if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):
+                    _moves_fields.update({
+                        'move%s_product_price'%(m.id) : {
+                                'string': _('Price'),
+                                'type' : 'float',
+                                },
+                        'move%s_product_currency'%(m.id): {
+                                'string': _('Currency'),
+                                'type' : 'float',
+                                'type' : 'many2one',
+                                'relation': 'res.currency',
+                                },
+                        'move%s_product_price_unit_id'%(m.id): {
+                                'string': _('Price Unit'),
+                                'type' : 'float',
+                                'type' : 'many2one',
+                                'relation': 'product.price.unit',
+                                },
+                    })
+                    _moves_arch_lst += """
+                        <field name="move%s_product_price" />
+                        <field name="move%s_product_currency" nolabel="1"/>
+                        <field name="move%s_product_price_unit_id" nolabel="1"/>
+                    """%(m.id, m.id, m.id)
+                _moves_arch_lst += """
+                    </group>
+                    """
+        _moves_arch_lst += """
+                <separator string="" colspan="4" />
+                <label string="" colspan="2"/>
+                <group col="2" colspan="2">
+                <button icon='gtk-cancel' special="cancel"
+                    string="_Cancel" />
+                <button name="do_partial" string="_Deliver"
+                    colspan="1" type="object" icon="gtk-apply" />
+            </group>                    
+        </form>"""
+        result['arch'] = _moves_arch_lst
+        result['fields'] = _moves_fields
+        return result
+
+    def default_get(self, cr, uid, fields, context=None):
+        res = super(stock_partial_move, self).default_get(cr, uid, fields, context=context)
+        move_obj = self.pool.get('stock.move')
+        if not context:
+            context={}
+        moveids = []
+        if 'date' in fields:
+            res.update({'date': time.strftime('%Y-%m-%d %H:%M:%S')})
+        for m in move_obj.browse(cr, uid, context.get('active_ids', [])):
+            if m.state in ('done', 'cancel'):
+                continue
+            if 'move%s_product_id'%(m.id) in fields:
+                res['move%s_product_id'%(m.id)] = m.product_id.id
+            if 'move%s_product_qty'%(m.id) in fields:
+                res['move%s_product_qty'%(m.id)] = m.product_qty
+            if 'move%s_product_uom'%(m.id) in fields:
+                res['move%s_product_uom'%(m.id)] = m.product_uom.id
+
+            if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):
+                price = 0
+                price_unit_id = False
+                if hasattr(m, 'purchase_line_id') and m.purchase_line_id:
+                    price = m.purchase_line_id.price_unit
+                if hasattr(m, 'purchase_line_id') and m.price_unit_id:
+                    price_unit_id = m.purchase_line_id.price_unit_id.id
+
+                currency = False
+                if hasattr(m.picking_id, 'purchase_id') and m.picking_id.purchase_id:
+                    currency = m.picking_id.purchase_id.pricelist_id.currency_id.id
+
+                if 'move%s_product_price'%(m.id) in fields:
+                    res['move%s_product_price'%(m.id)] = price
+                if 'move%s_product_currency'%(m.id) in fields:
+                    res['move%s_product_currency'%(m.id)] = currency
+                if 'move%s_product_price_unit_id'%(m.id) in fields:
+                    res['move%s_product_price_unit_id'%(m.id)] = price_unit_id
+        return res
+
+    def do_partial(self, cr, uid, ids, context):
+        move_obj = self.pool.get('stock.move')
+        move_ids = context.get('active_ids', False)
+        partial = self.browse(cr, uid, ids[0], context)
+        partial_datas = {
+            'delivery_date' : partial.date
+        }
+        for m in move_obj.browse(cr, uid, move_ids):
+            if m.state in ('done', 'cancel'):
+                continue
+            partial_datas['move%s'%(m.id)] = {
+                'product_id' : getattr(partial, 'move%s_product_id'%(m.id)).id,
+                'product_qty' : getattr(partial, 'move%s_product_qty'%(m.id)),
+                'product_uom' : getattr(partial, 'move%s_product_uom'%(m.id)).id
+            }
+
+            if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):
+                partial_datas['move%s'%(m.id)].update({
+                    'product_price' : getattr(partial, 'move%s_product_price'%(m.id)),
+                    'product_currency': getattr(partial, 'move%s_product_currency'%(m.id)).id,
+                    'product_price_unit_id' : getattr(partial, 'move%s_product_price_unit_id'%(m.id)),
+                })
+
+        res = move_obj.do_partial(cr, uid, move_ids, partial_datas, context=context)
+        return {}
+
+stock_partial_move()
+
 class stock_partial_picking(osv.osv_memory):
     _inherit = "stock.partial.picking"
 
@@ -794,19 +977,6 @@ class stock_partial_picking(osv.osv_memory):
         return result
 
     def default_get(self, cr, uid, fields, context=None):
-        """ 
-             To get default values for the object.
-            
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param fields: List of fields for which we want default values 
-             @param context: A standard dictionary 
-             
-             @return: A dictionary which of fields with values. 
-        
-        """ 
-
         res = super(stock_partial_picking, self).default_get(cr, uid, fields, context=context)
         pick_obj = self.pool.get('stock.picking')        
         if not context:
@@ -831,6 +1001,7 @@ class stock_partial_picking(osv.osv_memory):
 
                 if (pick.type == 'in') and (m.product_id.cost_method == 'average'):
                     price = 0
+                    price_unit_id = False
                     if hasattr(m, 'purchase_line_id') and m.purchase_line_id:
                         price = m.purchase_line_id.price_unit
                     if hasattr(m, 'purchase_line_id') and m.price_unit_id:
@@ -871,7 +1042,7 @@ class stock_partial_picking(osv.osv_memory):
                     partial_datas['move%s'%(m.id)].update({             
                         'product_price' : getattr(partial, 'move%s_product_price'%(m.id)),
                         'product_currency': getattr(partial, 'move%s_product_currency'%(m.id)).id,
-                        'product_price_unit_id' : getattr(partial, 'move%s_product_price_unit_id'%(m.id)).id,
+                        'product_price_unit_id' : getattr(partial, 'move%s_product_price_unit_id'%(m.id)),
                     })          
         res = pick_obj.do_partial(cr, uid, picking_ids, partial_datas, context=context)
         return {}
diff --git a/addons/product_price_unit/product_price_unit_view.xml b/addons/product_price_unit/product_price_unit_view.xml
index 27b258dd156..a0f94e841a7 100644
--- a/addons/product_price_unit/product_price_unit_view.xml
+++ b/addons/product_price_unit/product_price_unit_view.xml
@@ -162,7 +162,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <xpath expr="/form/notebook/page/field[@name='order_line']/form/notebook/page/field[@name='price_unit']" position="after">
-                    <field name="price_unit_id"/>
+                    <field name="price_unit_id" required="True"/>
                 </xpath>
             </field>
         </record>
@@ -175,7 +175,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="price_unit" position="after">
-                    <field name="price_unit_id"/>
+                    <field name="price_unit_id" required="True"/>
                 </field>
             </field>
         </record>
diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index 61819744371..92a429afad7 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -56,9 +56,7 @@
              'test/purchase_from_manual.yml',
 #             'test/purchase_from_picking.yml',
     ],
-    'demo_xml': ['purchase_demo.xml',
-#                 'purchase_unit_test.xml'
-                 ],
+    'demo_xml': ['purchase_demo.xml', 'purchase_unit_test.xml'],
     'installable': True,
     'active': False,
     'certificate': '0057234283549',
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index d2ea6b28458..651945752a7 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -60,7 +60,7 @@
         'stock_view.xml',
 #        'process/sale_process.xml',
     ],
-#    'demo_xml': ['sale_demo.xml'],
+    'demo_xml': ['sale_demo.xml'],
     'test': [
              'test/shipping_manual_sale_order.yml',
              'test/prepaid_sale_order.yml',

From 7b11eb889510ed0fffacad85d0560bb837d60b8c Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 4 Jun 2010 18:21:58 +0530
Subject: [PATCH 028/121] [IMP]: mail_gateway: View improvement

bzr revid: rpa@tinyerp.com-20100604125158-ytiaccg2tzmhs76d
---
 addons/mail_gateway/mail_gateway_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
index 3c3802ec6f0..436492460eb 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -11,7 +11,7 @@
 	                    <field name="name" required="1" select="1"/>
 	                    <field name="date" required="1" select="1"/>
 	                    <field name="user_id" string="Responsible" select="1"/>
-	                    <field name="partner_id" />
+	                    <field name="partner_id" readonly="1" />
 	                </group>
                     <notebook colspan="4">
 	                    <page string="Details">
@@ -46,10 +46,10 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Mailgateway Message">
-                    <field name="name" />
                     <field name="date" />
-                    <field name="email_from" />
-                    <field name="user_id" />
+                    <field name="name" />
+                    <field name="email_from" string="From"/>
+                    <field name="user_id" string="Responsible"/>
                 </tree>
             </field>
         </record>

From e7af840d3d38c52f60bec9a749c813388936c7a9 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Mon, 7 Jun 2010 12:03:42 +0530
Subject: [PATCH 029/121] [IMP]: membership: Use multi in function
 field.separate report in report folder.

bzr revid: atp@tinyerp.co.in-20100607063342-sle8bcwuq0sn7b65
---
 addons/membership/__init__.py                 |   1 +
 addons/membership/__openerp__.py              |   4 +-
 addons/membership/demo_data.xml               |   0
 addons/membership/i18n/ar.po                  |   0
 addons/membership/i18n/bg.po                  |   0
 addons/membership/i18n/bs.po                  |   0
 addons/membership/i18n/ca.po                  |   0
 addons/membership/i18n/cs.po                  |   0
 addons/membership/i18n/de.po                  |   0
 addons/membership/i18n/es.po                  |   0
 addons/membership/i18n/es_AR.po               |   0
 addons/membership/i18n/et.po                  |   0
 addons/membership/i18n/fi.po                  |   0
 addons/membership/i18n/fr.po                  |   0
 addons/membership/i18n/hr.po                  |   0
 addons/membership/i18n/hu.po                  |   0
 addons/membership/i18n/id.po                  |   0
 addons/membership/i18n/it.po                  |   0
 addons/membership/i18n/ko.po                  |   0
 addons/membership/i18n/lt.po                  |   0
 addons/membership/i18n/membership.pot         |   0
 addons/membership/i18n/nl.po                  |   0
 addons/membership/i18n/nl_BE.po               |   0
 addons/membership/i18n/pl.po                  |   0
 addons/membership/i18n/pt.po                  |   0
 addons/membership/i18n/pt_BR.po               |   0
 addons/membership/i18n/ro.po                  |   0
 addons/membership/i18n/ru.po                  |   0
 addons/membership/i18n/sk.po                  |   0
 addons/membership/i18n/sl.po                  |   0
 addons/membership/i18n/sq.po                  |   0
 addons/membership/i18n/sv.po                  |   0
 addons/membership/i18n/tlh.po                 |   0
 addons/membership/i18n/tr.po                  |   0
 addons/membership/i18n/uk.po                  |   0
 addons/membership/i18n/vi.po                  |   0
 addons/membership/i18n/zh_CN.po               |   0
 addons/membership/i18n/zh_TW.po               |   0
 addons/membership/membership.py               | 247 +++---------------
 addons/membership/membership_data.xml         |   0
 addons/membership/membership_demo.xml         |   0
 addons/membership/membership_view.xml         | 225 +---------------
 .../membership/process/membership_process.xml |   0
 addons/membership/report/__init__.py          |  22 ++
 addons/membership/report/report_membership.py | 175 +++++++++++++
 .../report/report_membership_view.xml         | 211 +++++++++++++++
 .../membership/security/ir.model.access.csv   |   0
 addons/membership/wizard/__init__.py          |   0
 .../membership/wizard/membership_invoice.py   |   0
 .../wizard/membership_invoice_view.xml        |   0
 .../wizard/membership_unpaid_invoice.py       |   0
 .../wizard/membership_unpaid_invoice_view.xml |   0
 52 files changed, 467 insertions(+), 418 deletions(-)
 mode change 100644 => 100755 addons/membership/__init__.py
 mode change 100644 => 100755 addons/membership/__openerp__.py
 mode change 100644 => 100755 addons/membership/demo_data.xml
 mode change 100644 => 100755 addons/membership/i18n/ar.po
 mode change 100644 => 100755 addons/membership/i18n/bg.po
 mode change 100644 => 100755 addons/membership/i18n/bs.po
 mode change 100644 => 100755 addons/membership/i18n/ca.po
 mode change 100644 => 100755 addons/membership/i18n/cs.po
 mode change 100644 => 100755 addons/membership/i18n/de.po
 mode change 100644 => 100755 addons/membership/i18n/es.po
 mode change 100644 => 100755 addons/membership/i18n/es_AR.po
 mode change 100644 => 100755 addons/membership/i18n/et.po
 mode change 100644 => 100755 addons/membership/i18n/fi.po
 mode change 100644 => 100755 addons/membership/i18n/fr.po
 mode change 100644 => 100755 addons/membership/i18n/hr.po
 mode change 100644 => 100755 addons/membership/i18n/hu.po
 mode change 100644 => 100755 addons/membership/i18n/id.po
 mode change 100644 => 100755 addons/membership/i18n/it.po
 mode change 100644 => 100755 addons/membership/i18n/ko.po
 mode change 100644 => 100755 addons/membership/i18n/lt.po
 mode change 100644 => 100755 addons/membership/i18n/membership.pot
 mode change 100644 => 100755 addons/membership/i18n/nl.po
 mode change 100644 => 100755 addons/membership/i18n/nl_BE.po
 mode change 100644 => 100755 addons/membership/i18n/pl.po
 mode change 100644 => 100755 addons/membership/i18n/pt.po
 mode change 100644 => 100755 addons/membership/i18n/pt_BR.po
 mode change 100644 => 100755 addons/membership/i18n/ro.po
 mode change 100644 => 100755 addons/membership/i18n/ru.po
 mode change 100644 => 100755 addons/membership/i18n/sk.po
 mode change 100644 => 100755 addons/membership/i18n/sl.po
 mode change 100644 => 100755 addons/membership/i18n/sq.po
 mode change 100644 => 100755 addons/membership/i18n/sv.po
 mode change 100644 => 100755 addons/membership/i18n/tlh.po
 mode change 100644 => 100755 addons/membership/i18n/tr.po
 mode change 100644 => 100755 addons/membership/i18n/uk.po
 mode change 100644 => 100755 addons/membership/i18n/vi.po
 mode change 100644 => 100755 addons/membership/i18n/zh_CN.po
 mode change 100644 => 100755 addons/membership/i18n/zh_TW.po
 mode change 100644 => 100755 addons/membership/membership.py
 mode change 100644 => 100755 addons/membership/membership_data.xml
 mode change 100644 => 100755 addons/membership/membership_demo.xml
 mode change 100644 => 100755 addons/membership/membership_view.xml
 mode change 100644 => 100755 addons/membership/process/membership_process.xml
 create mode 100755 addons/membership/report/__init__.py
 create mode 100755 addons/membership/report/report_membership.py
 create mode 100755 addons/membership/report/report_membership_view.xml
 mode change 100644 => 100755 addons/membership/security/ir.model.access.csv
 mode change 100644 => 100755 addons/membership/wizard/__init__.py
 mode change 100644 => 100755 addons/membership/wizard/membership_invoice.py
 mode change 100644 => 100755 addons/membership/wizard/membership_invoice_view.xml
 mode change 100644 => 100755 addons/membership/wizard/membership_unpaid_invoice.py
 mode change 100644 => 100755 addons/membership/wizard/membership_unpaid_invoice_view.xml

diff --git a/addons/membership/__init__.py b/addons/membership/__init__.py
old mode 100644
new mode 100755
index 4ae17c80e71..7e377bcdace
--- a/addons/membership/__init__.py
+++ b/addons/membership/__init__.py
@@ -21,5 +21,6 @@
 
 import membership
 import wizard
+import report
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/membership/__openerp__.py b/addons/membership/__openerp__.py
old mode 100644
new mode 100755
index 49297bc010d..709a09807ac
--- a/addons/membership/__openerp__.py
+++ b/addons/membership/__openerp__.py
@@ -43,10 +43,12 @@ invoice and send propositions for membership renewal.
         'security/ir.model.access.csv',
         'wizard/membership_invoice_view.xml',
         'membership_view.xml',
+        'report/report_membership_view.xml',
         'wizard/membership_unpaid_invoice_view.xml',
         'process/membership_process.xml'
     ],
-    'demo_xml': ['membership_demo.xml'],
+    'demo_xml': ['membership_demo.xml'
+                 ],
     'installable': True,
     'active': False,
     'certificate': '0042907796381',
diff --git a/addons/membership/demo_data.xml b/addons/membership/demo_data.xml
old mode 100644
new mode 100755
diff --git a/addons/membership/i18n/ar.po b/addons/membership/i18n/ar.po
old mode 100644
new mode 100755
diff --git a/addons/membership/i18n/bg.po b/addons/membership/i18n/bg.po
old mode 100644
new mode 100755
diff --git a/addons/membership/i18n/bs.po b/addons/membership/i18n/bs.po
old mode 100644
new mode 100755
diff --git a/addons/membership/i18n/ca.po b/addons/membership/i18n/ca.po
old mode 100644
new mode 100755
diff --git a/addons/membership/i18n/cs.po b/addons/membership/i18n/cs.po
old mode 100644
new mode 100755
diff --git a/addons/membership/i18n/de.po b/addons/membership/i18n/de.po
old mode 100644
new mode 100755
diff --git a/addons/membership/i18n/es.po b/addons/membership/i18n/es.po
old mode 100644
new mode 100755
diff --git a/addons/membership/i18n/es_AR.po b/addons/membership/i18n/es_AR.po
old mode 100644
new mode 100755
diff --git a/addons/membership/i18n/et.po b/addons/membership/i18n/et.po
old mode 100644
new mode 100755
diff --git a/addons/membership/i18n/fi.po b/addons/membership/i18n/fi.po
old mode 100644
new mode 100755
diff --git a/addons/membership/i18n/fr.po b/addons/membership/i18n/fr.po
old mode 100644
new mode 100755
diff --git a/addons/membership/i18n/hr.po b/addons/membership/i18n/hr.po
old mode 100644
new mode 100755
diff --git a/addons/membership/i18n/hu.po b/addons/membership/i18n/hu.po
old mode 100644
new mode 100755
diff --git a/addons/membership/i18n/id.po b/addons/membership/i18n/id.po
old mode 100644
new mode 100755
diff --git a/addons/membership/i18n/it.po b/addons/membership/i18n/it.po
old mode 100644
new mode 100755
diff --git a/addons/membership/i18n/ko.po b/addons/membership/i18n/ko.po
old mode 100644
new mode 100755
diff --git a/addons/membership/i18n/lt.po b/addons/membership/i18n/lt.po
old mode 100644
new mode 100755
diff --git a/addons/membership/i18n/membership.pot b/addons/membership/i18n/membership.pot
old mode 100644
new mode 100755
diff --git a/addons/membership/i18n/nl.po b/addons/membership/i18n/nl.po
old mode 100644
new mode 100755
diff --git a/addons/membership/i18n/nl_BE.po b/addons/membership/i18n/nl_BE.po
old mode 100644
new mode 100755
diff --git a/addons/membership/i18n/pl.po b/addons/membership/i18n/pl.po
old mode 100644
new mode 100755
diff --git a/addons/membership/i18n/pt.po b/addons/membership/i18n/pt.po
old mode 100644
new mode 100755
diff --git a/addons/membership/i18n/pt_BR.po b/addons/membership/i18n/pt_BR.po
old mode 100644
new mode 100755
diff --git a/addons/membership/i18n/ro.po b/addons/membership/i18n/ro.po
old mode 100644
new mode 100755
diff --git a/addons/membership/i18n/ru.po b/addons/membership/i18n/ru.po
old mode 100644
new mode 100755
diff --git a/addons/membership/i18n/sk.po b/addons/membership/i18n/sk.po
old mode 100644
new mode 100755
diff --git a/addons/membership/i18n/sl.po b/addons/membership/i18n/sl.po
old mode 100644
new mode 100755
diff --git a/addons/membership/i18n/sq.po b/addons/membership/i18n/sq.po
old mode 100644
new mode 100755
diff --git a/addons/membership/i18n/sv.po b/addons/membership/i18n/sv.po
old mode 100644
new mode 100755
diff --git a/addons/membership/i18n/tlh.po b/addons/membership/i18n/tlh.po
old mode 100644
new mode 100755
diff --git a/addons/membership/i18n/tr.po b/addons/membership/i18n/tr.po
old mode 100644
new mode 100755
diff --git a/addons/membership/i18n/uk.po b/addons/membership/i18n/uk.po
old mode 100644
new mode 100755
diff --git a/addons/membership/i18n/vi.po b/addons/membership/i18n/vi.po
old mode 100644
new mode 100755
diff --git a/addons/membership/i18n/zh_CN.po b/addons/membership/i18n/zh_CN.po
old mode 100644
new mode 100755
diff --git a/addons/membership/i18n/zh_TW.po b/addons/membership/i18n/zh_TW.po
old mode 100644
new mode 100755
diff --git a/addons/membership/membership.py b/addons/membership/membership.py
old mode 100644
new mode 100755
index 23f9cd19275..73e7d4f0c6a
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -221,6 +221,7 @@ class Partner(osv.osv):
     _inherit = 'res.partner'
 
     def _get_partner_id(self, cr, uid, ids, context=None):
+       
         data_inv = self.pool.get('membership.membership_line').browse(cr, uid, ids, context)
         list_partner = []
         for data in data_inv:
@@ -298,55 +299,47 @@ class Partner(osv.osv):
                 res_state = self._membership_state(cr, uid, [partner_data.associate_member.id], name, args, context)
                 res[id] = res_state[partner_data.associate_member.id]
         return res
-
-    def _membership_start(self, cr, uid, ids, name, args, context=None):
-        '''Return the start date of membership'''
+    
+    def _membership_date(self, cr, uid, ids, name, args, context=None):
+        
+        '''Return  date of membership'''
+        
+        name = name[0]
         res = {}
         member_line_obj = self.pool.get('membership.membership_line')
+        
         for partner in self.browse(cr, uid, ids):
+            
             if partner.associate_member:
-                partner_id = partner.associate_member.id
+                 partner_id = partner.associate_member.id
             else:
-                partner_id = partner.id
-            line_id = member_line_obj.search(cr, uid, [('partner', '=', partner_id)],
-                    limit=1, order='date_from')
-            if line_id:
-                res[partner.id] = member_line_obj.read(cr, uid, line_id[0],
-                        ['date_from'])['date_from']
-            else:
-                res[partner.id] = False
-        return res
-
-    def _membership_stop(self, cr, uid, ids, name, args, context=None):
-        '''Return the stop date of membership'''
-        res = {}
-        member_line_obj = self.pool.get('membership.membership_line')
-        for partner in self.browse(cr, uid, ids):
-            cr.execute('select membership_state from res_partner where id=%s', (partner.id,))
-            data_state = cr.fetchall()
-            if partner.associate_member:
-                partner_id = partner.associate_member.id
-            else:
-                partner_id = partner.id
-            line_id = member_line_obj.search(cr, uid, [('partner', '=', partner_id)],
-                    limit=1, order='date_to desc')
-            if line_id:
-                res[partner.id] = member_line_obj.read(cr, uid, line_id[0],
-                        ['date_to'])['date_to']
-            else:
-                res[partner.id] = False
-        return res
-
-    def _membership_cancel(self, cr, uid, ids, name, args, context=None):
-        '''Return the cancel date of membership'''
-        res = {}
-        member_line_obj = self.pool.get('membership.membership_line')
-        for partner in self.browse(cr, uid, ids, context=context):
-            res[partner.id] = False
-            if partner.membership_state == 'canceled':
-                line_id = member_line_obj.search(cr, uid, [('partner', '=', partner.id)],limit=1, order='date_cancel')
+                 partner_id = partner.id
+                    
+            res[partner.id]={
+                             'membership_start': False,
+                             'membership_stop': False,
+                             'membership_cancel': False
+                             }        
+            
+            if name == 'membership_start':
+                line_id = member_line_obj.search(cr, uid, [('partner', '=', partner_id)],
+                            limit=1, order='date_from')
                 if line_id:
-                    res[partner.id] = member_line_obj.read(cr, uid, line_id[0],['date_cancel'])['date_cancel']
+                        res[partner.id]['membership_start'] = member_line_obj.read(cr, uid, line_id[0],
+                                ['date_from'])['date_from']
+
+            if name == 'membership_stop':        
+                line_id1 = member_line_obj.search(cr, uid, [('partner', '=', partner_id)],
+                            limit=1, order='date_to desc')
+                if line_id1:
+                      res[partner.id]['membership_stop'] = member_line_obj.read(cr, uid, line_id1[0],
+                                ['date_to'])['date_to']
+            if name == 'membership_cancel':     
+                if partner.membership_state == 'canceled':
+                    line_id2 = member_line_obj.search(cr, uid, [('partner', '=', partner.id)],limit=1, order='date_cancel')
+                    if line_id2:
+                        res[partner.id]['membership_cancel'] = member_line_obj.read(cr, uid, line_id2[0],['date_cancel'])['date_cancel']
+
         return res
 
     def _get_partners(self, cr, uid, ids, context={}):
@@ -376,17 +369,17 @@ class Partner(osv.osv):
                         }
                     ),
         'membership_start': fields.function(
-                    _membership_start, method=True,
+                    _membership_date, method=True, multi='membeship_start',
                     string = 'Start membership date', type = 'date',
                     store = {
                         'account.invoice':(_get_invoice_partner,['state'], 10),
-                        'membership.membership_line':(_get_partner_id,['state'], 10),
+                        'membership.membership_line':(_get_partner_id,['state'], 10, ),
                         'res.partner':(lambda self,cr,uid,ids,c={}:ids, ['free_member'], 10)
                         }
                     ),
         'membership_stop': fields.function(
-                    _membership_stop, method = True,
-                    string = 'Stop membership date', type = 'date',
+                    _membership_date, method = True,
+                    string = 'Stop membership date', type = 'date', multi='membership_stop',
                     store = {
                         'account.invoice':(_get_invoice_partner,['state'], 10),
                         'membership.membership_line':(_get_partner_id,['state'], 10),
@@ -395,8 +388,8 @@ class Partner(osv.osv):
                     ),
 
         'membership_cancel': fields.function(
-                    _membership_cancel, method = True,
-                    string = 'Cancel membership date', type='date',
+                    _membership_date, method = True,
+                    string = 'Cancel membership date', type='date', multi='membership_cancel',
                     store = {
                         'account.invoice':(_get_invoice_partner,['state'], 11),
                         'membership.membership_line':(_get_partner_id,['state'], 10),
@@ -490,160 +483,6 @@ class Invoice(osv.osv):
         return super(Invoice, self).action_cancel(cr, uid, ids, context)
 Invoice()
 
-
-class ReportPartnerMemberYear(osv.osv):
-    '''Membership by Years'''
-
-    _name = 'report.partner_member.year'
-    _description = __doc__
-    _auto = False
-    _rec_name = 'year'
-    _columns = {
-        'year': fields.char('Year', size='4', readonly=True, select=1),
-        'canceled_number': fields.integer('Canceled', readonly=True),
-        'waiting_number': fields.integer('Waiting', readonly=True),
-        'invoiced_number': fields.integer('Invoiced', readonly=True),
-        'paid_number': fields.integer('Paid', readonly=True),
-        'canceled_amount': fields.float('Canceled', digits=(16, 2), readonly=True),
-        'waiting_amount': fields.float('Waiting', digits=(16, 2), readonly=True),
-        'invoiced_amount': fields.float('Invoiced', digits=(16, 2), readonly=True),
-        'paid_amount': fields.float('Paid', digits=(16, 2), readonly=True),
-        'currency': fields.many2one('res.currency', 'Currency', readonly=True,
-            select=2),
-    }
-
-    def init(self, cr):
-        '''Create the view'''
-        cr.execute("""
-    CREATE OR REPLACE VIEW report_partner_member_year AS (
-        SELECT
-        MIN(id) AS id,
-        COUNT(ncanceled) as canceled_number,
-        COUNT(npaid) as paid_number,
-        COUNT(ninvoiced) as invoiced_number,
-        COUNT(nwaiting) as waiting_number,
-        SUM(acanceled) as canceled_amount,
-        SUM(apaid) as paid_amount,
-        SUM(ainvoiced) as invoiced_amount,
-        SUM(awaiting) as waiting_amount,
-        year,
-        currency
-        FROM (SELECT
-            CASE WHEN ai.state = 'cancel' THEN ml.id END AS ncanceled,
-            CASE WHEN ai.state = 'paid' THEN ml.id END AS npaid,
-            CASE WHEN ai.state = 'open' THEN ml.id END AS ninvoiced,
-            CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
-                THEN ml.id END AS nwaiting,
-            CASE WHEN ai.state = 'cancel'
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS acanceled,
-            CASE WHEN ai.state = 'paid'
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS apaid,
-            CASE WHEN ai.state = 'open'
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS ainvoiced,
-            CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS awaiting,
-            TO_CHAR(ml.date_from, 'YYYY') AS year,
-            ai.currency_id AS currency,
-            MIN(ml.id) AS id
-            FROM membership_membership_line ml
-            JOIN (account_invoice_line ail
-                LEFT JOIN account_invoice ai
-                ON (ail.invoice_id = ai.id))
-            ON (ml.account_invoice_line = ail.id)
-            JOIN res_partner p
-            ON (ml.partner = p.id)
-            GROUP BY TO_CHAR(ml.date_from, 'YYYY'), ai.state,
-            ai.currency_id, ml.id) AS foo
-        GROUP BY year, currency)
-                """)
-
-ReportPartnerMemberYear()
-
-
-class ReportPartnerMemberYearNew(osv.osv):
-    '''New Membership by Years'''
-
-    _name = 'report.partner_member.year_new'
-    _description = __doc__
-    _auto = False
-    _rec_name = 'year'
-    _columns = {
-        'year': fields.char('Year', size='4', readonly=True, select=1),
-        'canceled_number': fields.integer('Canceled', readonly=True),
-        'waiting_number': fields.integer('Waiting', readonly=True),
-        'invoiced_number': fields.integer('Invoiced', readonly=True),
-        'paid_number': fields.integer('Paid', readonly=True),
-        'canceled_amount': fields.float('Canceled', digits=(16, 2), readonly=True),
-        'waiting_amount': fields.float('Waiting', digits=(16, 2), readonly=True),
-        'invoiced_amount': fields.float('Invoiced', digits=(16, 2), readonly=True),
-        'paid_amount': fields.float('Paid', digits=(16, 2), readonly=True),
-        'currency': fields.many2one('res.currency', 'Currency', readonly=True,
-            select=2),
-    }
-
-    def init(self, cursor):
-        '''Create the view'''
-        cursor.execute("""
-        CREATE OR REPLACE VIEW report_partner_member_year_new AS (
-        SELECT
-        MIN(id) AS id,
-        COUNT(ncanceled) AS canceled_number,
-        COUNT(npaid) AS paid_number,
-        COUNT(ninvoiced) AS invoiced_number,
-        COUNT(nwaiting) AS waiting_number,
-        SUM(acanceled) AS canceled_amount,
-        SUM(apaid) AS paid_amount,
-        SUM(ainvoiced) AS invoiced_amount,
-        SUM(awaiting) AS waiting_amount,
-        year,
-        currency
-        FROM (SELECT
-            CASE WHEN ai.state = 'cancel' THEN ml2.id END AS ncanceled,
-            CASE WHEN ai.state = 'paid' THEN ml2.id END AS npaid,
-            CASE WHEN ai.state = 'open' THEN ml2.id END AS ninvoiced,
-            CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
-                THEN ml2.id END AS nwaiting,
-            CASE WHEN ai.state = 'cancel'
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS acanceled,
-            CASE WHEN ai.state = 'paid'
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS apaid,
-            CASE WHEN ai.state = 'open'
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS ainvoiced,
-            CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS awaiting,
-            TO_CHAR(ml2.date_from, 'YYYY') AS year,
-            ai.currency_id AS currency,
-            MIN(ml2.id) AS id
-            FROM (SELECT
-                    partner AS id,
-                    MIN(date_from) AS date_from
-                    FROM membership_membership_line
-                    GROUP BY partner
-                ) AS ml1
-                JOIN membership_membership_line ml2
-                JOIN (account_invoice_line ail
-                    LEFT JOIN account_invoice ai
-                    ON (ail.invoice_id = ai.id))
-                ON (ml2.account_invoice_line = ail.id)
-                ON (ml1.id = ml2.partner AND ml1.date_from = ml2.date_from)
-            JOIN res_partner p
-            ON (ml2.partner = p.id)
-            GROUP BY TO_CHAR(ml2.date_from, 'YYYY'), ai.state,
-            ai.currency_id, ml2.id) AS foo
-        GROUP BY year, currency
-        )
-    """)
-
-ReportPartnerMemberYearNew()
-
 class account_invoice_line(osv.osv):
     _inherit='account.invoice.line'
     
@@ -702,4 +541,4 @@ class account_invoice_line(osv.osv):
         return result
 
 account_invoice_line()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/membership/membership_data.xml b/addons/membership/membership_data.xml
old mode 100644
new mode 100755
diff --git a/addons/membership/membership_demo.xml b/addons/membership/membership_demo.xml
old mode 100644
new mode 100755
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
old mode 100644
new mode 100755
index 00dde266b4b..e6eac337025
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -110,23 +110,28 @@
                 </tree>
             </field>
         </record>
+        
         <record id="view_res_partner_member_filter" model="ir.ui.view">
             <field name="name">res.partner.select</field>
             <field name="model">res.partner</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <field name="category_id" position="after">
-                    <field name="membership_state" select="1">
-                        <filter icon="terp-partner" domain="[('membership_state', '=', 'paid')]" help="Paid Members"/>
-                        <filter icon="terp-partner" domain="[('membership_state', '=', 'free')]" help="Free Members"/>
-                        <filter icon="terp-partner" domain="[('associate_member', '!=', False), ('membership_state', '!=', 'none')]" help="Associated Members"/>
-                        <filter icon="terp-partner" domain="[('membership_state', '=', 'invoiced')]" help="Invoiced Members"/>
-                        <filter icon="terp-partner" domain="[('membership_state', '=', 'waiting')]" help="Future Members"/>
-                        <filter icon="terp-partner" domain="[('membership_state', '=', 'old')]" help="Old Members"/>
+                       <filter icon="terp-partner" domain="[('membership_state', '=', 'paid')]" string="Paid Members" />
+                       <filter icon="terp-partner" domain="[('membership_state', '=', 'invoiced')]" string="Invoiced Members" />
+                       <filter icon="terp-partner" domain="[('membership_state', '=', 'waiting')]" string="Future Members" />
+                       <separator orientation="vertical"/>
+                       <field name="membership_state">
+                       <field name="membership_start"/>
                     </field>
+                    <newline/>
+                   <group expand="1" string="Group By..." position="after">
+                       <filter string="Associate Members" icon="terp-partner" domain="[]" context="{'group_by': 'associate_member'}"/>
+                   </group>     
                </field>
             </field>
         </record>
+        
 
         <record model="ir.actions.act_window" id="action_membership_members">
             <field name="name">Members</field>
@@ -202,7 +207,6 @@
                         </field>
                     </page>
                 </notebook>
-
             </field>
         </record>
 
@@ -211,211 +215,6 @@
             sequence="2"
             id="menu_reporting"/>
 
-        <!-- REPORTING/MEMBERSHIP BY YEAR  -->
-
-
-        <record model="ir.ui.view" id="view_report_partner_member_year_tree1">
-            <field name="name">report.partner_member.year.tree</field>
-            <field name="model">report.partner_member.year</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Membership by Years">
-                    <field name="canceled_number"/>
-                    <field name="waiting_number"/>
-                    <field name="invoiced_number"/>
-                    <field name="paid_number"/>
-                    <field name="year"/>
-                </tree>
-            </field>
-        </record>
-
-
-        <record model="ir.ui.view" id="view_report_partner_member_year_tree2">
-            <field name="name">report.partner_member.year.tree</field>
-            <field name="model">report.partner_member.year</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Membership by Years">
-                    <field name="canceled_amount"/>
-                    <field name="waiting_amount"/>
-                    <field name="invoiced_amount"/>
-                    <field name="paid_amount"/>
-                    <field name="currency"/>
-                    <field name="year"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_report_partner_member_year_graph1">
-            <field name="name">report.partner_member.year.graph1</field>
-            <field name="model">report.partner_member.year</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Membership by Years" type="bar">
-                    <field name="year"/>
-                    <field name="canceled_number"/>
-                    <field name="waiting_number"/>
-                    <field name="invoiced_number"/>
-                    <field name="paid_number"/>
-                </graph>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_report_partner_member_year_graph2">
-            <field name="name">report.partner_member.year.graph2</field>
-            <field name="model">report.partner_member.year</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Membership by Years" type="bar">
-                    <field name="year"/>
-                    <field name="canceled_amount"/>
-                    <field name="waiting_amount"/>
-                    <field name="invoiced_amount"/>
-                    <field name="paid_amount"/>
-                </graph>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_report_partner_member_year_tree">
-            <field name="res_model">report.partner_member.year</field>
-            <field name="view_type">form</field>
-        </record>
-
-        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_tree_view1">
-            <field name="sequence" eval="3"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_report_partner_member_year_tree1"/>
-            <field name="act_window_id" ref="action_report_partner_member_year_tree"/>
-        </record>
-
-
-        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_tree_view4">
-            <field name="sequence" eval="4"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_report_partner_member_year_tree2"/>
-            <field name="act_window_id" ref="action_report_partner_member_year_tree"/>
-        </record>
-
-        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_tree_view2">
-            <field name="sequence" eval="1"/>
-            <field name="view_mode">graph</field>
-            <field name="view_id" ref="view_report_partner_member_year_graph1"/>
-            <field name="act_window_id" ref="action_report_partner_member_year_tree"/>
-        </record>
-
-        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_tree_view3">
-            <field name="sequence" eval="2"/>
-            <field name="view_mode">graph</field>
-            <field name="view_id" ref="view_report_partner_member_year_graph2"/>
-            <field name="act_window_id" ref="action_report_partner_member_year_tree"/>
-        </record>
-
-        <menuitem name="Membership by Years" parent="menu_reporting"
-            action="action_report_partner_member_year_tree"
-            id="menu_report_partner_member_year"/>
-
-
-        <!-- REPORTING/NEW MEMBERSHIP BY YEAR  -->
-
-
-
-        <record model="ir.ui.view" id="view_report_partner_member_year_new_tree1">
-            <field name="name">report.partner_member.year_new.tree</field>
-            <field name="model">report.partner_member.year_new</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="New Membership by Years">
-                    <field name="canceled_number"/>
-                    <field name="waiting_number"/>
-                    <field name="invoiced_number"/>
-                    <field name="paid_number"/>
-                    <field name="year"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_report_partner_member_year_new_tree2">
-            <field name="name">report.partner_member.year_new.tree</field>
-            <field name="model">report.partner_member.year_new</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="New Membership by Years">
-                    <field name="canceled_amount"/>
-                    <field name="waiting_amount"/>
-                    <field name="invoiced_amount"/>
-                    <field name="paid_amount"/>
-                    <field name="currency"/>
-                    <field name="year"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_report_partner_member_year_new_graph1">
-            <field name="name">report.partner_member.year_new.graph1</field>
-            <field name="model">report.partner_member.year_new</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="New Membership by Years" type="bar">
-                    <field name="year"/>
-                    <field name="canceled_number"/>
-                    <field name="waiting_number"/>
-                    <field name="invoiced_number"/>
-                    <field name="paid_number"/>
-                </graph>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_report_partner_member_year_new_graph2">
-            <field name="name">report.partner_member.year_new.graph2</field>
-            <field name="model">report.partner_member.year_new</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="New Membership by Years" type="bar">
-                    <field name="year"/>
-                    <field name="canceled_amount"/>
-                    <field name="waiting_amount"/>
-                    <field name="invoiced_amount"/>
-                    <field name="paid_amount"/>
-                </graph>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_report_partner_member_year_new_tree">
-            <field name="res_model">report.partner_member.year_new</field>
-            <field name="view_type">form</field>
-        </record>
-
-        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_new_tree_view4">
-            <field name="sequence" eval="4"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_report_partner_member_year_new_tree2"/>
-            <field name="act_window_id" ref="action_report_partner_member_year_new_tree"/>
-        </record>
-
-        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_new_tree_view1">
-            <field name="sequence" eval="3"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_report_partner_member_year_new_tree1"/>
-            <field name="act_window_id" ref="action_report_partner_member_year_new_tree"/>
-        </record>
-
-        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_new_tree_view2">
-            <field name="sequence" eval="1"/>
-            <field name="view_mode">graph</field>
-            <field name="view_id" ref="view_report_partner_member_year_new_graph1"/>
-            <field name="act_window_id" ref="action_report_partner_member_year_new_tree"/>
-        </record>
-
-        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_new_tree_view3">
-            <field name="sequence" eval="2"/>
-            <field name="view_mode">graph</field>
-            <field name="view_id" ref="view_report_partner_member_year_new_graph2"/>
-            <field name="act_window_id" ref="action_report_partner_member_year_new_tree"/>
-        </record>
-
-        <menuitem name="New Membership by Years" parent="menu_reporting"
-            action="action_report_partner_member_year_new_tree"
-            id="menu_report_partner_member_year_new"/>
 
 <!-- View for product.product object inherited from product module................ -->
         <record model="ir.ui.view" id="view_product_form_inherit1">
diff --git a/addons/membership/process/membership_process.xml b/addons/membership/process/membership_process.xml
old mode 100644
new mode 100755
diff --git a/addons/membership/report/__init__.py b/addons/membership/report/__init__.py
new file mode 100755
index 00000000000..dd247c52f3a
--- /dev/null
+++ b/addons/membership/report/__init__.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import report_membership
diff --git a/addons/membership/report/report_membership.py b/addons/membership/report/report_membership.py
new file mode 100755
index 00000000000..50273fbace4
--- /dev/null
+++ b/addons/membership/report/report_membership.py
@@ -0,0 +1,175 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import fields, osv
+import tools
+
+
+class ReportPartnerMemberYear(osv.osv):
+    '''Membership by Years'''
+
+    _name = 'report.partner_member.year'
+    _description = __doc__
+    _auto = False
+    _rec_name = 'year'
+    _columns = {
+        'year': fields.char('Year', size='4', readonly=True, select=1),
+        'canceled_number': fields.integer('Canceled', readonly=True),
+        'waiting_number': fields.integer('Waiting', readonly=True),
+        'invoiced_number': fields.integer('Invoiced', readonly=True),
+        'paid_number': fields.integer('Paid', readonly=True),
+        'canceled_amount': fields.float('Canceled', digits=(16, 2), readonly=True),
+        'waiting_amount': fields.float('Waiting', digits=(16, 2), readonly=True),
+        'invoiced_amount': fields.float('Invoiced', digits=(16, 2), readonly=True),
+        'paid_amount': fields.float('Paid', digits=(16, 2), readonly=True),
+        'currency': fields.many2one('res.currency', 'Currency', readonly=True,
+            select=2),
+    }
+
+    def init(self, cr):
+        '''Create the view'''
+        cr.execute("""
+    CREATE OR REPLACE VIEW report_partner_member_year AS (
+        SELECT
+        MIN(id) AS id,
+        COUNT(ncanceled) as canceled_number,
+        COUNT(npaid) as paid_number,
+        COUNT(ninvoiced) as invoiced_number,
+        COUNT(nwaiting) as waiting_number,
+        SUM(acanceled) as canceled_amount,
+        SUM(apaid) as paid_amount,
+        SUM(ainvoiced) as invoiced_amount,
+        SUM(awaiting) as waiting_amount,
+        year,
+        currency
+        FROM (SELECT
+            CASE WHEN ai.state = 'cancel' THEN ml.id END AS ncanceled,
+            CASE WHEN ai.state = 'paid' THEN ml.id END AS npaid,
+            CASE WHEN ai.state = 'open' THEN ml.id END AS ninvoiced,
+            CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
+                THEN ml.id END AS nwaiting,
+            CASE WHEN ai.state = 'cancel'
+                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
+            ELSE 0 END AS acanceled,
+            CASE WHEN ai.state = 'paid'
+                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
+            ELSE 0 END AS apaid,
+            CASE WHEN ai.state = 'open'
+                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
+            ELSE 0 END AS ainvoiced,
+            CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
+                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
+            ELSE 0 END AS awaiting,
+            TO_CHAR(ml.date_from, 'YYYY') AS year,
+            ai.currency_id AS currency,
+            MIN(ml.id) AS id
+            FROM membership_membership_line ml
+            JOIN (account_invoice_line ail
+                LEFT JOIN account_invoice ai
+                ON (ail.invoice_id = ai.id))
+            ON (ml.account_invoice_line = ail.id)
+            JOIN res_partner p
+            ON (ml.partner = p.id)
+            GROUP BY TO_CHAR(ml.date_from, 'YYYY'), ai.state,
+            ai.currency_id, ml.id) AS foo
+        GROUP BY year, currency)
+                """)
+ReportPartnerMemberYear()
+
+class ReportPartnerMemberYearNew(osv.osv):
+    '''New Membership by Years'''
+
+    _name = 'report.partner_member.year_new'
+    _description = __doc__
+    _auto = False
+    _rec_name = 'year'
+    _columns = {
+        'year': fields.char('Year', size='4', readonly=True, select=1),
+        'canceled_number': fields.integer('Canceled', readonly=True),
+        'waiting_number': fields.integer('Waiting', readonly=True),
+        'invoiced_number': fields.integer('Invoiced', readonly=True),
+        'paid_number': fields.integer('Paid', readonly=True),
+        'canceled_amount': fields.float('Canceled', digits=(16, 2), readonly=True),
+        'waiting_amount': fields.float('Waiting', digits=(16, 2), readonly=True),
+        'invoiced_amount': fields.float('Invoiced', digits=(16, 2), readonly=True),
+        'paid_amount': fields.float('Paid', digits=(16, 2), readonly=True),
+        'currency': fields.many2one('res.currency', 'Currency', readonly=True,
+            select=2),
+    }
+
+    def init(self, cursor):
+        '''Create the view'''
+        cursor.execute("""
+        CREATE OR REPLACE VIEW report_partner_member_year_new AS (
+        SELECT
+        MIN(id) AS id,
+        COUNT(ncanceled) AS canceled_number,
+        COUNT(npaid) AS paid_number,
+        COUNT(ninvoiced) AS invoiced_number,
+        COUNT(nwaiting) AS waiting_number,
+        SUM(acanceled) AS canceled_amount,
+        SUM(apaid) AS paid_amount,
+        SUM(ainvoiced) AS invoiced_amount,
+        SUM(awaiting) AS waiting_amount,
+        year,
+        currency
+        FROM (SELECT
+            CASE WHEN ai.state = 'cancel' THEN ml2.id END AS ncanceled,
+            CASE WHEN ai.state = 'paid' THEN ml2.id END AS npaid,
+            CASE WHEN ai.state = 'open' THEN ml2.id END AS ninvoiced,
+            CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
+                THEN ml2.id END AS nwaiting,
+            CASE WHEN ai.state = 'cancel'
+                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
+            ELSE 0 END AS acanceled,
+            CASE WHEN ai.state = 'paid'
+                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
+            ELSE 0 END AS apaid,
+            CASE WHEN ai.state = 'open'
+                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
+            ELSE 0 END AS ainvoiced,
+            CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
+                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
+            ELSE 0 END AS awaiting,
+            TO_CHAR(ml2.date_from, 'YYYY') AS year,
+            ai.currency_id AS currency,
+            MIN(ml2.id) AS id
+            FROM (SELECT
+                    partner AS id,
+                    MIN(date_from) AS date_from
+                    FROM membership_membership_line
+                    GROUP BY partner
+                ) AS ml1
+                JOIN membership_membership_line ml2
+                JOIN (account_invoice_line ail
+                    LEFT JOIN account_invoice ai
+                    ON (ail.invoice_id = ai.id))
+                ON (ml2.account_invoice_line = ail.id)
+                ON (ml1.id = ml2.partner AND ml1.date_from = ml2.date_from)
+            JOIN res_partner p
+            ON (ml2.partner = p.id)
+            GROUP BY TO_CHAR(ml2.date_from, 'YYYY'), ai.state,
+            ai.currency_id, ml2.id) AS foo
+        GROUP BY year, currency
+        )
+    """)
+
+ReportPartnerMemberYearNew()
\ No newline at end of file
diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml
new file mode 100755
index 00000000000..6f15636847b
--- /dev/null
+++ b/addons/membership/report/report_membership_view.xml
@@ -0,0 +1,211 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <!-- REPORTING/MEMBERSHIP BY YEAR  -->
+
+
+        <record model="ir.ui.view" id="view_report_partner_member_year_tree1">
+            <field name="name">report.partner_member.year.tree</field>
+            <field name="model">report.partner_member.year</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Membership by Years">
+                    <field name="canceled_number"/>
+                    <field name="waiting_number"/>
+                    <field name="invoiced_number"/>
+                    <field name="paid_number"/>
+                    <field name="year"/>
+                </tree>
+            </field>
+        </record>
+
+
+        <record model="ir.ui.view" id="view_report_partner_member_year_tree2">
+            <field name="name">report.partner_member.year.tree</field>
+            <field name="model">report.partner_member.year</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Membership by Years">
+                    <field name="canceled_amount"/>
+                    <field name="waiting_amount"/>
+                    <field name="invoiced_amount"/>
+                    <field name="paid_amount"/>
+                    <field name="currency"/>
+                    <field name="year"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_report_partner_member_year_graph1">
+            <field name="name">report.partner_member.year.graph1</field>
+            <field name="model">report.partner_member.year</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Membership by Years" type="bar">
+                    <field name="year"/>
+                    <field name="canceled_number"/>
+                    <field name="waiting_number"/>
+                    <field name="invoiced_number"/>
+                    <field name="paid_number"/>
+                </graph>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_report_partner_member_year_graph2">
+            <field name="name">report.partner_member.year.graph2</field>
+            <field name="model">report.partner_member.year</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Membership by Years" type="bar">
+                    <field name="year"/>
+                    <field name="canceled_amount"/>
+                    <field name="waiting_amount"/>
+                    <field name="invoiced_amount"/>
+                    <field name="paid_amount"/>
+                </graph>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="action_report_partner_member_year_tree">
+            <field name="res_model">report.partner_member.year</field>
+            <field name="view_type">form</field>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_tree_view1">
+            <field name="sequence" eval="3"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_report_partner_member_year_tree1"/>
+            <field name="act_window_id" ref="action_report_partner_member_year_tree"/>
+        </record>
+
+
+        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_tree_view4">
+            <field name="sequence" eval="4"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_report_partner_member_year_tree2"/>
+            <field name="act_window_id" ref="action_report_partner_member_year_tree"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_tree_view2">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_report_partner_member_year_graph1"/>
+            <field name="act_window_id" ref="action_report_partner_member_year_tree"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_tree_view3">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_report_partner_member_year_graph2"/>
+            <field name="act_window_id" ref="action_report_partner_member_year_tree"/>
+        </record>
+
+        <menuitem name="Membership by Years" parent="menu_reporting"
+            action="action_report_partner_member_year_tree"
+            id="menu_report_partner_member_year"/>
+
+
+        <!-- REPORTING/NEW MEMBERSHIP BY YEAR  -->
+
+
+
+        <record model="ir.ui.view" id="view_report_partner_member_year_new_tree1">
+            <field name="name">report.partner_member.year_new.tree</field>
+            <field name="model">report.partner_member.year_new</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="New Membership by Years">
+                    <field name="canceled_number"/>
+                    <field name="waiting_number"/>
+                    <field name="invoiced_number"/>
+                    <field name="paid_number"/>
+                    <field name="year"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_report_partner_member_year_new_tree2">
+            <field name="name">report.partner_member.year_new.tree</field>
+            <field name="model">report.partner_member.year_new</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="New Membership by Years">
+                    <field name="canceled_amount"/>
+                    <field name="waiting_amount"/>
+                    <field name="invoiced_amount"/>
+                    <field name="paid_amount"/>
+                    <field name="currency"/>
+                    <field name="year"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_report_partner_member_year_new_graph1">
+            <field name="name">report.partner_member.year_new.graph1</field>
+            <field name="model">report.partner_member.year_new</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="New Membership by Years" type="bar">
+                    <field name="year"/>
+                    <field name="canceled_number"/>
+                    <field name="waiting_number"/>
+                    <field name="invoiced_number"/>
+                    <field name="paid_number"/>
+                </graph>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_report_partner_member_year_new_graph2">
+            <field name="name">report.partner_member.year_new.graph2</field>
+            <field name="model">report.partner_member.year_new</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="New Membership by Years" type="bar">
+                    <field name="year"/>
+                    <field name="canceled_amount"/>
+                    <field name="waiting_amount"/>
+                    <field name="invoiced_amount"/>
+                    <field name="paid_amount"/>
+                </graph>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="action_report_partner_member_year_new_tree">
+            <field name="res_model">report.partner_member.year_new</field>
+            <field name="view_type">form</field>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_new_tree_view4">
+            <field name="sequence" eval="4"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_report_partner_member_year_new_tree2"/>
+            <field name="act_window_id" ref="action_report_partner_member_year_new_tree"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_new_tree_view1">
+            <field name="sequence" eval="3"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_report_partner_member_year_new_tree1"/>
+            <field name="act_window_id" ref="action_report_partner_member_year_new_tree"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_new_tree_view2">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_report_partner_member_year_new_graph1"/>
+            <field name="act_window_id" ref="action_report_partner_member_year_new_tree"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_new_tree_view3">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_report_partner_member_year_new_graph2"/>
+            <field name="act_window_id" ref="action_report_partner_member_year_new_tree"/>
+        </record>
+
+        <menuitem name="New Membership by Years" parent="menu_reporting"
+            action="action_report_partner_member_year_new_tree"
+            id="menu_report_partner_member_year_new"/>
+
+    </data>
+</openerp>            
\ No newline at end of file
diff --git a/addons/membership/security/ir.model.access.csv b/addons/membership/security/ir.model.access.csv
old mode 100644
new mode 100755
diff --git a/addons/membership/wizard/__init__.py b/addons/membership/wizard/__init__.py
old mode 100644
new mode 100755
diff --git a/addons/membership/wizard/membership_invoice.py b/addons/membership/wizard/membership_invoice.py
old mode 100644
new mode 100755
diff --git a/addons/membership/wizard/membership_invoice_view.xml b/addons/membership/wizard/membership_invoice_view.xml
old mode 100644
new mode 100755
diff --git a/addons/membership/wizard/membership_unpaid_invoice.py b/addons/membership/wizard/membership_unpaid_invoice.py
old mode 100644
new mode 100755
diff --git a/addons/membership/wizard/membership_unpaid_invoice_view.xml b/addons/membership/wizard/membership_unpaid_invoice_view.xml
old mode 100644
new mode 100755

From 704d545952c36ae9823b6f0f32e59be11c93799c Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Mon, 7 Jun 2010 12:13:12 +0530
Subject: [PATCH 030/121] [IMP]: event: use inherit in place of
 inherits.Improve report using report guidlines.

bzr revid: atp@tinyerp.co.in-20100607064312-3cl1vc0gfal7wvhe
---
 addons/event/__init__.py                      |   2 +
 addons/event/__openerp__.py                   |   3 +-
 addons/event/event.py                         | 230 +++++++------
 addons/event/event_data.xml                   |   0
 addons/event/event_demo.xml                   |   0
 addons/event/event_sequence.xml               |   0
 addons/event/event_view.xml                   | 307 ++++++++----------
 addons/event/i18n/ar.po                       |   0
 addons/event/i18n/bg.po                       |   0
 addons/event/i18n/bs.po                       |   0
 addons/event/i18n/ca.po                       |   0
 addons/event/i18n/cs.po                       |   0
 addons/event/i18n/de.po                       |   0
 addons/event/i18n/es.po                       |   0
 addons/event/i18n/es_AR.po                    |   0
 addons/event/i18n/et.po                       |   0
 addons/event/i18n/event.pot                   |   0
 addons/event/i18n/fi.po                       |   0
 addons/event/i18n/fr.po                       |   0
 addons/event/i18n/hi.po                       |   0
 addons/event/i18n/hr.po                       |   0
 addons/event/i18n/hu.po                       |   0
 addons/event/i18n/id.po                       |   0
 addons/event/i18n/it.po                       |   0
 addons/event/i18n/ko.po                       |   0
 addons/event/i18n/lt.po                       |   0
 addons/event/i18n/nl.po                       |   0
 addons/event/i18n/nl_BE.po                    |   0
 addons/event/i18n/pl.po                       |   0
 addons/event/i18n/pt.po                       |   0
 addons/event/i18n/pt_BR.po                    |   0
 addons/event/i18n/ro.po                       |   0
 addons/event/i18n/ru.po                       |   0
 addons/event/i18n/sk.po                       |   0
 addons/event/i18n/sl.po                       |   0
 addons/event/i18n/sq.po                       |   0
 addons/event/i18n/sv.po                       |   0
 addons/event/i18n/tlh.po                      |   0
 addons/event/i18n/tr.po                       |   0
 addons/event/i18n/uk.po                       |   0
 addons/event/i18n/vi.po                       |   0
 addons/event/i18n/zh_CN.po                    |   0
 addons/event/i18n/zh_TW.po                    |   0
 addons/event/report/__init__.py               |  24 ++
 .../report_event__registration_view.xml       | 116 +++++++
 .../event/report/report_event_registration.py |  83 +++++
 addons/event/security/event_security.xml      |   0
 addons/event/security/ir.model.access.csv     |   1 -
 addons/event/wizard/__init__.py               |   0
 .../wizard/event_confirm_registration.py      |   0
 .../event_confirm_registration_view.xml       |   2 +-
 addons/event/wizard/event_make_invoice.py     |  64 ++--
 .../event/wizard/event_make_invoice_view.xml  |   0
 addons/event/wizard/event_registration.py     |  12 +-
 .../event/wizard/event_registration_view.xml  |   9 +-
 .../wizard/event_registrations_partner.py     |   9 +
 .../wizard/event_registrations_partner.xml    |   7 +-
 57 files changed, 565 insertions(+), 304 deletions(-)
 mode change 100644 => 100755 addons/event/__init__.py
 mode change 100644 => 100755 addons/event/__openerp__.py
 mode change 100644 => 100755 addons/event/event.py
 mode change 100644 => 100755 addons/event/event_data.xml
 mode change 100644 => 100755 addons/event/event_demo.xml
 mode change 100644 => 100755 addons/event/event_sequence.xml
 mode change 100644 => 100755 addons/event/event_view.xml
 mode change 100644 => 100755 addons/event/i18n/ar.po
 mode change 100644 => 100755 addons/event/i18n/bg.po
 mode change 100644 => 100755 addons/event/i18n/bs.po
 mode change 100644 => 100755 addons/event/i18n/ca.po
 mode change 100644 => 100755 addons/event/i18n/cs.po
 mode change 100644 => 100755 addons/event/i18n/de.po
 mode change 100644 => 100755 addons/event/i18n/es.po
 mode change 100644 => 100755 addons/event/i18n/es_AR.po
 mode change 100644 => 100755 addons/event/i18n/et.po
 mode change 100644 => 100755 addons/event/i18n/event.pot
 mode change 100644 => 100755 addons/event/i18n/fi.po
 mode change 100644 => 100755 addons/event/i18n/fr.po
 mode change 100644 => 100755 addons/event/i18n/hi.po
 mode change 100644 => 100755 addons/event/i18n/hr.po
 mode change 100644 => 100755 addons/event/i18n/hu.po
 mode change 100644 => 100755 addons/event/i18n/id.po
 mode change 100644 => 100755 addons/event/i18n/it.po
 mode change 100644 => 100755 addons/event/i18n/ko.po
 mode change 100644 => 100755 addons/event/i18n/lt.po
 mode change 100644 => 100755 addons/event/i18n/nl.po
 mode change 100644 => 100755 addons/event/i18n/nl_BE.po
 mode change 100644 => 100755 addons/event/i18n/pl.po
 mode change 100644 => 100755 addons/event/i18n/pt.po
 mode change 100644 => 100755 addons/event/i18n/pt_BR.po
 mode change 100644 => 100755 addons/event/i18n/ro.po
 mode change 100644 => 100755 addons/event/i18n/ru.po
 mode change 100644 => 100755 addons/event/i18n/sk.po
 mode change 100644 => 100755 addons/event/i18n/sl.po
 mode change 100644 => 100755 addons/event/i18n/sq.po
 mode change 100644 => 100755 addons/event/i18n/sv.po
 mode change 100644 => 100755 addons/event/i18n/tlh.po
 mode change 100644 => 100755 addons/event/i18n/tr.po
 mode change 100644 => 100755 addons/event/i18n/uk.po
 mode change 100644 => 100755 addons/event/i18n/vi.po
 mode change 100644 => 100755 addons/event/i18n/zh_CN.po
 mode change 100644 => 100755 addons/event/i18n/zh_TW.po
 create mode 100755 addons/event/report/__init__.py
 create mode 100755 addons/event/report/report_event__registration_view.xml
 create mode 100755 addons/event/report/report_event_registration.py
 mode change 100644 => 100755 addons/event/security/event_security.xml
 mode change 100644 => 100755 addons/event/security/ir.model.access.csv
 mode change 100644 => 100755 addons/event/wizard/__init__.py
 mode change 100644 => 100755 addons/event/wizard/event_confirm_registration.py
 mode change 100644 => 100755 addons/event/wizard/event_confirm_registration_view.xml
 mode change 100644 => 100755 addons/event/wizard/event_make_invoice.py
 mode change 100644 => 100755 addons/event/wizard/event_make_invoice_view.xml
 mode change 100644 => 100755 addons/event/wizard/event_registration.py
 mode change 100644 => 100755 addons/event/wizard/event_registration_view.xml
 mode change 100644 => 100755 addons/event/wizard/event_registrations_partner.py
 mode change 100644 => 100755 addons/event/wizard/event_registrations_partner.xml

diff --git a/addons/event/__init__.py b/addons/event/__init__.py
old mode 100644
new mode 100755
index 55915834aa9..7bfc93318eb
--- a/addons/event/__init__.py
+++ b/addons/event/__init__.py
@@ -21,5 +21,7 @@
 
 import event
 import wizard
+import report
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
old mode 100644
new mode 100755
index 3e76b9d19a2..3d6267d20a8
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -34,7 +34,7 @@
     Note that:
     - You can define new types of events in
                 Events / Configuration / Types of Events
-    - You can access predefined reports about number of registration per event or per event category in :
+    - You can access predefined reports about number of registration per event or per event category in:
                 Events / Reporting
 """,
     'author': 'Tiny',
@@ -43,6 +43,7 @@
     'update_xml': [
         'wizard/event_confirm_registration_view.xml',
         'event_view.xml',
+        'report/report_event__registration_view.xml',
         'event_sequence.xml',
         'security/event_security.xml',
         'security/ir.model.access.csv',
diff --git a/addons/event/event.py b/addons/event/event.py
old mode 100644
new mode 100755
index 1985cf9cc7d..73cab202df6
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -19,30 +19,47 @@
 #
 ##############################################################################
 
+from crm import crm
 from osv import fields, osv
-import time
+from tools.translate import _
 import netsvc
 import pooler
+import time
 import tools
-from tools.translate import _
-from crm import crm
 
 
 class event_type(osv.osv):
+    
+    """ Event Type """
+    
     _name = 'event.type'
-    _description= 'Event type'
+    _description = __doc__
     _columns = {
         'name': fields.char('Event type', size=64, required=True), 
     }
+    
 event_type()
 
 class event(osv.osv):
+    
+    """Event"""
+    
     _name = 'event.event'
-    _description = 'Event'
-    _inherits = {'crm.case.section': 'section_id'}
+    _description = __doc__
+    _inherit = 'crm.case.section'
     _order = 'date_begin'
 
     def copy(self, cr, uid, id, default=None, context=None):
+        
+        """
+        Copy record of Given id
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param id: Id of Event Registration type record.
+        @param context: A standard dictionary for contextual values
+        """
+        
         return super(event, self).copy(cr, uid, id, default={'code': self.pool.get('ir.sequence').get(cr, uid, 'event.event'), 'state': 'draft'})
 
     def button_draft(self, cr, uid, ids, context={}):
@@ -55,16 +72,32 @@ class event(osv.osv):
         return self.write(cr, uid, ids, {'state': 'done'})
 
     def button_confirm(self, cr, uid, ids, context={}):
+        
         for eve in self.browse(cr, uid, ids):
             if eve.mail_auto_confirm:
                 #send reminder that will confirm the event for all the people that were already confirmed
-                reg_ids = self.pool.get('event.registration').search(cr, uid, [('event_id', '=', eve.id), ('state', 'not in', ['draft', 'cancel'])])
+                reg_ids = self.pool.get('event.registration').search(cr, uid, 
+                                                                     [('event_id', '=', eve.id), 
+                                                                      ('state', 'not in', ['draft', 'cancel'])])
                 if reg_ids:
                     self.pool.get('event.registration').mail_user_confirm(cr, uid, reg_ids)
+                    
         return self.write(cr, uid, ids, {'state': 'confirm'})
 
     def _get_register(self, cr, uid, ids, name, args, context=None):
-        res={}
+        
+        """
+        Get Confirm or uncofirm register value. 
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Event registration type's id
+        @param name: List of function fields(register_current and register_prospect).
+        @param context: A standard dictionary for contextual values
+        @return: Dictionary of function fields value. 
+        """
+        
+        res = {}
         for event in self.browse(cr, uid, ids, context):
             res[event.id] = {}
             state = 'draft'
@@ -74,22 +107,35 @@ class event(osv.osv):
                         from event_registration r 
                         where state=%s and event_id=%s"""
 
-            cr.execute(query, (state, event.id, ))
+            cr.execute(query, (state, event.id,))
             res2 = cr.fetchone()
+            
             if res2 and res2[0]:
                 res[event.id][name[0]] = res2[0]
             else:
                 res[event.id][name[0]] = 0
+               
         return res
 
     def write(self, cr, uid, ids, vals, *args, **kwargs):
+        """
+        Writes values in one or several fields.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Event registration type's IDs
+        @param vals: dictionary with values to update.
+        @return: True
+        """
+        
         res = super(event, self).write(cr, uid, ids, vals, *args, **kwargs)
         if 'date_begin' in vals and vals['date_begin']:
             for eve in self.browse(cr, uid, ids):
                 #change the deadlines of the registration linked to this event
-                reg_ids = self.pool.get('event.registration').search(cr, uid, [('event_id', '=', eve.id)])
+                reg_ids = self.pool.get('event.registration').search(cr, uid, 
+                                                                     [('event_id', '=', eve.id)])
                 if reg_ids:
-                    self.pool.get('event.registration').write(cr, uid, reg_ids, {'date_deadline': vals['date_begin']})
+                    self.pool.get('event.registration').write(cr, uid, reg_ids, 
+                                                              {'date_deadline': vals['date_begin']})
 
         #change the description of the registration linked to this event
         if 'mail_auto_confirm' in vals:
@@ -98,17 +144,18 @@ class event(osv.osv):
                     for eve in self.browse(cr, uid, ids):
                         vals['mail_confirm'] = eve.mail_confirm
             else:
-                vals['mail_confirm']=False
+                vals['mail_confirm'] = False
         if 'mail_confirm' in vals:
             for eve in self.browse(cr, uid, ids):
-                reg_ids = self.pool.get('event.registration').search(cr, uid, [('event_id', '=', eve.id)])
+                reg_ids = self.pool.get('event.registration').search(cr, uid, 
+                                                                     [('event_id', '=', eve.id)])
                 if reg_ids:
-                    self.pool.get('event.registration').write(cr, uid, reg_ids, {'description': vals['mail_confirm']})
+                    self.pool.get('event.registration').write(cr, uid, reg_ids, 
+                                                              {'description': vals['mail_confirm']})
         return res
 
     _columns = {
         'type': fields.many2one('event.type', 'Type'), 
-        'section_id': fields.many2one('crm.case.section', 'Case section', required=True), 
         'register_max': fields.integer('Maximum Registrations'), 
         'register_min': fields.integer('Minimum Registrations'), 
         'register_current': fields.function(_get_register, method=True, string='Confirmed Registrations', multi='register_current'), 
@@ -134,8 +181,20 @@ class event(osv.osv):
 event()
 
 class event_registration(osv.osv):
+    
+    """Event Registration"""
 
     def check_confirm(self, cr, uid, ids, context):
+        
+        """
+        Check confirm event register on given id.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Event registration's IDs
+        @param context: A standard dictionary for contextual values
+        @return: Dictionary value which open Confirm registration form.
+        """
+        
         mod_obj = self.pool.get('ir.model.data')
         current_registration = self.browse(cr, uid, [ids[0]])[0]
         total_confirmed = current_registration.event_id.register_current + current_registration.nb_register
@@ -161,6 +220,16 @@ class event_registration(osv.osv):
             }
 
     def _history(self, cr, uid, ids, keyword, history=False, email=False, context={}):
+        
+        """
+        Create value in mailgateway.message model.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Event registration's IDs
+        @param context: A standard dictionary for contextual values
+        @return: True
+        """
+        
         for case in self.browse(cr, uid, ids):
             data = {
                 'name': keyword, 
@@ -183,24 +252,43 @@ class event_registration(osv.osv):
         return True
 
     def create(self, cr, uid, *args, **argv):
+        """ Overrides orm create method.
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param *args: Fields value
+        @return : New created record Id.
+        """
+
         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, [res], 'Created', history=True)
+        
         return res
 
     def write(self, cr, uid, *args, **argv):
+    
         if 'event_id' in args[1]:
             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):
-        reg_ids = self.browse(cr,uid,ids)
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Event Registration's Id.
+        @return : False
+        """
+       
+        reg_ids = self.browse(cr, uid, ids)
         for reg_id in reg_ids:
             src = reg_id.event_id.reply_to or False
             dest = []
@@ -215,7 +303,15 @@ class event_registration(osv.osv):
         return False
 
     def mail_user(self, cr, uid, ids):
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Event Registration's Id.
+        @return : False
+        """
         reg_ids = self.browse(cr, uid, ids)
+        
         for reg_id in reg_ids:
             src = reg_id.event_id.reply_to or False
             dest = []
@@ -234,16 +330,26 @@ class event_registration(osv.osv):
         return False
 
     def _create_invoice_lines(self, cr, uid, ids, vals):
+        
+        """ Create account Invoice line for Registration Id.
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param Ids: List of event registration's Id
+        @param vals: Create fields value
+        @return : New created record Id.
+        """
+        
         return self.pool.get('account.invoice.line').create(cr, uid, vals)
 
     _name= 'event.registration'
-    _description = 'Event Registration'
+    _description = __doc__
     _inherit = 'crm.meeting'
 
     _columns = {
         'email_cc': fields.text('Watchers Emails', size=252 , help="These \
 people will receive a copy of the future communication between partner \
-and users by email"),
+and users by email"), 
         'nb_register': fields.integer('Number of Registration', readonly=True, states={'draft': [('readonly', False)]}), 
         'event_id': fields.many2one('event.event', 'Event Related', required=True), 
         "partner_invoice_id": fields.many2one('res.partner', 'Partner Invoiced'), 
@@ -272,6 +378,7 @@ and users by email"),
     }
 
     def onchange_badge_name(self, cr, uid, ids, badge_name):
+        
         data ={}
         if not badge_name:
             return data
@@ -279,9 +386,11 @@ and users by email"),
         return {'value': data}
 
     def onchange_contact_id(self, cr, uid, ids, contact, partner):
+        
         data ={}
         if not contact:
             return data
+        
         contact_id = self.pool.get('res.partner.contact').browse(cr, uid, contact)
         data['badge_name'] = contact_id.name
         data['badge_title'] = contact_id.title
@@ -298,20 +407,23 @@ and users by email"),
     def onchange_event(self, cr, uid, ids, event_id, partner_invoice_id):
         context={}
         if not event_id:
-            return {'value': {'unit_price': False , 'invoice_label': False }}
+            return {'value': {'unit_price': False, 'invoice_label': False}}
         data_event =  self.pool.get('event.event').browse(cr, uid, event_id)
+        
         if data_event.product_id:
             if not partner_invoice_id:
                 unit_price=self.pool.get('product.product').price_get(cr, uid, [data_event.product_id.id], context=context)[data_event.product_id.id]
-                return {'value': {'unit_price': unit_price , 'invoice_label': data_event.product_id.name}}
+                return {'value': {'unit_price': unit_price, 'invoice_label': data_event.product_id.name}}
             data_partner = self.pool.get('res.partner').browse(cr, uid, partner_invoice_id)
             context.update({'partner_id': data_partner})
             unit_price = self.pool.get('product.product')._product_price(cr, uid, [data_event.product_id.id], False, False, {'pricelist': data_partner.property_product_pricelist.id})[data_event.product_id.id]
-            return {'value': {'unit_price': unit_price , 'invoice_label': data_event.product_id.name}}
+            return {'value': {'unit_price': unit_price, 'invoice_label': data_event.product_id.name}}
+        
         return {'value': {'unit_price': False, 'invoice_label': False}}
 
 
     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:
@@ -334,6 +446,7 @@ and users by email"),
         return {'value': data}
 
     def onchange_partner_invoice_id(self, cr, uid, ids, event_id, partner_invoice_id):
+        
         data={}
         context={}
         data['unit_price']=False
@@ -351,80 +464,9 @@ and users by email"),
             return {'value': data}
         return {'value': data}
 
-    def onchange_categ_id(self, cr, uid, ids, categ, context={}):
-        if not categ:
-            return {'value': {}}
-        cat = self.pool.get('crm.case.categ').browse(cr, uid, categ, context).probability
-        return {'value': {'probability': cat}}
 
 event_registration()
 
 
-
-class report_event_registration(osv.osv):
-    _name = "report.event.registration"
-    _description = "Events on registrations"
-    _auto = False
-    _columns = {
-        'name': fields.char('Event', size=20), 
-        'date_begin': fields.datetime('Beginning date', required=True), 
-        'date_end': fields.datetime('Ending date', required=True), 
-        'draft_state': fields.integer('Draft Registration', size=20), 
-        'confirm_state': fields.integer('Confirm Registration', size=20), 
-        'register_max': fields.integer('Maximum Registrations'), 
-    }
-    def init(self, cr):
-        cr.execute("""
-            create or replace view report_event_registration as (
-                select
-                e.id as id,
-                c.name as name,
-                e.date_begin as date_begin,
-                e.date_end as date_end,
-                (SELECT sum(c.nb_register) FROM event_registration  c  WHERE c.section_id=e.section_id and state in ('draft')) as draft_state,
-                (SELECT sum(c.nb_register) FROM event_registration  c  WHERE c.section_id=e.section_id and state in ('open')) as confirm_state,
-                e.register_max as register_max
-                from
-                event_event e,crm_case_section c
-                where
-                e.section_id=c.id
-                )""")
-
-report_event_registration()
-
-class report_event_type_registration(osv.osv):
-    _name = "report.event.type.registration"
-    _description = "Event type on registration"
-    _auto = False
-    _columns = {
-        'name': fields.char('Event Type', size=20), 
-        'nbevent': fields.integer('Number Of Events'), 
-        'draft_state': fields.integer('Draft Registrations', size=20), 
-        'confirm_state': fields.integer('Confirm Registrations', size=20), 
-        }
-        
-        
-    def init(self, cr):
-        cr.execute("""
-            create or replace view report_event_type_registration as (
-                select
-                count(t.id) as id,
-                t.name as name,
-                (select sum(c.nb_register) from event_registration c, event_event e  where c.section_id=e.section_id and c.state='draft' and e.type=t.id ) as draft_state ,
-                (select sum(c.nb_register) from event_registration c, event_event e  where c.section_id=e.section_id and c.state='open' and e.type=t.id ) as  confirm_state,
-                count(t.id) as nbevent
-                from
-                    event_event e
-                inner join
-                    crm_case_section c1 on (e.section_id=c1.id)
-                inner join
-                    event_type t on (e.type=t.id)
-                group by
-                    t.name,t.id
-
-            )""")
-report_event_type_registration()
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/event/event_data.xml b/addons/event/event_data.xml
old mode 100644
new mode 100755
diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml
old mode 100644
new mode 100755
diff --git a/addons/event/event_sequence.xml b/addons/event/event_sequence.xml
old mode 100644
new mode 100755
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
old mode 100644
new mode 100755
index 8bc1712dbf9..2f8de515a55
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -80,17 +80,23 @@
                            <button string="Set To Draft" name="button_draft" states="confirm,cancel,done" type="object" icon="gtk-convert"/>
                         </group>
                     </page>
-                    <page string="Mailing">
+                   <page string="Mailing">
                         <field name="reply_to"/>
-                        <separator string="Auto Registration Email" colspan="4"/>
-                        <field name="mail_auto_registr"/>
-                        <newline/>
-                        <field name="mail_registr" colspan="4"/>
-                        <separator string="Auto Confirmation Email" colspan="4"/>
-                        <field name="mail_auto_confirm"/>
-                        <newline/>
-                        <field name="mail_confirm" colspan="4"/>
                         <newline/>
+						<group col="3" colspan="2">
+                        	<separator string="Auto Registration Email" colspan="2"/>
+                            <newline/>
+                        	<field name="mail_auto_registr"/>
+                        	<separator string="Registration Email" colspan="2"/>
+                        	<field name="mail_registr" colspan="2" nolabel="1"/>
+                        </group>
+                        <group col="2" colspan="2">
+ 	                       <separator string="Auto Confirmation Email" colspan="2"/>
+                        	<field name="mail_auto_confirm"/>
+                        	<newline/>
+                        	<separator string="Confirmation Email" colspan="2"/>
+                        	<field name="mail_confirm" colspan="2" nolabel="1"/>
+                        </group>
                     </page>
                     <page string="Statistics">
                         <separator string="Registrations" colspan="4"/>
@@ -103,6 +109,7 @@
         </record>
 
         <!-- event.event tree view -->
+        
         <record model="ir.ui.view" id="view_event_tree">
             <field name="name">event.event.tree</field>
             <field name="model">event.event</field>
@@ -126,20 +133,34 @@
             <field name="arch" type="xml">
                 <search string="Events">
                     <group col="10" colspan="4">
-                        <separator orientation="vertical"/>
                         <filter icon="terp-calendar" string="Draft" domain="[('state','=','draft')]" help="Draft Events"/>
                         <filter icon="terp-calendar" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed Events"/>
                         <separator orientation="vertical"/>
                         <field name="name" string="Event" select="1"/>
-                        <field name="user_id" select="1"/>
+                        <field name="user_id" widget="selection">
+                        	   <filter icon="terp-partner"
+                            		string="My Events"
+                            		help="My Events"
+                            		domain="[('user_id','=',uid)]"/>
+                        </field>    		
                         <field name="date_begin" select="1"/>
                         <field name="state" select="1"/>
                     </group>
+                    <newline/>
+                    <group expand="1" string="Group By..." colspan="4" col="12">
+					    <filter string="Responsible" name="user" icon="terp-partner" context="{'group_by': 'user_id'}"/>
+						<filter string="Event Type" icon="terp-crm"  context="{'group_by':'type'}"/>
+						<filter string="state" icon="terp-crm" context="{'group_by':'state'}"/>
+						<separator orientation="vertical"/>
+                    	<filter string="Creation" icon="terp-project"
+                        	domain="[]" context="{'group_by':'date_begin'}" />
+					</group>
                 </search>
             </field>
         </record>
 
     <!-- Events Organisation/CONFIGURATION/EVENTS  -->
+    
        <record model="ir.actions.act_window" id="action_event_view">
            <field name="name">Events</field>
            <field name="type">ir.actions.act_window</field>
@@ -155,6 +176,7 @@
     <!-- EVENTS/REGISTRATIONS/EVENTS  -->
 
         <!-- Registration view (form) by _inherits  .................. -->
+        
         <record model="ir.ui.view" id="event_registration_tree">
             <field name="name">event.registration.tree</field>
             <field name="model">event.registration</field>
@@ -189,108 +211,119 @@
                         <field name="unit_price"/>
                     </group>
                     <notebook colspan="4">
-                    <page string="General">
-                        <field name="contact_id" on_change="onchange_contact_id(contact_id, partner_id)" /><newline/>
-                        <field name="email_from"/>
-                        <button name="remind_partner" string="Send Reminder" states="open,pending" type="object" colspan="2" icon="gtk-go-forward"/>
-                        <newline/>
-                        <separator string="Badge" colspan="4"/>
-                        <field name="badge_title"/>
-                        <field name="badge_name" on_change="onchange_badge_name(badge_name)"/>
-                        <field name="badge_partner"/>
-                        <newline/>
-                        <separator string="Status" colspan="4"/>
-                        <group col="8" colspan="4">
-                            <field name="state" select="1" colspan="2"/>
-                            <button name="button_reg_close" string="Registration Invoiced" states="open" type="object" icon="gtk-print"/>
-                            <button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                            <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
-                        </group>
-                    </page>
-                    <page string="Extra Info">
-                        <field name="name" select="1" colspan="4"/>
-                        <field name="id" select="1"/>
-                        <field name="active"/>
-                        <field name="email_cc" colspan="4"/>
-                        <field name="categ_id" on_change="onchange_categ_id(categ_id)"/>
-                        <separator colspan="4" string="Dates"/>
-                        <field name="create_date"/>
-                        <field name="date_closed"/>
-                        <separator colspan="4" string="References"/>
-                        <field name="ref" colspan="4"/>
-                        <field name="ref2" colspan="4"/>
-                    </page>
-                    <page string="History">
-                        <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
-	                        <form string="Communication history">
-                                    <group col="6" colspan="4">
-                                        <field name="date"/>
-                                        <field name="email_to"/>
-                                        <field name="email_from"/>
-                                    </group>
-                                    <notebook colspan="4">
-                                        <page string="Details">
-                                            <field name="description" colspan="4" nolabel="1"/>
-                                        </page>
-                                        <page string="Attachments">
-                                            <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
-                                        </page>
-                                    </notebook>
-                                    <button colspan="4"
-                                    string="Reply to Last Email"
-                                    name="%(crm.action_crm_send_mail)d"
-                                    context="{'mail':'reply', 'model': 'event.registration'}"
-                                    icon="gtk-undo" type="action" />
-                                </form>
-                                <tree string="Communication history">
-                                    <field name="date"/>
-                                    <field name="email_from" />
-                                    <field name="email_to"/>
-                                    <field name="description"/>
-                                </tree>
-                            </field>
-                        <field name="log_ids" nolabel="1" colspan="4" mode="tree,form" readonly="1">
-                            <tree string="Actions">
-                                <separator string="Action Information" colspan="4"/>
-                                <field name="name"/>
-                                <field name="date"/>
-                                <field name="user_id"/>
-                            </tree>
-                            <form string="Actions">
-                                <separator string="Action Information" colspan="4"/>
-                                <field name="name" colspan="4"/>
-                                <field name="date"/>
-                                <field name="user_id"/>
-                            </form>
-                        </field>
-                    </page>
-                    <page string="Payments">
-                        <field name="invoice_label" select="1"/>
-                        <field name="tobe_invoiced" select="1"/>
-                        <field name="invoice_id"/>
-                    </page>
+	                    <page string="General">
+	                        <field name="contact_id" on_change="onchange_contact_id(contact_id, partner_id)" /><newline/>
+	                        <field name="email_from"/>
+	                        <button name="remind_partner" string="Send Reminder" states="open,pending" type="object" colspan="2" icon="gtk-go-forward"/>
+	                        <newline/>
+	                        <separator string="Badge" colspan="4"/>
+	                        <field name="badge_title"/>
+	                        <field name="badge_name" on_change="onchange_badge_name(badge_name)"/>
+	                        <field name="badge_partner"/>
+	                        <newline/>
+	                        <separator string="Status" colspan="4"/>
+	                        <group col="8" colspan="4">
+	                            <field name="state" select="1" colspan="2"/>
+	                            <button name="button_reg_close" string="Registration Invoiced" states="open" type="object" icon="gtk-print"/>
+	                            <button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+	                            <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+	                        </group>
+	                    </page>
+	                    <page string="Payments">
+	                        <field name="invoice_label" select="1"/>
+	                        <field name="tobe_invoiced" select="1"/>
+	                        <field name="invoice_id"/>
+	                    </page>
+	                    <page string="History">
+	                        <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
+		                        <form string="Communication history">
+	                                    <group col="6" colspan="4">
+	                                        <field name="date"/>
+	                                        <field name="email_to"/>
+	                                        <field name="email_from"/>
+	                                    </group>
+	                                    <notebook colspan="4">
+	                                        <page string="Details">
+	                                            <field name="description" colspan="4" nolabel="1"/>
+	                                        </page>
+	                                        <page string="Attachments">
+	                                            <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
+	                                        </page>
+	                                    </notebook>
+	                                    <button colspan="4"
+	                                    string="Reply to Last Email"
+	                                    name="%(crm.action_crm_send_mail)d"
+	                                    context="{'mail':'reply', 'model': 'event.registration'}"
+	                                    icon="gtk-undo" type="action" />
+	                                </form>
+	                                <tree string="Communication history">
+	                                    <field name="date"/>
+	                                    <field name="email_from" />
+	                                    <field name="email_to"/>
+	                                    <field name="description"/>
+	                                </tree>
+	                            </field>
+	                        <field name="log_ids" nolabel="1" colspan="4" mode="tree,form" readonly="1">
+	                            <tree string="Actions">
+	                                <separator string="Action Information" colspan="4"/>
+	                                <field name="name"/>
+	                                <field name="date"/>
+	                                <field name="user_id"/>
+	                            </tree>
+	                            <form string="Actions">
+	                                <separator string="Action Information" colspan="4"/>
+	                                <field name="name" colspan="4"/>
+	                                <field name="date"/>
+	                                <field name="user_id"/>
+	                            </form>
+	                        </field>
+	                    </page>
+	                    <page string="Extra Info">
+	                    	<group col="6" colspan="4">
+		                        <field name="name" select="1" colspan="6"/>
+		                        <newline/>
+		                        <field name="categ_id"/>
+		                        <field name="id" select="1"/>
+	    	                    <field name="active"/>
+	                        	<separator colspan="6" string="Watchers Emails" />
+	                        	<field name="email_cc" colspan="6" nolabel="1"/>
+	                        </group>
+	                        <separator colspan="4" string="Dates"/>
+	                        <field name="create_date"/>
+	                        <field name="date_closed"/>
+	                        <separator colspan="4" string="References"/>
+	                        <field name="ref" colspan="4"/>
+	                        <field name="ref2" colspan="4"/>
+	                    </page>
                     </notebook>
                 </form>
             </field>
         </record>
 
+<!-- Search view of event registration form-->
+
         <record model="ir.ui.view" id="view_registration_search">
             <field name="name">Registrations</field>
             <field name="model">event.registration</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Event Registration">
-                    <group col="12" colspan="4">
-                        <separator orientation="vertical"/>
+                    <group col="8" colspan="4">
                         <filter icon="terp-calendar" string="Draft" domain="[('state','=','draft')]" help="Draft Registrations"/>
                         <filter icon="terp-calendar" string="Confirmed" domain="[('state','in',('open','done'))]" help="Confirmed Registrations"/>
                         <separator orientation="vertical"/>
-                        <field name="event_id" select="1"/>
-                        <field name="user_id" select="1"/>
-                        <field name="partner_id" select="1"/>
+                        <field name="event_id" widget="selection"/>
+                        <field name="user_id" widget="selection"/>
                         <field name="state" select="1"/>
-                        <field name="invoice_label" select="1"/>
                     </group>
+                    <newline/>    
+                    <group expand="1" string="Group By...">
+                        <filter string="Event" icon="terp-crm" domain="[]" context="{'group_by':'event_id'}"/> 
+	                    <filter string="State" icon="terp-crm" domain="[]" context="{'group_by':'state'}"/>
+	                    <separator orientation="vertical"/>
+						<filter string="Partner" icon="terp-crm" domain="[]" context="{'group_by':'partner_id'}"/>	                    
+	                    <filter string="Responsible" name="uid" icon="terp-partner" domain="[]" context="{'group_by':'user_id'}"/>
+                   </group>
                 </search>
             </field>
         </record>
@@ -308,86 +341,6 @@
             name="Registrations"
             id="menu_action_registration" parent="menu_event_main"
             action="action_registration"/>
-
-    <!-- report , event on registration... start -->
-        <record model="ir.ui.view" id="report_event_registration_tree">
-            <field name="name">report.event.registration.tree</field>
-            <field name="model">report.event.registration</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Event on Registration">
-                    <field name="name" select="1"/>
-                    <field name="date_begin" select="1"/>
-                    <field name="date_end"/>
-                    <field name="draft_state"/>
-                    <field name="confirm_state"/>
-                    <field name="register_max"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model ="ir.ui.view" id="report_event_registration_graph">
-            <field name="name">report.event.registration.graph</field>
-            <field name="model">report.event.registration</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Event on Registration" type="bar">
-                    <field name="name"/>
-                    <field name="draft_state" operator="+"/>
-                    <field name="confirm_state" operator="+"/>
-                    <field name="register_max" operator="+"/>
-                </graph>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_event_registration">
-            <field name="name">Events On Registrations</field>
-            <field name="res_model">report.event.registration</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
-        </record>
         <menuitem name="Reporting" id="menu_report_event" parent="menu_marketing_event_main" sequence="20"/>
-        <!--<menuitem parent="menu_report_event" action="action_event_registration" id="menu_report_event_registration"/>-->
-        <menuitem parent="menu_report_event" action="action_event_registration" id="menu_report_event_registration" />
-    <!-- end... -->
-
-
-    <!-- report , event  type on registration... start -->
-        <record model="ir.ui.view" id="report_event_type_registration_tree">
-            <field name="name">report.event.type.registration.tree</field>
-            <field name="model">report.event.type.registration</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Registration By Event Types">
-                    <field name="name" select="1"/>
-                    <field name="nbevent"/>
-                    <field name="draft_state"/>
-                    <field name="confirm_state"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="report_event_type_registration_graph">
-            <field name="name">report.event.type.registration.graph</field>
-            <field name="model">report.event.type.registration</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Registration By Event Types" type="bar">
-                    <field name="name"/>
-                    <field name="draft_state" operator="+"/>
-                    <field name="confirm_state" operator="+"/>
-                </graph>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_event_type_registration">
-            <field name="name">Registration By Event Types</field>
-            <field name="res_model">report.event.type.registration</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-        </record>
-            <menuitem parent="menu_report_event" action="action_event_type_registration" id="menu_report_event_type_registration"/>
-
-    <!-- end...  -->
     </data>
 </openerp>
diff --git a/addons/event/i18n/ar.po b/addons/event/i18n/ar.po
old mode 100644
new mode 100755
diff --git a/addons/event/i18n/bg.po b/addons/event/i18n/bg.po
old mode 100644
new mode 100755
diff --git a/addons/event/i18n/bs.po b/addons/event/i18n/bs.po
old mode 100644
new mode 100755
diff --git a/addons/event/i18n/ca.po b/addons/event/i18n/ca.po
old mode 100644
new mode 100755
diff --git a/addons/event/i18n/cs.po b/addons/event/i18n/cs.po
old mode 100644
new mode 100755
diff --git a/addons/event/i18n/de.po b/addons/event/i18n/de.po
old mode 100644
new mode 100755
diff --git a/addons/event/i18n/es.po b/addons/event/i18n/es.po
old mode 100644
new mode 100755
diff --git a/addons/event/i18n/es_AR.po b/addons/event/i18n/es_AR.po
old mode 100644
new mode 100755
diff --git a/addons/event/i18n/et.po b/addons/event/i18n/et.po
old mode 100644
new mode 100755
diff --git a/addons/event/i18n/event.pot b/addons/event/i18n/event.pot
old mode 100644
new mode 100755
diff --git a/addons/event/i18n/fi.po b/addons/event/i18n/fi.po
old mode 100644
new mode 100755
diff --git a/addons/event/i18n/fr.po b/addons/event/i18n/fr.po
old mode 100644
new mode 100755
diff --git a/addons/event/i18n/hi.po b/addons/event/i18n/hi.po
old mode 100644
new mode 100755
diff --git a/addons/event/i18n/hr.po b/addons/event/i18n/hr.po
old mode 100644
new mode 100755
diff --git a/addons/event/i18n/hu.po b/addons/event/i18n/hu.po
old mode 100644
new mode 100755
diff --git a/addons/event/i18n/id.po b/addons/event/i18n/id.po
old mode 100644
new mode 100755
diff --git a/addons/event/i18n/it.po b/addons/event/i18n/it.po
old mode 100644
new mode 100755
diff --git a/addons/event/i18n/ko.po b/addons/event/i18n/ko.po
old mode 100644
new mode 100755
diff --git a/addons/event/i18n/lt.po b/addons/event/i18n/lt.po
old mode 100644
new mode 100755
diff --git a/addons/event/i18n/nl.po b/addons/event/i18n/nl.po
old mode 100644
new mode 100755
diff --git a/addons/event/i18n/nl_BE.po b/addons/event/i18n/nl_BE.po
old mode 100644
new mode 100755
diff --git a/addons/event/i18n/pl.po b/addons/event/i18n/pl.po
old mode 100644
new mode 100755
diff --git a/addons/event/i18n/pt.po b/addons/event/i18n/pt.po
old mode 100644
new mode 100755
diff --git a/addons/event/i18n/pt_BR.po b/addons/event/i18n/pt_BR.po
old mode 100644
new mode 100755
diff --git a/addons/event/i18n/ro.po b/addons/event/i18n/ro.po
old mode 100644
new mode 100755
diff --git a/addons/event/i18n/ru.po b/addons/event/i18n/ru.po
old mode 100644
new mode 100755
diff --git a/addons/event/i18n/sk.po b/addons/event/i18n/sk.po
old mode 100644
new mode 100755
diff --git a/addons/event/i18n/sl.po b/addons/event/i18n/sl.po
old mode 100644
new mode 100755
diff --git a/addons/event/i18n/sq.po b/addons/event/i18n/sq.po
old mode 100644
new mode 100755
diff --git a/addons/event/i18n/sv.po b/addons/event/i18n/sv.po
old mode 100644
new mode 100755
diff --git a/addons/event/i18n/tlh.po b/addons/event/i18n/tlh.po
old mode 100644
new mode 100755
diff --git a/addons/event/i18n/tr.po b/addons/event/i18n/tr.po
old mode 100644
new mode 100755
diff --git a/addons/event/i18n/uk.po b/addons/event/i18n/uk.po
old mode 100644
new mode 100755
diff --git a/addons/event/i18n/vi.po b/addons/event/i18n/vi.po
old mode 100644
new mode 100755
diff --git a/addons/event/i18n/zh_CN.po b/addons/event/i18n/zh_CN.po
old mode 100644
new mode 100755
diff --git a/addons/event/i18n/zh_TW.po b/addons/event/i18n/zh_TW.po
old mode 100644
new mode 100755
diff --git a/addons/event/report/__init__.py b/addons/event/report/__init__.py
new file mode 100755
index 00000000000..1c60e2715df
--- /dev/null
+++ b/addons/event/report/__init__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import report_event_registration
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/event/report/report_event__registration_view.xml b/addons/event/report/report_event__registration_view.xml
new file mode 100755
index 00000000000..1f5dc0a5ec0
--- /dev/null
+++ b/addons/event/report/report_event__registration_view.xml
@@ -0,0 +1,116 @@
+<openerp>
+   <data>
+    <!-- report , event on registration... start -->
+        <record model="ir.ui.view" id="report_event_registration_tree">
+            <field name="name">report.event.registration.tree</field>
+            <field name="model">report.event.registration</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Event on Registration">
+                	<field name="date" invisible="1"/>
+                	<field name="user_id" invisible="1"/>
+                	<field name="year" invisible="1"/>
+                	<field name="day" invisible="1"/>
+                	<field name="month" invisible="1"/>
+                	<field name="event_id" invisible="1"/>
+                	<field name="state" invisible="1"/>
+                    <field name="type" invisible="1"/>
+                    <field name="nbevent"/>
+                    <field name="draft_state"/>
+                    <field name="confirm_state"/>
+                    <field name="register_max"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model ="ir.ui.view" id="report_event_registration_graph">
+            <field name="name">report.event.registration.graph</field>
+            <field name="model">report.event.registration</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph  string="Event on Registration" type="bar">
+                    <field name="type"/>
+                    <field name="draft_state" operator="+"/>
+                    <field name="confirm_state" operator="+"/>
+                    <field name="register_max" operator="+"/>
+                    <field group="True"  name="event_id" />
+                    
+                </graph>
+            </field>
+        </record>
+        
+        	  <!-- Event on Registration search view -->  
+	    
+	    <record model="ir.ui.view" id="view_report_event_registration_search">
+	        <field name="name">.search</field>
+	        <field name="model">report.event.registration</field>
+	        <field name="type">search</field>
+	        <field name="arch" type="xml">
+	            <search string="Event on Registration">
+	            	<group col="8" colspan="4">
+	            	<filter icon="gtk-media-rewind" string="  365 Days  "
+	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
+	                    help="Tasks performed in last 365 days"/>
+	                <filter icon="gtk-media-rewind" string="   30 Days   "
+	                	name="month"
+	                	domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
+	                	help="Tasks performed in last 30 days"/>
+	                <filter icon="gtk-media-rewind"
+	                     string="    7 Days    "
+	                     separator="1"
+	                     domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+	                     help="Tasks during last 7 days"/>
+	                     
+	                <separator orientation="vertical"/>
+	                  <filter icon="terp-crm"
+	                    string="Draft"
+	                    domain="[('state','=','draft')]"/>
+	                <filter icon="terp-crm"
+	                	string="Confirm"
+	                	domain="[('state', '=', 'confirm')]"/>
+	                <separator orientation="vertical"/>	
+	                	<field name="event_id" widget="selection"/>
+
+                    	 <field name="type" widget="selection"/>
+                    	 <field name="user_id" widget="selection">
+	                    	<filter icon="terp-partner"
+                            	string="My Events"
+                            	help="My Events"
+                            	domain="[('user_id','=',uid)]"/>
+	                	</field>
+                    	 <field name="date" />
+					</group>
+					<newline/>
+					<group expand="1" string="Group By..." colspan="4" col="12">
+					    <filter string="User" name="user" icon="terp-partner" context="{'group_by': 'user_id'}"/>
+					    <filter string="Event" name="event" icon="terp-crm" context="{'group_by':'event_id'}"/>
+						<filter string="Event Type" icon="terp-crm"  context="{'group_by':'type'}"/>
+						<filter string="state" icon="terp-crm" context="{'group_by':'state'}"/>
+						<separator orientation="vertical" />
+                        <filter string="Day" icon="terp-crm"
+                        	domain="[]" context="{'group_by':'day'}"/>
+                        <filter string="Month" icon="terp-crm"
+                        	domain="[]" context="{'group_by':'month'}"/>
+                        <filter string="Year" icon="terp-crm"
+                        	domain="[]" context="{'group_by':'year'}"/>
+					</group>
+	            </search>
+	        </field>
+	    </record>
+	
+
+        <record  model="ir.actions.act_window" id="action_report_event_registration">
+            <field name="name">Events On Registrations</field>
+            <field name="res_model">report.event.registration</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,graph</field>
+            <field name="search_view_id" ref="view_report_event_registration_search"/>
+    	    <field name="context">{"search_default_user":1,"search_default_month":1,'group_by_no_leaf':1,'group_by':[]}</field>
+        </record>
+       
+        <!--<menuitem parent="menu_report_event" action="action_event_registration" id="menu_report_event_registration"/>-->
+        <menuitem parent="menu_report_event" action="action_report_event_registration" id="menu_report_event_registration" />
+ 
+    <!-- end...  -->
+    </data>
+</openerp>    
\ No newline at end of file
diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py
new file mode 100755
index 00000000000..d9232136c3a
--- /dev/null
+++ b/addons/event/report/report_event_registration.py
@@ -0,0 +1,83 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import fields, osv
+import tools
+
+class report_event_registration(osv.osv):
+    
+    _name = "report.event.registration"
+    _description = "Events on registrations and Events on type"
+    _auto = False
+    _rec_name = 'date'
+    _columns = {
+        'date': fields.date('Date', readonly=True),
+        'year': fields.char('Year', size=4, readonly=True),
+        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
+            ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
+            ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
+        'day': fields.char('Day', size=128, readonly=True),        
+        'event_id': fields.many2one('event.event', 'Event Related', required=True), 
+        'draft_state': fields.integer(' # No of draft Registration.', size=20), 
+        'confirm_state': fields.integer(' # No of Confirm Registration', size=20), 
+        'register_max': fields.integer('Maximum Registrations'), 
+        'nbevent': fields.integer('Number Of Events'), 
+        'type': fields.many2one('event.type', 'Event Type'),
+        'state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, required=True),
+        'user_id':fields.many2one('res.users', 'Responsible', readonly=True),
+    }
+    _order = 'date desc'
+    def init(self, cr):
+        """
+        initialize the sql view for the event registration
+        cr -- the cursor
+        """
+        cr.execute("""
+         create or replace view report_event_registration as (
+                select
+                e.id as id,
+                c.event_id as event_id,
+                e.date_begin as date,
+                e.user_id as user_id,
+                to_char(e.date_begin, 'YYYY') as year,
+                to_char(e.date_begin, 'MM') as month,
+                to_char(e.date_begin, 'YYYY-MM-DD') as day,
+                count(t.id) as nbevent,
+                t.id as type,
+                (SELECT sum(c.nb_register) FROM event_registration  c  WHERE c.event_id=e.id and t.id=e.type and state in ('draft')) as draft_state,
+                (SELECT sum(c.nb_register) FROM event_registration  c  WHERE c.event_id=e.id and t.id=e.type and state in ('open')) as confirm_state,
+                e.register_max as register_max,
+                e.state as state
+                from
+                event_event e
+                inner join
+                    event_registration c on (e.id=c.event_id)
+                inner join
+                    event_type t on (e.type=t.id)
+               group by
+                    to_char(e.date_begin, 'YYYY'),
+                    to_char(e.date_begin, 'MM'),
+                    t.id, e.id, e.date_begin,
+                    e.register_max, e.type, e.state, c.event_id, e.user_id,
+                    to_char(e.date_begin, 'YYYY-MM-DD')
+                )""")
+
+report_event_registration()
diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml
old mode 100644
new mode 100755
diff --git a/addons/event/security/ir.model.access.csv b/addons/event/security/ir.model.access.csv
old mode 100644
new mode 100755
index 9eccb065448..6a5f00e2846
--- a/addons/event/security/ir.model.access.csv
+++ b/addons/event/security/ir.model.access.csv
@@ -4,7 +4,6 @@
 "access_event_event","event.event","model_event_event","crm.group_crm_user",1,1,1,1
 "access_event_registration","event.registration","model_event_registration","crm.group_crm_user",1,1,1,1
 "access_report_event_registration","report.event.registration","model_report_event_registration","crm.group_crm_user",1,0,0,0
-"access_report_event_type_registration","report.event.type.registration","model_report_event_type_registration","crm.group_crm_user",1,0,0,0
 "access_event_confirm_registration","event.confirm.registration","model_event_confirm_registration","crm.group_crm_user",1,0,0,0
 "access_event_confirm_registration_manager","event.confirm.registration manager","model_event_confirm_registration","crm.group_crm_manager",1,1,1,1
 "access_event_make_invoice","event.make.invoice","model_event_make_invoice","crm.group_crm_user",1,1,1,1
diff --git a/addons/event/wizard/__init__.py b/addons/event/wizard/__init__.py
old mode 100644
new mode 100755
diff --git a/addons/event/wizard/event_confirm_registration.py b/addons/event/wizard/event_confirm_registration.py
old mode 100644
new mode 100755
diff --git a/addons/event/wizard/event_confirm_registration_view.xml b/addons/event/wizard/event_confirm_registration_view.xml
old mode 100644
new mode 100755
index 03733d2045d..6f50f019902
--- a/addons/event/wizard/event_confirm_registration_view.xml
+++ b/addons/event/wizard/event_confirm_registration_view.xml
@@ -11,7 +11,7 @@
               	<field name="msg"/>
               	<separator string="" colspan="4"/>
                 <group colspan="4" col="6">
-            		<button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
+            		<button  icon="gtk-close" special="cancel" string="Close"/>
             		<button icon="gtk-ok" name="confirm" string="Confirm Anyway" type="object"/>
                 </group>
 			</form>
diff --git a/addons/event/wizard/event_make_invoice.py b/addons/event/wizard/event_make_invoice.py
old mode 100644
new mode 100755
index e4eacf99d3c..7a8bcfb489b
--- a/addons/event/wizard/event_make_invoice.py
+++ b/addons/event/wizard/event_make_invoice.py
@@ -27,13 +27,21 @@ class event_make_invoice(osv.osv_memory):
     _name = "event.make.invoice"
     _description = "Event Make Invoice"
     _columns = {
-        'inv_created': fields.char('Invoice Created', size=32, readonly=True),
-        'inv_rejected': fields.char('Invoice Rejected', size=32, readonly=True),
-        'inv_rej_reason': fields.text('Error Messages', readonly=True),
+        'inv_created': fields.char('Invoice Created', size=32, readonly=True), 
+        'inv_rejected': fields.char('Invoice Rejected', size=32, readonly=True), 
+        'inv_rej_reason': fields.text('Error Messages', readonly=True), 
 #        'invoice_ids': fields.char('Invoice Ids', size=128), # Improve me
                }
 
     def _makeInvoices(self, cr, uid, context={}):
+        """
+        Get default value for  fields
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values
+        @return: Dictionary of value
+        """
+        
         invoices = {}
         invoice_ids = []
         create_ids=[]
@@ -45,7 +53,7 @@ class event_make_invoice(osv.osv_memory):
         obj_event_reg = self.pool.get('event.registration')
         obj_lines = self.pool.get('account.invoice.line')
         inv_obj = self.pool.get('account.invoice')
-        data_event_reg = obj_event_reg.browse(cr,uid, context['active_ids'], context=context)
+        data_event_reg = obj_event_reg.browse(cr, uid, context['active_ids'], context=context)
 
         for reg in data_event_reg:
             if reg.state=='draft':
@@ -79,27 +87,27 @@ class event_make_invoice(osv.osv_memory):
                 continue
 
             inv_create = inv_create + 1
-            value = obj_lines.product_id_change(cr, uid, [], reg.event_id.product_id.id,uom =False, partner_id=reg.partner_invoice_id.id, fposition_id=reg.partner_invoice_id.property_account_position.id)
-            data_product = self.pool.get('product.product').browse(cr,uid,[reg.event_id.product_id.id])
+            value = obj_lines.product_id_change(cr, uid, [], reg.event_id.product_id.id, uom =False, partner_id=reg.partner_invoice_id.id, fposition_id=reg.partner_invoice_id.property_account_position.id)
+            data_product = self.pool.get('product.product').browse(cr, uid, [reg.event_id.product_id.id])
             for tax in data_product[0].taxes_id:
                 tax_ids.append(tax.id)
 
             vals = value['value']
             c_name = reg.contact_id and ('-' + self.pool.get('res.partner.contact').name_get(cr, uid, [reg.contact_id.id])[0][1]) or ''
             vals.update({
-                'name': reg.invoice_label + '-' + c_name,
-                'price_unit': reg.unit_price,
-                'quantity': reg.nb_register,
-                'product_id':reg.event_id.product_id.id,
-                'invoice_line_tax_id': [(6, 0, tax_ids)],
+                'name': reg.invoice_label + '-' + c_name, 
+                'price_unit': reg.unit_price, 
+                'quantity': reg.nb_register, 
+                'product_id':reg.event_id.product_id.id, 
+                'invoice_line_tax_id': [(6, 0, tax_ids)], 
             })
             inv_line_ids = obj_event_reg._create_invoice_lines(cr, uid, [reg.id], vals)
 
             val_invoice['value'].update({
-                'origin': reg.invoice_label,
-                'reference': False,
-                'invoice_line': [(6,0,[inv_line_ids])],
-                'comment': "",
+                'origin': reg.invoice_label, 
+                'reference': False, 
+                'invoice_line': [(6, 0, [inv_line_ids])], 
+                'comment': "", 
             })
 
             inv_id = inv_obj.create(cr, uid, val_invoice['value'])
@@ -108,7 +116,7 @@ class event_make_invoice(osv.osv_memory):
             obj_event_reg._history(cr, uid, [reg.id], 'Invoiced', history=True)
 
 #        {'inv_created' : str(inv_create) , 'inv_rejected' : str(inv_reject), 'invoice_ids': str(list_inv), 'inv_rej_reason': inv_rej_reason}
-        return {'inv_created' : str(inv_create) , 'inv_rejected' : str(inv_reject), 'inv_rej_reason': inv_rej_reason}
+        return {'inv_created': str(inv_create), 'inv_rejected': str(inv_reject), 'inv_rej_reason': inv_rej_reason}
 
     def default_get(self, cr, uid, fields_list, context=None):
         res = super(event_make_invoice, self).default_get(cr, uid, fields_list, context)
@@ -116,18 +124,26 @@ class event_make_invoice(osv.osv_memory):
         return res
 
     def confirm(self, cr, uid, ids, context={}):
+        """
+        Open Account invoice form.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of event make invoice's Id.
+        @param context: A standard dictionary for contextual values
+        @return: Dictionary of value
+        """
         obj_model = self.pool.get('ir.model.data')
         data_inv = self.read(cr, uid, ids, [], context)[0]
-        model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','invoice_form')])
-        resource_id = obj_model.read(cr,uid,model_data_ids,fields=['res_id'])[0]['res_id']
+        model_data_ids = obj_model.search(cr, uid, [('model', '=', 'ir.ui.view'), ('name', '=', 'invoice_form')])
+        resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'])[0]['res_id']
         return {
 #            'domain': "[('id','in', ["+','.join(map(str,data_inv['invoice_ids']))+"])]",
-            'name': 'Invoices',
-            'view_type': 'form',
-            'view_mode': 'tree,form',
-            'res_model': 'account.invoice',
-            'views': [(False,'tree'),(resource_id,'form')],
-            'context': "{'type':'out_invoice'}",
+            'name': 'Invoices', 
+            'view_type': 'form', 
+            'view_mode': 'tree,form', 
+            'res_model': 'account.invoice', 
+            'views': [(False, 'tree'), (resource_id, 'form')], 
+            'context': "{'type':'out_invoice'}", 
             'type': 'ir.actions.act_window'
         }
 
diff --git a/addons/event/wizard/event_make_invoice_view.xml b/addons/event/wizard/event_make_invoice_view.xml
old mode 100644
new mode 100755
diff --git a/addons/event/wizard/event_registration.py b/addons/event/wizard/event_registration.py
old mode 100644
new mode 100755
index 4803d118610..7640f040a99
--- a/addons/event/wizard/event_registration.py
+++ b/addons/event/wizard/event_registration.py
@@ -23,10 +23,20 @@ from osv import fields, osv
 
 class event_registration_list(osv.osv_memory):
     """ List Event Registration """
+    
     _name = "event.registration.list"
     _description = "List Event Registrations"
 
     def open_registration(self, cr, uid, ids, context={}):
+        """
+        Open Event Registration form
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Event registration list's IDs
+        @param context: A standard dictionary for contextual values
+        @return: Dictionary value which open Event registration form.
+        """
+
         if not context.get('active_id', None):
             return {
             'name': 'Event Registrations',
@@ -37,7 +47,7 @@ class event_registration_list(osv.osv_memory):
             }
 
         return {
-            'domain': [('section_id', '=', context['active_id'])],
+            'domain': [('event_id', '=', context['active_id'])],
             'name': 'Event Registrations',
             'view_type': 'form',
             'view_mode': 'tree,form',
diff --git a/addons/event/wizard/event_registration_view.xml b/addons/event/wizard/event_registration_view.xml
old mode 100644
new mode 100755
index 5afe437bc0f..f195e657f76
--- a/addons/event/wizard/event_registration_view.xml
+++ b/addons/event/wizard/event_registration_view.xml
@@ -7,9 +7,12 @@
             <field name="model">event.registration.list</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-              <form string="">
-              	<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-            	<button name="open_registration" string="Open Registrations" type="object" icon="gtk-open"/>
+              <form string="Event Registrations">
+                <group colspan="4" col="2">
+                    <separator string="List Event Registrations" colspan="4"/>
+              		<button special="cancel" string="Close" icon="gtk-close"/>
+            		<button name="open_registration" string="Open Registrations" type="object" icon="gtk-open"/>
+            	</group>
 			</form>
             </field>
 		</record>
diff --git a/addons/event/wizard/event_registrations_partner.py b/addons/event/wizard/event_registrations_partner.py
old mode 100644
new mode 100755
index e8fe43f97e0..5c443e39c1b
--- a/addons/event/wizard/event_registrations_partner.py
+++ b/addons/event/wizard/event_registrations_partner.py
@@ -23,10 +23,19 @@ from tools.translate import _
 
 class event_partners_list(osv.osv_memory):
     """ Event Partners """
+    
     _name = "event.partners.list"
     _description = "List Event Partners"
 
     def list_partners(self, cr, uid, ids, context={}):
+        """
+        Open Event Partner
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Event partners list's IDs
+        @param context: A standard dictionary for contextual values
+        @return: Dictionary value which open Partner  form.
+        """
         obj_reg = self.pool.get('event.registration')
         mod_obj = self.pool.get('ir.model.data')
         list_partner = []
diff --git a/addons/event/wizard/event_registrations_partner.xml b/addons/event/wizard/event_registrations_partner.xml
old mode 100644
new mode 100755
index c700bde11f9..0b3954129af
--- a/addons/event/wizard/event_registrations_partner.xml
+++ b/addons/event/wizard/event_registrations_partner.xml
@@ -8,8 +8,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
              	 <form string="Event Partners">
-             	 	<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-            		<button name="list_partners" string="Open Partners" type="object" icon="gtk-open"/>
+             	 	<group colspan="4" col="2">
+             	 	    <separator string="List Registrer Partners" colspan="4"/>
+             	 		<button special="cancel" string="Close" icon="gtk-close"/>
+            			<button name="list_partners" string="Open Partners" type="object" icon="gtk-open"/>
+            		</group>
 			  	 </form>
             </field>
 		</record>

From 2398cb648274775c1e02d223b11143d2e91976b9 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 7 Jun 2010 12:30:15 +0530
Subject: [PATCH 031/121] [IMP]: Added log for crm modules and document

bzr revid: rpa@tinyerp.com-20100607070015-j8h630weh0ki4gqh
---
 addons/crm/crm_lead.py                    | 3 ++-
 addons/crm/crm_meeting.py                 | 1 +
 addons/crm/crm_opportunity.py             | 1 -
 addons/crm/crm_phonecall.py               | 1 +
 addons/crm_claim/crm_claim.py             | 1 +
 addons/crm_fundraising/crm_fundraising.py | 1 +
 addons/crm_helpdesk/crm_helpdesk.py       | 1 +
 addons/document/document.py               | 2 ++
 addons/document/document_directory.py     | 4 +++-
 addons/document/document_storage.py       | 2 ++
 addons/idea/idea.py                       | 2 ++
 addons/lunch/lunch.py                     | 1 +
 addons/mail_gateway/mail_gateway.py       | 3 ++-
 13 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index c1060f3e658..e92378785d6 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -32,10 +32,11 @@ class crm_lead(osv.osv, crm_case):
     """ CRM Lead Case """
 
     _name = "crm.lead"
-    _description = "Lead"
+    _description = "Lead/Opportunity"
     _order = "priority, id desc"
     _inherit = ['res.partner.address']
     _inherits = {'mailgate.thread': 'thread_id'}
+    _log_create=True
 
     def _compute_day(self, cr, uid, ids, fields, args, context={}):
         """
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 133cb98f9dc..e3116ba39ca 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -45,6 +45,7 @@ class crm_meeting(osv.osv, crm_case):
     _order = "id desc"
     _inherit = ["calendar.event"]
     _inherits = {'mailgate.thread': 'thread_id'}
+    _log_create=True
 
     _columns = {
         # From crm.case
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 98e4c6f3ded..ce9b661fa1a 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -37,7 +37,6 @@ AVAILABLE_STATES = [
 class crm_opportunity(osv.osv):
     """ Opportunity Cases """
     _name = "crm.lead"
-    _description = "Opportunity"
     _order = "priority,date_action,id desc"
     _inherit = 'crm.lead'
     _columns = {
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 657360a4206..4ed59e2a5c3 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -32,6 +32,7 @@ class crm_phonecall(osv.osv, crm_case):
     _description = "Phonecall"
     _order = "id desc"
     _inherits = {'mailgate.thread': 'thread_id'}
+    _log_create=True
 
     _columns = {
         # From crm.case
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index d9a7a2b34c0..d45b9aa6482 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -30,6 +30,7 @@ class crm_claim(osv.osv, crm.crm_case):
     _description = "Claim Cases"
     _order = "id desc"
     _inherits = {'mailgate.thread': 'thread_id'}
+    _log_create=True
 
     _columns = {
         'thread_id': fields.many2one('mailgate.thread', 'Thread', required=False), 
diff --git a/addons/crm_fundraising/crm_fundraising.py b/addons/crm_fundraising/crm_fundraising.py
index 356c3baec73..4ff7832e64f 100644
--- a/addons/crm_fundraising/crm_fundraising.py
+++ b/addons/crm_fundraising/crm_fundraising.py
@@ -29,6 +29,7 @@ class crm_fundraising(osv.osv, crm.crm_case):
     _description = "Fund Raising Cases"
     _order = "id desc"
     _inherits = {'mailgate.thread': 'thread_id'}
+    _log_create=True
 
     _columns = {
             'thread_id': fields.many2one('mailgate.thread', 'Thread', required=False), 
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index d07d2261013..0b14994d2b6 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -29,6 +29,7 @@ class crm_helpdesk(osv.osv, crm.crm_case):
     _description = "Helpdesk Cases"
     _order = "id desc"
     _inherits = {'mailgate.thread': 'thread_id'}
+    _log_create=True
 
     _columns = {
             'thread_id': fields.many2one('mailgate.thread', 'Thread', required=False), 
diff --git a/addons/document/document.py b/addons/document/document.py
index 5d3075f7a4a..1a811600eed 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -41,6 +41,8 @@ DMS_ROOT_PATH = tools.config.get('document_path', os.path.join(tools.config['roo
 class document_file(osv.osv):
     _inherit = 'ir.attachment'
     _rec_name = 'datas_fname'
+    _log_create=True
+
     def _get_filestore(self, cr):
         return os.path.join(DMS_ROOT_PATH, cr.dbname)
 
diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index e395f96833d..8c50164701b 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -33,6 +33,8 @@ class document_directory(osv.osv):
     _name = 'document.directory'
     _description = 'Directory'
     _order = 'name desc'
+    _log_create=True
+
     _columns = {
         'name': fields.char('Name', size=64, required=True, select=1),
         'write_date': fields.datetime('Date Modified', readonly=True),
@@ -112,7 +114,7 @@ class document_directory(osv.osv):
             while d2 and d2.parent_id:
                 s = d2.name + (s and ('/' + s) or '')
                 d2 = d2.parent_id
-            res.append((d.id, s))
+            res.append((d.id, s or d.name))
         return res
 
     def get_full_path(self, cr, uid, dir_id, context=None):
diff --git a/addons/document/document_storage.py b/addons/document/document_storage.py
index d20870ff825..ac9925c1635 100644
--- a/addons/document/document_storage.py
+++ b/addons/document/document_storage.py
@@ -96,6 +96,8 @@ class document_storage(osv.osv):
     """
     _name = 'document.storage'
     _description = 'Storage Media'
+    _log_create=True
+
     _columns = {
         'name': fields.char('Name', size=64, required=True, select=1),
         'write_date': fields.datetime('Date Modified', readonly=True),
diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index 14fb24ee607..64b197cf858 100644
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -33,6 +33,7 @@ class idea_category(osv.osv):
 
     _name = "idea.category"
     _description = "Idea Category"
+    _log_create=True
 
     _columns = {
         'name': fields.char('Category', size=64, required=True),
@@ -52,6 +53,7 @@ class idea_idea(osv.osv):
     """ Idea """
     _name = 'idea.idea'
     _rec_name = 'title'
+    _log_create=True
 
     def _vote_avg_compute(self, cr, uid, ids, name, arg, context = None):
 
diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py
index 88d080c11bd..1a06c35c65e 100644
--- a/addons/lunch/lunch.py
+++ b/addons/lunch/lunch.py
@@ -115,6 +115,7 @@ class lunch_order(osv.osv):
     _name = 'lunch.order'
     _description = "Lunch Order"
     _rec_name = "user_id"
+    _log_create=True
 
     def _price_get(self, cr, uid, ids, name, args, context=None):
 
diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index 5a4ab95c935..d5bba205425 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -75,7 +75,6 @@ class mailgate_thread(osv.osv):
         if all(isinstance(case_id, (int, long)) for case_id in cases) and context.get('model'):
             cases = self.pool.get(context['model']).browse(cr, uid, cases, context=context)
 
-        model_obj = self.pool.get('ir.model')
         att_obj = self.pool.get('ir.attachment')
         obj = self.pool.get('mailgate.message')
 
@@ -114,6 +113,7 @@ class mailgate_thread(osv.osv):
                         'attachment_ids': [(6, 0, attachments)]
                         }
             res = obj.create(cr, uid, data, context)
+            case._table.log(cr, uid, case.id, case._description + " '" + case.name + "': " + keyword, context=context)
         return True
     
     _history = __history
@@ -129,6 +129,7 @@ class mailgate_message(osv.osv):
     _name = 'mailgate.message'
     _description = 'Mailgateway Message'
     _order = 'date desc'
+    _log_create=True
 
     _columns = {
         'name':fields.char('Message', size=64), 

From a7240c5dfe34820da58b1c1ab76901bab6d09a09 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Mon, 7 Jun 2010 18:13:44 +0530
Subject: [PATCH 032/121] [IMP] solve problem for duplication

bzr revid: ksa@tinyerp.co.in-20100607124344-empr5zqp2331s9rv
---
 addons/audittrail/audittrail.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index d6badfd7c46..015e586c0a2 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -423,8 +423,12 @@ class audittrail_objects_proxy(osv_pool):
         cr = pooler.get_db(db).cursor()
         obj_ids = pool.get('ir.model').search(cr, uid, [('model', '=', object)])
         model_object = pool.get('ir.model').browse(cr, uid, obj_ids)[0]
-
         res_ids = args[0]
+        if not isinstance(res_ids, list):
+            res_ids = [res_ids]
+        else:
+            res_ids = res_ids
+
         old_values = {}
         for res_id in res_ids:
             old_values[res_id] = pool.get(model_object.model).read(cr, uid, res_id, [])

From 68d00b672256ea6e4931e732b8642f62bac4b42d Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Mon, 7 Jun 2010 18:24:10 +0530
Subject: [PATCH 033/121] [ADD]: base_module_quality:check quality for yml

bzr revid: ksa@tinyerp.co.in-20100607125410-vtm4ushump1yb59n
---
 addons/base_module_quality/test/__init__.py | 23 +++++++
 addons/base_module_quality/test/test.py     | 70 +++++++++++++++++++++
 2 files changed, 93 insertions(+)
 create mode 100644 addons/base_module_quality/test/__init__.py
 create mode 100644 addons/base_module_quality/test/test.py

diff --git a/addons/base_module_quality/test/__init__.py b/addons/base_module_quality/test/__init__.py
new file mode 100644
index 00000000000..5b007890d21
--- /dev/null
+++ b/addons/base_module_quality/test/__init__.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import test
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/base_module_quality/test/test.py b/addons/base_module_quality/test/test.py
new file mode 100644
index 00000000000..eca0b0fb0cb
--- /dev/null
+++ b/addons/base_module_quality/test/test.py
@@ -0,0 +1,70 @@
+import os
+
+from osv import fields, osv
+from tools.translate import _
+import pooler
+from tools import config
+from base_module_quality import base_module_quality
+
+class quality_test(base_module_quality.abstract_quality_check):
+
+    def __init__(self):
+        super(quality_test, self).__init__()
+        self.name = _("Test")
+        self.note = _("""
+This test checks the YML of the module
+""")
+        self.bool_installed_only = False
+        self.bad_standard = 0
+        self.good_standard = 0
+        self.result_py = {}
+        self.min_score = 0
+        return None
+
+    def run_test(self, cr, uid, module_path):
+        pool = pooler.get_pool(cr.dbname)
+        module_name = module_path.split('/')[-1]
+        test_file = config['addons_path'] +'/' + module_name +'/test'
+
+        if not os.path.exists(test_file):
+            self.result += _("Module does not have Proper Path")
+            return None
+        else:
+            list_files = os.listdir(test_file)
+            for i in list_files:
+                    path = os.path.join(module_path, i)
+                    if os.path.isdir(path):
+                        for j in os.listdir(path):
+                            list_files.append(os.path.join(i, j))
+            py_list = []
+            for file_py in list_files:
+                if file_py.split('.')[-1] == 'yml':
+                    file_path = os.path.join(module_path, file_py)
+                    py_list.append(file_path)
+
+            if not py_list:
+                self.error = True
+                self.result = _("No YML file found")
+                return None
+
+            self.score = self.good_standard and float(self.good_standard) / float(self.good_standard + self.bad_standard)
+            if self.score*100 < self.min_score:
+                self.message = 'Score is below than minimal score(%s%%)' % self.min_score
+            self.result = self.get_result({ module_path: [int(self.score * 100)]})
+            self.result_details += self.get_result_general(self.result_py)
+
+    def get_result(self, dict_obj):
+        header = ('{| border="1" cellspacing="0" cellpadding="5" align="left" \n! %-40s \n', [_('Result of test in %')])
+        if not self.error:
+            return self.format_table(header, data_list=dict_obj)
+        return
+
+    def get_result_general(self, dict_obj):
+        str_html = '''<html><strong>Result</strong><head>%s</head><body><table class="tablestyle">'''%(self.get_style())
+        header = ('<tr><th class="tdatastyle">%s</th><th class="tdatastyle">%s</th><th class="tdatastyle">%s</th></tr>', [_('Object Name'), _('Line number'), _('Suggestion')])
+        if not self.error:
+            res = str_html + self.format_html_table(header, data_list=dict_obj) + '</table></body></html>'
+            res = res.replace('''<td''', '''<td class="tdatastyle" ''')
+            return res
+        return ""
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From e7de4bd66528d1008692e304487d98868068815c Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Mon, 7 Jun 2010 19:36:10 +0530
Subject: [PATCH 034/121] [ADD]: event: Add yaml file for event module.

bzr revid: atp@tinyerp.co.in-20100607140610-8lxzdr736nbb3plt
---
 addons/event/__openerp__.py      |   1 +
 addons/event/test/test_event.yml | 239 +++++++++++++++++++++++++++++++
 2 files changed, 240 insertions(+)
 create mode 100644 addons/event/test/test_event.yml

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 3d6267d20a8..547bb57330d 100755
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -52,6 +52,7 @@
         'wizard/event_make_invoice_view.xml',
     ],
     'demo_xml': ['event_demo.xml'],
+    'test': ['test/test_event.yml'],
     'installable': True,
     'active': False,
     'certificate': '0083059161581',
diff --git a/addons/event/test/test_event.yml b/addons/event/test/test_event.yml
new file mode 100644
index 00000000000..ba054b8b63f
--- /dev/null
+++ b/addons/event/test/test_event.yml
@@ -0,0 +1,239 @@
+- |
+  In order to test the 'event' module in OpenERP, we create a new event.
+  
+- |
+  Given that I have product "Ticket for Concert".
+- 
+  !record {model: product.product, id: product_product_ticketforconcert0}:
+    categ_id: product.cat1
+    cost_method: standard
+    list_price: 68.0
+    mes_type: fixed
+    name: Ticket for Concert
+    procure_method: make_to_stock
+    standard_price: 15.0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+    volume: 0.0
+    warranty: 0.0
+    weight: 0.0
+    weight_net: 0.0
+  
+- |
+  Given that I have also Event type "Conference".
+-   
+  !record {model: event.type, id: event_type_conference0}:
+     name: Conference
+- |
+  I create partner "Mark Johnson" and and I provide an address to this
+   new customer, as well as an email "info@mycustomer.com".
+- 
+  !record {model: res.partner, id: res_partner_markjohnson0}:
+    address:
+      - city: Bruxelles
+        country_id: base.be
+        job_ids:
+          - contact_id: base_contact.res_partner_contact_jacot0
+            function: CTO
+            name: base.res_partner_maxtor
+            sequence_partner: 0.0
+            state: current
+        street: Rue des Palais 51, bte 33
+        type: default
+        zip: '1000'
+        email: 'info@mycustomer.com'
+    credit_limit: 0.0
+    lang: en_US
+    name: Mark Johnson
+    property_account_payable: account.a_pay
+    property_account_receivable: account.a_recv
+    
+- |
+  we create it with a "Conference on ERP Buisness" event and provide "Beginning date", "Ending Date", "Product" as Concert Ticket.
+-
+  !record {model: event.event, id: event_event_conference0}:
+    code: C/004
+    date_begin: '2010-06-07 13:39:00'
+    date_end: '2010-06-10 13:39:00'
+    name: Conference on ERP Buisness
+    parent_id: event.case_section_event
+    product_id: 'product_product_ticketforconcert0'
+    register_max: 0.0
+    register_min: 0.0
+    state: draft
+    type: 'event_type_conference0'
+    
+- |
+  we  set the limit of registrations to this event using "Minimum Registrations"  3 and "Maximum Registrations" 10
+-   
+  !python {model: event.event}: |
+    self.write(cr, uid, [ref('event_event_conference0')], {'register_max': 10, 'register_min': 3})
+    
+- |
+  We Check that the event is in "Draft" state.
+- 
+  !assert {model: event.event, id: event_event_conference0}:
+     - state == 'draft'
+   
+- |
+  Then we confirm it press on "Confirm Event" button.
+-  
+  !python {model: event.event}: |
+    self.button_confirm(cr, uid, [ref("event_event_conference0")], {"active_ids": [ref("event.menu_event_event")]})
+    
+- |
+  Check that Event is "confirmed" or not. 
+-   
+  !assert {model: event.event, id: event_event_conference0}:
+     - state == 'confirm'
+     
+- |
+  person "Mark Johnson" want to  confirm their registrations. for that 
+  I create New Registration for "Conference on ERP Buisness" event. 
+- 
+  !record {model: event.registration, id: event_registration_registrationjacot0}:
+    badge_name: Jacot
+    badge_partner: Mark Johnson
+    badge_title: M.
+    contact_id: base_contact.res_partner_contact_jacot0
+    date_deadline: '2010-06-07 13:39:00'
+    event_id: event.event_event_conference0
+    invoice_label: Ticket for Concert
+    name: 'Registration: Jacot'
+    partner_id: 'res_partner_markjohnson0'
+    partner_invoice_id: 'res_partner_markjohnson0'
+    unit_price: 68.0
+- |
+  I check that "Number of registration" is less than "Maximum registration" defined in "Conference on ERP Buisness" event.
+  if not then  confirmation will fail because its greater  then the Maximum registration.   
+- 
+  !python {model: event.event}: |
+     obj_register = self.pool.get('event.registration')
+     event_id1 = self.browse(cr, uid, [ref('event_event_conference0')])[0]
+     register_ids = obj_register.search(cr, uid, [('event_id', '=', event_id1.id)])
+     register_id = obj_register.browse(cr, uid, register_ids)[0]
+     assert register_id.nb_register <= event_id1.register_max 
+          
+- |
+  And Confirm that Registration by click on "Confirm Registration" button of Registraion form.     
+- 
+  !python {model: event.registration}: |
+    self.check_confirm(cr, uid, [ref("event_registration_registrationjacot0")], {"active_ids": [ref("event.menu_action_registration")]})
+
+- |
+  one other Person "Zen" also want to confirm their Registraions. so
+  They create New registraion for This event.
+- 
+  !record {model: event.registration, id: event_registration_registrationzen0}:
+    badge_name: Zen
+    badge_partner: China Export
+    contact_id: base_contact.res_partner_contact_zen0
+    date_deadline: '2010-06-07 13:39:00'
+    event_id: event.event_event_conference0
+    invoice_label: Ticket for Concert
+    name: 'Registration: Zen'
+    partner_id: base.res_partner_3
+    partner_invoice_id: base.res_partner_3
+    unit_price: 68.0
+    
+- |
+  And Confirm that Registration by click on "Confirm Registration" button of Registraion form.     
+- 
+  !python {model: event.registration}: |
+    self.check_confirm(cr, uid, [ref("event_registration_registrationzen0")], {"active_ids": [ref("event.menu_action_registration")]})
+
+- |
+  Third person create New Registration for "Conference on ERP Business" event. 
+- 
+  !record {model: event.registration, id: event_registration_registrationpassot0}:
+    badge_name: Passot
+    badge_partner: Mediapole SPRL
+    badge_title: M.
+    contact_id: base_contact.res_partner_contact_passot0
+    date_deadline: '2010-06-07 13:39:00'
+    email_from: info@mediapole.net
+    event_id: 'event_event_conference0'
+    invoice_label: Ticket for Concert
+    name: 'Registration: Passot'
+    partner_id: base.res_partner_8
+    partner_invoice_id: base.res_partner_8
+    unit_price: 68.0
+- |
+  This person cannot Confirm their registration.so I check that state is "Unconfirmed".     
+- 
+  !assert {model: event.registration, id: event_registration_registrationpassot0}:
+     - state == 'draft'
+  
+- |
+  I Check that  the total number of confirmed is 2 and  unconfirmed registrations 1.    
+-
+  !python {model: event.event}: |
+     obj_event = self.browse(cr, uid, [ref('event_event_conference0')])[0]
+     assert  obj_event.register_current == '2'
+     assert obj_event.register_prospect == '1'
+    
+- |
+  We check all registered partners to this event using the wizard "List Register Partners".
+- 
+  !record {model: event.partners.list, id: event_partners_list_0}:
+    {}
+- 
+  I click on "Open Partners" button of "List Register Partners" wizard.
+- 
+  !python {model: event.partners.list}: |
+    self.list_partners(cr, uid, [ref("event_partners_list_0")], {"active_ids":
+      [ref("event.event_event_conference0")]})
+  
+- | 
+  We check all registrations on current event using the wizard "Registrations"
+- 
+  !record {model: event.registration.list, id: event_registration_list_0}:
+    {}
+- | 
+  I click on "Open Registrations" button of  "Registrations" wizard.  
+- 
+  !python {model: event.registration.list}: |
+    self.open_registration(cr, uid, [ref("event_registration_list_0")], {"active_ids": [ref("event.event_event_conference0")]})
+
+- |
+  This event is finished by click on "Event Done" button of this event form.
+- 
+  !python {model: event.event}: |
+    self.button_done(cr, uid, [ref("event.event_event_conference0")], {"active_ids": [ref("event.menu_event_event")] })
+- |
+  We can create invoice if the registration is in "Open" state otherwise it gives the warning to the user.
+  so I check that Registration is in "Open" state before click on "Make Invoices."
+- 
+  !assert {model: event.registration, id: event_registration_registrationjacot0}: 
+     - state == 'open'  
+- |
+  Now, I will invoice the participant who have address using "Make Invoices". This wizard will also give the number of invoices are created and rejected.
+  Create invoice will be linked to Invoice Field available on Payments tab of registrations
+- 
+  !record {model: event.make.invoice, id: event_make_invoice_0}:
+    inv_created: '0'
+    inv_rej_reason: 'ID 1: Registration already has an invoice linked. \n'
+    inv_rejected: '1'
+- |
+  I click on "Open" button of this "Make Invoices" wizard.
+- 
+  !python {model: event.make.invoice}: |
+    self.confirm(cr, uid, [ref("event_make_invoice_0")], {"active_ids": [ref("event_registration_registrationjacot0")]})  
+- |
+  I check  that Invoice for this partner is create or not.
+-
+  !python {model: event.registration}: |
+     obj_event_reg = self.pool.get('event.registration')
+     obj_lines = self.pool.get('account.invoice.line')
+     inv_obj = self.pool.get('account.invoice')
+     data_event_reg = obj_event_reg.browse(cr, uid, [ref('event_registration_registrationzen0')], context=context)[0]
+     invoice_ids = inv_obj.search(cr, uid, [('partner_id', '=', data_event_reg.partner_invoice_id.id)])
+     invoice_id = inv_obj.browse(cr, uid, invoice_ids)
+     if invoice_id:
+        line_ids = obj_lines.search(cr, uid, [('product_id', '=', data_event_reg.event_id.product_id), ('invoice_id', '=', invoice_id.id), ('price_unit', '=', data_event_reg.unit_price)])
+        line_id = obj_lines.browse(cr, uid, line_ids)[0]
+        assert line_id.product_id == data_event_reg.product_id
+        assert data_event_reg.partner_id == invoice_id.partner_id
+        assert invoice_id.address_invoice_id == data_event_reg.partner_address_id

From 6765024e27d3693eaf5c59d880bb91f2add448c1 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 8 Jun 2010 11:13:36 +0530
Subject: [PATCH 035/121] [ADD]: base_contact: Added migration script to create
 a contact with the name of the address when we install base_contact

bzr revid: rpa@tinyerp.com-20100608054336-0qgwpndsdv0gft5q
---
 .../1.2/pre-10-res_partner_address_change.py  | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 addons/base_contact/migrations/1.2/pre-10-res_partner_address_change.py

diff --git a/addons/base_contact/migrations/1.2/pre-10-res_partner_address_change.py b/addons/base_contact/migrations/1.2/pre-10-res_partner_address_change.py
new file mode 100644
index 00000000000..326a9caed9d
--- /dev/null
+++ b/addons/base_contact/migrations/1.2/pre-10-res_partner_address_change.py
@@ -0,0 +1,28 @@
+# -*- coding: utf8 -*-
+
+__name__ = "res.partner.adress: for each address it should create a contact with the name of the address"
+
+def migrate(cr, version):
+    generate_contact(cr)
+
+def generate_contact(cr):
+    cr.execute("""DROP TRIGGER  IF EXISTS contactjob on res_partner_contact;
+                        DROP LANGUAGE  IF EXISTS  plpgsql CASCADE;
+                        CREATE LANGUAGE plpgsql ;
+                        CREATE OR REPLACE FUNCTION add_to_job() RETURNS TRIGGER AS $contactjob$
+                        DECLARE
+                        new_name varchar;
+                        new_phonenum varchar;
+                        BEGIN
+                        IF(TG_OP='INSERT') THEN
+                        INSERT INTO res_partner_job(contact_id, address_id, function, state) VALUES(NEW.id, NEW.website::integer,NEW.first_name, 'current');
+                        UPDATE res_partner_contact set first_name=Null, website=Null, active=True where id=NEW.id;
+                        END IF;
+                        RETURN NEW;
+                        END;
+                        $contactjob$ LANGUAGE plpgsql;
+                        CREATE TRIGGER contactjob AFTER INSERT ON res_partner_contact FOR EACH ROW EXECUTE PROCEDURE add_to_job();""")
+    cr.commit()
+
+    cr.execute("INSERT into res_partner_contact (name, title, email, first_name, website)  (SELECT coalesce(name, 'Noname'), title, email, function , to_char(id, '99999999') from res_partner_address)")
+    cr.commit()

From 70609fc6673d4c673242a94c1daafe00425f9625 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 8 Jun 2010 12:23:50 +0530
Subject: [PATCH 036/121] [IMP]: caldav: Applied reverted changes of Export ics
 wizard

bzr revid: rpa@tinyerp.com-20100608065350-9rqucdoxgi0hjyxy
---
 addons/caldav/wizard/calendar_event_export.py       | 13 +++----------
 addons/caldav/wizard/calendar_event_export_view.xml |  4 ++--
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/addons/caldav/wizard/calendar_event_export.py b/addons/caldav/wizard/calendar_event_export.py
index 856d9e9bc91..0be54df9f56 100644
--- a/addons/caldav/wizard/calendar_event_export.py
+++ b/addons/caldav/wizard/calendar_event_export.py
@@ -32,16 +32,6 @@ class calendar_event_export(osv.osv_memory):
     """
     Export Calendar Event.
     """
-    def process_export_ics(self, cr, uid, ids, context):
-        """
-        Get Default value for file_path field.
-        """
-        model = context.get('model', 'basic.calendar')
-        model_obj = self.pool.get(model)
-
-        calendar = model_obj.export_cal(cr, uid, context['active_ids'], context)
-        self.write(cr, uid, ids, {'file_path': base64.encodestring(calendar)})
-        return False
 
     def default_get(self, cr, uid, fields, context):
         """
@@ -54,6 +44,9 @@ class calendar_event_export(osv.osv_memory):
         name = 'OpenERP %s.ics' % (model_obj._description)
         if 'name' in fields:
             res.update({'name': name})
+        if 'file_path' in fields:
+            calendar = model_obj.export_cal(cr, uid, context['active_ids'], context)
+            res.update({'file_path': base64.encodestring(calendar)})
         return  res
 
     _name = "calendar.event.export"
diff --git a/addons/caldav/wizard/calendar_event_export_view.xml b/addons/caldav/wizard/calendar_event_export_view.xml
index 227822966d0..cfadf945bf4 100644
--- a/addons/caldav/wizard/calendar_event_export_view.xml
+++ b/addons/caldav/wizard/calendar_event_export_view.xml
@@ -13,8 +13,8 @@
                     </group>
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
-                    	<button name="process_export_ics"  icon="gtk-execute" string="Genetate ics" type="object"/>
-                    	<button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                    	<label string=""/>
+                    	<button  icon="gtk-close" special="cancel" string="_Close"/>
                    </group>
                </form>
             </field>

From 1b7a37fc514a4f1600ff4201c4b7e0cb38c2a2fa Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Tue, 8 Jun 2010 17:12:47 +0530
Subject: [PATCH 037/121] [IMP]: base_report_designer: Improve wizard

bzr revid: ksa@tinyerp.co.in-20100608114247-ubcsqyznoyyr6o2v
---
 addons/base_report_designer/__init__.py       |    5 +-
 addons/base_report_designer/__openerp__.py    |    5 +-
 .../base_report_designer/base_report_data.xml |    0
 .../base_report_designer.py                   |    0
 .../base_report_designer_installer.xml        |   95 +
 .../base_report_designer_wizard.xml           |    9 +-
 addons/base_report_designer/i18n/ar.po        |    0
 .../i18n/base_report_designer.pot             |    0
 addons/base_report_designer/i18n/bg.po        |    0
 addons/base_report_designer/i18n/bs.po        |    0
 addons/base_report_designer/i18n/ca.po        |    0
 addons/base_report_designer/i18n/cs.po        |    0
 addons/base_report_designer/i18n/de.po        |    0
 addons/base_report_designer/i18n/el.po        |    0
 addons/base_report_designer/i18n/es.po        |    0
 addons/base_report_designer/i18n/es_AR.po     |    0
 addons/base_report_designer/i18n/et.po        |    0
 addons/base_report_designer/i18n/fi.po        |    0
 addons/base_report_designer/i18n/fr.po        |    0
 addons/base_report_designer/i18n/gl.po        |    0
 addons/base_report_designer/i18n/hr.po        |    0
 addons/base_report_designer/i18n/hu.po        |    0
 addons/base_report_designer/i18n/id.po        |    0
 addons/base_report_designer/i18n/it.po        |    0
 addons/base_report_designer/i18n/ko.po        |    0
 addons/base_report_designer/i18n/lt.po        |    0
 addons/base_report_designer/i18n/nl.po        |    0
 addons/base_report_designer/i18n/nl_BE.po     |    0
 addons/base_report_designer/i18n/pl.po        |    0
 addons/base_report_designer/i18n/pt.po        |    0
 addons/base_report_designer/i18n/pt_BR.po     |    0
 addons/base_report_designer/i18n/ro.po        |    0
 addons/base_report_designer/i18n/ru.po        |    0
 addons/base_report_designer/i18n/sk.po        |    0
 addons/base_report_designer/i18n/sl.po        |    0
 addons/base_report_designer/i18n/sq.po        |    0
 addons/base_report_designer/i18n/sr.po        |    0
 addons/base_report_designer/i18n/sv.po        |    0
 addons/base_report_designer/i18n/tlh.po       |    0
 addons/base_report_designer/i18n/tr.po        |    0
 addons/base_report_designer/i18n/uk.po        |    0
 addons/base_report_designer/i18n/vi.po        |    0
 addons/base_report_designer/i18n/zh_CN.po     |    0
 addons/base_report_designer/i18n/zh_TW.po     |    0
 addons/base_report_designer/installer.py      |   59 +
 .../report_desinger/Makefile                  |   12 +
 .../report_desinger/Readme.txt                |   10 +
 .../report_desinger/doc/faq.txt               |   23 +
 .../openoffice_report/Makefile                |   28 +
 .../openoffice_report/OOo_run.sh              |    2 +
 .../openoffice_report/package/Addons.xcu      |  114 +
 .../openoffice_report/script/About.py         |   73 +
 .../openoffice_report/script/AddAttachment.py |  230 ++
 .../openoffice_report/script/Change.py        |   59 +
 .../openoffice_report/script/LoginTest.py     |   10 +
 .../script/ServerParameter.py                 |  118 +
 .../openoffice_report/script/__init__.py      |    6 +
 .../openoffice_report/script/import           |    2 +
 .../openoffice_report/script/lib/__init__.py  |    4 +
 .../openoffice_report/script/lib/actions.py   |   64 +
 .../openoffice_report/script/lib/error.py     |   13 +
 .../openoffice_report/script/lib/functions.py |  296 ++
 .../openoffice_report/script/lib/gui.py       |  758 ++++
 .../openoffice_report/script/lib/tools.py     |   19 +
 .../openoffice_report_designer/bin/Makefile   |   42 +
 .../openoffice_report_designer/bin/OOo_run.sh |    2 +
 .../bin/package/Addons.xcu                    |  636 +++
 .../bin/package/OpenERPReport.py              | 3609 +++++++++++++++++
 .../bin/script/About.py                       |   66 +
 .../bin/script/AddAttachment.py               |  235 ++
 .../bin/script/Change.py                      |   62 +
 .../bin/script/ConvertBracesToField.py        |  240 ++
 .../bin/script/ConvertFieldsToBraces.py       |   38 +
 .../bin/script/ExportToRML.py                 |   86 +
 .../bin/script/Expression.py                  |   69 +
 .../bin/script/Fields.py                      |  245 ++
 .../bin/script/LoginTest.py                   |   10 +
 .../bin/script/ModifyExistingReport.py        |  168 +
 .../bin/script/NewReport.py                   |   74 +
 .../bin/script/Repeatln.py                    |  254 ++
 .../bin/script/SendToServer.py                |  195 +
 .../bin/script/ServerParameter.py             |  162 +
 .../bin/script/Translation.py                 |  228 ++
 .../bin/script/__init__.py                    |   15 +
 .../bin/script/compile_all.py                 |    3 +
 .../bin/script/import                         |    2 +
 .../bin/script/lib/__init__.py                |    7 +
 .../bin/script/lib/actions.py                 |   64 +
 .../bin/script/lib/error.py                   |   13 +
 .../bin/script/lib/functions.py               |  217 +
 .../bin/script/lib/gui.py                     |  775 ++++
 .../bin/script/lib/logreport.py               |   26 +
 .../bin/script/lib/rpc.py                     |  183 +
 .../bin/script/lib/tiny_socket.py             |   93 +
 .../bin/script/lib/tools.py                   |   19 +
 .../bin/script/modify.py                      |   91 +
 .../openoffice_report_designer/doc/Readme.txt |   48 +
 .../doc/test_fields.py                        |   32 +
 .../openerp_report_designer.zip               |  Bin 0 -> 151447 bytes
 .../base_report_designer/wizard/__init__.py   |    5 +-
 .../wizard/base_report_designer_modify.py     |    0
 .../wizard/tiny_sxw2rml/__init__.py           |    0
 .../tiny_sxw2rml/normalized_odt2rml.xsl       |    0
 .../wizard/tiny_sxw2rml/normalized_oo2rml.xsl |    0
 .../wizard/tiny_sxw2rml/office.dtd            |    0
 .../wizard/tiny_sxw2rml/tiny_sxw2rml.py       |    0
 addons/wiki/wiki_view.xml                     |    2 +-
 addons/wiki_sale_faq/wiki_sale_faq_data.xml   |   43 +-
 108 files changed, 10063 insertions(+), 10 deletions(-)
 mode change 100644 => 100755 addons/base_report_designer/__init__.py
 mode change 100644 => 100755 addons/base_report_designer/__openerp__.py
 mode change 100644 => 100755 addons/base_report_designer/base_report_data.xml
 mode change 100644 => 100755 addons/base_report_designer/base_report_designer.py
 create mode 100644 addons/base_report_designer/base_report_designer_installer.xml
 mode change 100644 => 100755 addons/base_report_designer/base_report_designer_wizard.xml
 mode change 100644 => 100755 addons/base_report_designer/i18n/ar.po
 mode change 100644 => 100755 addons/base_report_designer/i18n/base_report_designer.pot
 mode change 100644 => 100755 addons/base_report_designer/i18n/bg.po
 mode change 100644 => 100755 addons/base_report_designer/i18n/bs.po
 mode change 100644 => 100755 addons/base_report_designer/i18n/ca.po
 mode change 100644 => 100755 addons/base_report_designer/i18n/cs.po
 mode change 100644 => 100755 addons/base_report_designer/i18n/de.po
 mode change 100644 => 100755 addons/base_report_designer/i18n/el.po
 mode change 100644 => 100755 addons/base_report_designer/i18n/es.po
 mode change 100644 => 100755 addons/base_report_designer/i18n/es_AR.po
 mode change 100644 => 100755 addons/base_report_designer/i18n/et.po
 mode change 100644 => 100755 addons/base_report_designer/i18n/fi.po
 mode change 100644 => 100755 addons/base_report_designer/i18n/fr.po
 mode change 100644 => 100755 addons/base_report_designer/i18n/gl.po
 mode change 100644 => 100755 addons/base_report_designer/i18n/hr.po
 mode change 100644 => 100755 addons/base_report_designer/i18n/hu.po
 mode change 100644 => 100755 addons/base_report_designer/i18n/id.po
 mode change 100644 => 100755 addons/base_report_designer/i18n/it.po
 mode change 100644 => 100755 addons/base_report_designer/i18n/ko.po
 mode change 100644 => 100755 addons/base_report_designer/i18n/lt.po
 mode change 100644 => 100755 addons/base_report_designer/i18n/nl.po
 mode change 100644 => 100755 addons/base_report_designer/i18n/nl_BE.po
 mode change 100644 => 100755 addons/base_report_designer/i18n/pl.po
 mode change 100644 => 100755 addons/base_report_designer/i18n/pt.po
 mode change 100644 => 100755 addons/base_report_designer/i18n/pt_BR.po
 mode change 100644 => 100755 addons/base_report_designer/i18n/ro.po
 mode change 100644 => 100755 addons/base_report_designer/i18n/ru.po
 mode change 100644 => 100755 addons/base_report_designer/i18n/sk.po
 mode change 100644 => 100755 addons/base_report_designer/i18n/sl.po
 mode change 100644 => 100755 addons/base_report_designer/i18n/sq.po
 mode change 100644 => 100755 addons/base_report_designer/i18n/sr.po
 mode change 100644 => 100755 addons/base_report_designer/i18n/sv.po
 mode change 100644 => 100755 addons/base_report_designer/i18n/tlh.po
 mode change 100644 => 100755 addons/base_report_designer/i18n/tr.po
 mode change 100644 => 100755 addons/base_report_designer/i18n/uk.po
 mode change 100644 => 100755 addons/base_report_designer/i18n/vi.po
 mode change 100644 => 100755 addons/base_report_designer/i18n/zh_CN.po
 mode change 100644 => 100755 addons/base_report_designer/i18n/zh_TW.po
 create mode 100644 addons/base_report_designer/installer.py
 create mode 100755 addons/base_report_designer/report_desinger/Makefile
 create mode 100755 addons/base_report_designer/report_desinger/Readme.txt
 create mode 100755 addons/base_report_designer/report_desinger/doc/faq.txt
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report/Makefile
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report/OOo_run.sh
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report/package/Addons.xcu
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report/script/About.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report/script/AddAttachment.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report/script/Change.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report/script/LoginTest.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report/script/ServerParameter.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report/script/__init__.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report/script/import
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report/script/lib/__init__.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report/script/lib/actions.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report/script/lib/error.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report/script/lib/functions.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report/script/lib/gui.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report/script/lib/tools.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report_designer/bin/Makefile
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report_designer/bin/OOo_run.sh
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report_designer/bin/package/Addons.xcu
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report_designer/bin/package/OpenERPReport.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/About.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/AddAttachment.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/Change.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/ConvertBracesToField.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/ConvertFieldsToBraces.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/ExportToRML.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/Expression.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/Fields.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/LoginTest.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/ModifyExistingReport.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/NewReport.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/Repeatln.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/SendToServer.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/ServerParameter.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/Translation.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/__init__.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/compile_all.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/import
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/lib/__init__.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/lib/actions.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/lib/error.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/lib/functions.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/lib/gui.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/lib/logreport.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/lib/rpc.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/lib/tiny_socket.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/lib/tools.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/modify.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report_designer/doc/Readme.txt
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report_designer/doc/test_fields.py
 create mode 100755 addons/base_report_designer/report_desinger/openoffice_report_designer/openerp_report_designer.zip
 mode change 100644 => 100755 addons/base_report_designer/wizard/__init__.py
 mode change 100644 => 100755 addons/base_report_designer/wizard/base_report_designer_modify.py
 mode change 100644 => 100755 addons/base_report_designer/wizard/tiny_sxw2rml/__init__.py
 mode change 100644 => 100755 addons/base_report_designer/wizard/tiny_sxw2rml/normalized_odt2rml.xsl
 mode change 100644 => 100755 addons/base_report_designer/wizard/tiny_sxw2rml/normalized_oo2rml.xsl
 mode change 100644 => 100755 addons/base_report_designer/wizard/tiny_sxw2rml/office.dtd
 mode change 100644 => 100755 addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py

diff --git a/addons/base_report_designer/__init__.py b/addons/base_report_designer/__init__.py
old mode 100644
new mode 100755
index 46a0a1e2476..f88c02d34a2
--- a/addons/base_report_designer/__init__.py
+++ b/addons/base_report_designer/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,11 +15,12 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 import base_report_designer
 import wizard
+import installer
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/base_report_designer/__openerp__.py b/addons/base_report_designer/__openerp__.py
old mode 100644
new mode 100755
index f19d179a1ed..4e584879e77
--- a/addons/base_report_designer/__openerp__.py
+++ b/addons/base_report_designer/__openerp__.py
@@ -37,7 +37,10 @@ upload the report using the same wizard.
     'website': 'http://www.openerp.com',
     'depends': ['base'],
     'init_xml': ['base_report_data.xml'],
-    'update_xml': ['base_report_designer_wizard.xml'],
+    'update_xml': [
+                   'base_report_designer_installer.xml',
+                   'base_report_designer_wizard.xml'
+                   ],
     'demo_xml': [],
     'installable': True,
     'active': False,
diff --git a/addons/base_report_designer/base_report_data.xml b/addons/base_report_designer/base_report_data.xml
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/base_report_designer.py b/addons/base_report_designer/base_report_designer.py
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/base_report_designer_installer.xml b/addons/base_report_designer/base_report_designer_installer.xml
new file mode 100644
index 00000000000..0af7fdfeade
--- /dev/null
+++ b/addons/base_report_designer/base_report_designer_installer.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    <record id="view_base_report_designer" model="ir.ui.view">
+            <field name="name">OpenOffice Report Designer</field>
+            <field name="model">base.openoffice</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_installer"/>
+            <field name="arch" type="xml">
+            <data>
+                <form position="attributes">
+                  <attribute name="string">Base Report Designer Module Installation</attribute>
+                </form>
+                <separator string="title" position="attributes">
+                   <attribute name="string">Base Report Designer</attribute>
+                </separator>
+              <xpath expr='//separator[@string="vsep"]' position='attributes'>
+                <attribute name='string'></attribute>
+                <attribute name='rowspan'>15</attribute>
+              </xpath>
+              <group colspan="8" height="250" width="700">
+                <separator string="OpenOffice Report Desinger" colspan="4"/>
+                <field name="base_desinger_url"  widget="url" />
+                <newline/>
+                <field name="plugin_file"/>
+                <button name="add_plugin" string="Click To Get the plugin"
+                    colspan="1" type="object" icon="gtk-execute" />
+
+                <newline/>
+                <field name="pdf_file"/>
+                <button name="process_pdf_file" string="Click To Documenation"
+                    colspan="1" type="object" icon="gtk-execute" />
+                <newline/>
+                <separator string="Openoffice Report Desinger plugin installation note." colspan="4"/>
+                <label colspan="2" string="Save The  plug­in and Documenation read the step to How to install it from Documenation"/>
+                <button special="cancel" string="Close" icon="gtk-cancel"/>
+            </group>
+           </data>
+            </field>
+        </record>
+
+        <record id="action_base_report_designer" model="ir.actions.act_window">
+            <field name="name">Base Report Designer Module Installation</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">base.openoffice</field>
+            <field name="view_id" ref="view_base_report_designer"/>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+        <record id="report_designer_installer_todo" model="ir.actions.todo">
+      <field name="action_id" ref="action_base_report_designer"/>
+      <field name="sequence">4</field>
+    </record>
+
+    <record id="view_report_designer" model="ir.ui.view">
+            <field name="name">OpenOffice Report Designer</field>
+            <field name="model">base.openoffice</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Report Desinger">
+                      <group colspan="8" height="250" width="700">
+                        <separator string="OpenOffice Report Desinger" colspan="4"/>
+                        <field name="base_desinger_url"  widget="url" />
+                        <newline/>
+                        <field name="plugin_file"/>
+                        <button name="add_plugin" string="Click To Get the plugin"
+                            colspan="1" type="object" icon="gtk-execute" />
+
+                        <newline/>
+                        <field name="pdf_file"/>
+                        <button name="process_pdf_file" string="Click To Documenation"
+                            colspan="1" type="object" icon="gtk-execute" />
+                        <newline/>
+                        <separator string="Openoffice Report Desinger plugin installation note." colspan="4"/>
+                        <label colspan="2" string="Save The  plug­in and Documenation read the step to How to install it from Documenation"/>
+                        <button special="cancel" string="Close" icon="gtk-cancel"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_report_designer" model="ir.actions.act_window">
+            <field name="name">OpenOffice Report</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">base.openoffice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+   </data>
+</openerp>
+
diff --git a/addons/base_report_designer/base_report_designer_wizard.xml b/addons/base_report_designer/base_report_designer_wizard.xml
old mode 100644
new mode 100755
index 8882d2de9e9..4d6a075d456
--- a/addons/base_report_designer/base_report_designer_wizard.xml
+++ b/addons/base_report_designer/base_report_designer_wizard.xml
@@ -22,9 +22,12 @@
 			type="wizard"
 			id="menu_wizard_report_designer_modify"
 			sequence="70"/>
-
-
-
+		<menuitem
+			parent="base.next_id_50"
+			name="OpenOffice Report Designer"
+			action="action_report_designer"
+			id="menu_report_designer"
+			sequence="75"/>
 	</data>
 </openerp>
 
diff --git a/addons/base_report_designer/i18n/ar.po b/addons/base_report_designer/i18n/ar.po
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/i18n/base_report_designer.pot b/addons/base_report_designer/i18n/base_report_designer.pot
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/i18n/bg.po b/addons/base_report_designer/i18n/bg.po
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/i18n/bs.po b/addons/base_report_designer/i18n/bs.po
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/i18n/ca.po b/addons/base_report_designer/i18n/ca.po
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/i18n/cs.po b/addons/base_report_designer/i18n/cs.po
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/i18n/de.po b/addons/base_report_designer/i18n/de.po
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/i18n/el.po b/addons/base_report_designer/i18n/el.po
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/i18n/es.po b/addons/base_report_designer/i18n/es.po
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/i18n/es_AR.po b/addons/base_report_designer/i18n/es_AR.po
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/i18n/et.po b/addons/base_report_designer/i18n/et.po
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/i18n/fi.po b/addons/base_report_designer/i18n/fi.po
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/i18n/fr.po b/addons/base_report_designer/i18n/fr.po
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/i18n/gl.po b/addons/base_report_designer/i18n/gl.po
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/i18n/hr.po b/addons/base_report_designer/i18n/hr.po
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/i18n/hu.po b/addons/base_report_designer/i18n/hu.po
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/i18n/id.po b/addons/base_report_designer/i18n/id.po
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/i18n/it.po b/addons/base_report_designer/i18n/it.po
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/i18n/ko.po b/addons/base_report_designer/i18n/ko.po
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/i18n/lt.po b/addons/base_report_designer/i18n/lt.po
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/i18n/nl.po b/addons/base_report_designer/i18n/nl.po
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/i18n/nl_BE.po b/addons/base_report_designer/i18n/nl_BE.po
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/i18n/pl.po b/addons/base_report_designer/i18n/pl.po
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/i18n/pt.po b/addons/base_report_designer/i18n/pt.po
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/i18n/pt_BR.po b/addons/base_report_designer/i18n/pt_BR.po
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/i18n/ro.po b/addons/base_report_designer/i18n/ro.po
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/i18n/ru.po b/addons/base_report_designer/i18n/ru.po
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/i18n/sk.po b/addons/base_report_designer/i18n/sk.po
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/i18n/sl.po b/addons/base_report_designer/i18n/sl.po
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/i18n/sq.po b/addons/base_report_designer/i18n/sq.po
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/i18n/sr.po b/addons/base_report_designer/i18n/sr.po
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/i18n/sv.po b/addons/base_report_designer/i18n/sv.po
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/i18n/tlh.po b/addons/base_report_designer/i18n/tlh.po
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/i18n/tr.po b/addons/base_report_designer/i18n/tr.po
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/i18n/uk.po b/addons/base_report_designer/i18n/uk.po
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/i18n/vi.po b/addons/base_report_designer/i18n/vi.po
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/i18n/zh_CN.po b/addons/base_report_designer/i18n/zh_CN.po
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/i18n/zh_TW.po b/addons/base_report_designer/i18n/zh_TW.po
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/installer.py b/addons/base_report_designer/installer.py
new file mode 100644
index 00000000000..8a050952475
--- /dev/null
+++ b/addons/base_report_designer/installer.py
@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields
+from osv import osv
+from tools import config
+
+import base64
+class base_openoffice(osv.osv_memory):
+    _name = "base.openoffice"
+    _inherit = 'res.config.installer'
+    _description = "Open Office Report Desinger"
+    _columns = {
+                'base_desinger_url': fields.char('Documentation URL', size=300, readonly=True),
+                'plugin_file':fields.binary('OpenOffice Report Desinger',readonly=True),
+                'pdf_file':fields.binary('Documenation', size=64 ,readonly=True),
+    }
+    def add_plugin(self, cr, uid, ids, context):
+        data = {}
+        file = open(config['addons_path'] + "/base_report_designer/report_desinger/openoffice_report_designer/openerp_report_designer.zip", 'r')
+        data['plugin_file'] = base64.encodestring(file.read())
+        self.write(cr, uid, ids, data)
+        return False
+
+    def process_pdf_file(self, cr, uid, ids, context):
+        """
+        Default Attach Thunderbird Plug-in Installation File.
+        """
+        data = {}
+        pdf_file = open(config['addons_path'] + "/base_report_designer/report_desinger/doc/OpenOffice.pdf", 'r')
+        data['pdf_file'] = base64.encodestring(pdf_file.read())
+        self.write(cr, uid, ids, data)
+        return False
+    _defaults = {
+        'name' : 'tiny_plugin-2.0.xpi',
+        'pdf_name' : 'Installation Guide to OpenOffice Report Desinger.pdf',
+        'base_desinger_url':'http://doc.openerp.com/developer/7_23_RAD_tools/index.html#open-office-report-designer'
+
+        }
+
+base_openoffice()
\ No newline at end of file
diff --git a/addons/base_report_designer/report_desinger/Makefile b/addons/base_report_designer/report_desinger/Makefile
new file mode 100755
index 00000000000..c83843cb5ef
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/Makefile
@@ -0,0 +1,12 @@
+all:
+	(cd openoffice_report && make pack)
+	cp openoffice_report/*.zip .
+	(cd openoffice_report_designer/bin && make pack)
+	cp openoffice_report_designer/bin/*.zip .
+
+
+clean:
+	rm -f *.zip
+	(cd openoffice_report && make clean)
+	(cd openoffice_report_designer/bin && make clean)
+
diff --git a/addons/base_report_designer/report_desinger/Readme.txt b/addons/base_report_designer/report_desinger/Readme.txt
new file mode 100755
index 00000000000..0ba3be8dae6
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/Readme.txt
@@ -0,0 +1,10 @@
+
+Installation procedure
+----------------------
+
+Step 1 :
+    type: make
+    to generate .zip file
+
+Step 2 :
+    follow instruction in file : openoffice_report_designer/doc/Readme.txt
diff --git a/addons/base_report_designer/report_desinger/doc/faq.txt b/addons/base_report_designer/report_desinger/doc/faq.txt
new file mode 100755
index 00000000000..1ade9a60db5
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/doc/faq.txt
@@ -0,0 +1,23 @@
+How to install the plugin with OpenOffice 2.4 on Windows
+========================================================
+
+If you get an error for the installation of the plugin, edit the pythonloader.py file
+in $(OPEN_OFFICE_DIR)\program\ and change the value of DEBUG to None.
+
+If you get an error for the uno.exe in window then just close the Quick starter
+	Openoffice.2.4.1 Too\Option\Openoffic.org in that select the Memory
+	in that Openoffice.org.QuickStarter
+	if checked mark is there then just remove it..
+
+If you are using OpenOffice 3.0 and install the Report Desinger with make all
+	command then change  path in makefile
+
+	sh /opt/openoffice.org3/program/unopkg add or remove both
+
+	And for previous version of Openoffice used
+
+	sh /usr/lib/openoffice/program/unopkg add -v $(ZIP_FILE)
+
+
+
+
diff --git a/addons/base_report_designer/report_desinger/openoffice_report/Makefile b/addons/base_report_designer/report_desinger/openoffice_report/Makefile
new file mode 100755
index 00000000000..56539500524
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report/Makefile
@@ -0,0 +1,28 @@
+ZIP_FILE=openerp_report_add_attachment.zip
+
+all: create pack uninstall install
+
+create:
+	cat script/import \
+	    script/lib/actions.py \
+	    script/lib/error.py \
+	    script/lib/functions.py \
+	    script/lib/gui.py \
+	    script/lib/tools.py \
+	    script/Change.py \
+	    script/LoginTest.py \
+	    script/AddAttachment.py \
+	    script/ServerParameter.py \
+	    script/About.py > package/OpenERPReport.py
+
+pack: clean
+	zip $(ZIP_FILE) `find package/ | grep -v svn` 
+	
+install:
+	sh /usr/lib/openoffice/program/unopkg add -v $(ZIP_FILE)
+	
+uninstall:
+	sh /usr/lib/openoffice/program/unopkg remove -v  $(ZIP_FILE)
+
+clean:
+	rm -f $(ZIP_FILE)
diff --git a/addons/base_report_designer/report_desinger/openoffice_report/OOo_run.sh b/addons/base_report_designer/report_desinger/openoffice_report/OOo_run.sh
new file mode 100755
index 00000000000..a22ff96cf53
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report/OOo_run.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+ooffice "-accept=socket,host=localhost,port=2002;urp;"
diff --git a/addons/base_report_designer/report_desinger/openoffice_report/package/Addons.xcu b/addons/base_report_designer/report_desinger/openoffice_report/package/Addons.xcu
new file mode 100755
index 00000000000..3ad4210bc98
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report/package/Addons.xcu
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<oor:component-data xmlns:oor="http://openoffice.org/2001/registry"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    oor:name="Addons" oor:package="org.openoffice.Office">
+    <node oor:name="AddonUI">
+        <node oor:name="OfficeMenuBar">
+            <node oor:name="org.openoffice.openerp.report" oor:op="replace">
+                <prop oor:name="Title" oor:type="xs:string">
+                    <value/>
+                    <value xml:lang="en-US">OpenERP ~Report</value>
+                </prop>
+                <prop oor:name="Target" oor:type="xs:string">
+                    <value>_self</value>
+                </prop>
+                <prop oor:name="ImageIdentifier" oor:type="xs:string">
+                    <value/>
+                </prop>
+                <node oor:name="Submenu">
+                    <node oor:name="m11" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.serverparam?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Server parameters</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m12" oor:op="replace">
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>private:separator</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m34" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.addattachment?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Add Attachment</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m45" oor:op="replace">
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>private:separator</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m51" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.about?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">About</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+                </node>
+            </node>
+        </node>
+
+        <node oor:name="Images">
+            <node oor:name="org.openoffice.openerp.report.image8" oor:op="replace">
+                <prop oor:name="URL">
+                    <value>service:org.openoffice.openerp.report.serverparam?execute</value>
+                </prop>
+                <node oor:name="UserDefinedImages">
+                    <prop oor:name="ImageSmallURL" oor:type="xs:string">
+                        <value>%origin%/images/server_s.png</value>
+                    </prop>
+                    <prop oor:name="ImageBigURL" oor:type="xs:string" oor:width="100">
+                        <value>%origin%/images/server_b.png</value>
+                    </prop>
+                </node>
+            </node>
+            <node oor:name="org.openoffice.openerp.report.image9" oor:op="replace">
+                <prop oor:name="URL">
+                    <value>service:org.openoffice.openerp.report.about?execute</value>
+                </prop>
+                <node oor:name="UserDefinedImages">
+                    <prop oor:name="ImageSmallURL" oor:type="xs:string">
+                        <value>%origin%/images/aboutus_s.png</value>
+                    </prop>
+                    <prop oor:name="ImageBigURL" oor:type="xs:string" oor:width="100">
+                        <value>%origin%/images/aboutus_b.png</value>
+                    </prop>
+                </node>
+            </node>
+        </node>
+
+    </node>
+</oor:component-data>
diff --git a/addons/base_report_designer/report_desinger/openoffice_report/script/About.py b/addons/base_report_designer/report_desinger/openoffice_report/script/About.py
new file mode 100755
index 00000000000..43d0d1b753a
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report/script/About.py
@@ -0,0 +1,73 @@
+
+
+import uno
+from com.sun.star.task import XJobExecutor
+
+if __name__<>'package':
+    from lib.gui import *
+
+class About(unohelper.Base, XJobExecutor):
+    def __init__(self,ctx):
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+        self.win = DBModalDialog(60, 50, 175, 115, ".:: About OpenERP Report ::.")
+
+        fdBigFont = createUnoStruct("com.sun.star.awt.FontDescriptor")
+        fdBigFont.Width = 20
+        fdBigFont.Height = 25
+        fdBigFont.Weight = 120
+        fdBigFont.Family= 3
+
+        oLabelTitle1 = self.win.addFixedText("lblTitle1", 1, 1, 35, 30)
+        oLabelTitle1.Model.TextColor = 16056320
+        oLabelTitle1.Model.FontDescriptor = fdBigFont
+        oLabelTitle1.Model.FontRelief = 1
+        oLabelTitle1.Text = "Open"
+
+        oLabelTitle2 = self.win.addFixedText("lblTitle2", 35, 1, 30, 30)
+        oLabelTitle2.Model.TextColor = 1
+        oLabelTitle2.Model.FontDescriptor = fdBigFont
+        oLabelTitle2.Model.FontRelief = 1
+        oLabelTitle2.Text = "ERP"
+
+        oLabelProdDesc = self.win.addFixedText("lblProdDesc", 1, 30, 173, 75)
+        oLabelProdDesc.Model.TextColor = 1
+        fdBigFont.Width = 10
+        fdBigFont.Height = 11
+        fdBigFont.Weight = 76
+        oLabelProdDesc.Model.FontDescriptor = fdBigFont
+        oLabelProdDesc.Model.Align = 1
+        oLabelProdDesc.Model.FontRelief = 1
+        oLabelProdDesc.Model.MultiLine = True
+        oLabelProdDesc.Text = "This package helps you to add attachment in OpenERP.\nOnce connected to the server, you can add an attachment to an entity of OpenERP."
+
+        oLabelFooter = self.win.addFixedText("lblFooter", -1, -1, 173, 25)
+        oLabelFooter.Model.TextColor = 255
+        #oLabelFooter.Model.BackgroundColor = 1
+        oLabelFooter.Model.Border = 2
+        oLabelFooter.Model.BorderColor = 255
+        fdBigFont.Width = 8
+        fdBigFont.Height = 9
+        fdBigFont.Weight = 100
+        oLabelFooter.Model.FontDescriptor = fdBigFont
+        oLabelFooter.Model.Align = 1
+        oLabelFooter.Model.FontRelief = 1
+        oLabelFooter.Model.MultiLine = True
+        sMessage = "OpenERP Report v1.0 \nCopyright 2007-TODAY Tiny sprl \nThis product is free software, under the GPL licence."
+        oLabelFooter.Text = sMessage
+
+#
+#        if __name__=="package":
+#
+#            self.win.addImageControl("imgAbout",0,0,225,169,sImagePath= "file:///home/hjo/Desktop/trunk/bin/package/images/About.jpg")#path.__getslice__(0,path.rfind("/")) + "/package/images/About.jpg")
+#        else:
+#
+#            self.win.addImageControl("imgAbout",0,0,225,169,sImagePath="file:///home/hjo/Desktop/trunk/bin/package/images/About.jpg")
+        self.win.doModalDialog("",None)
+
+if __name__<>"package" and __name__=="__main__":
+    About(None)
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( About, "org.openoffice.openerp.report.about", ("com.sun.star.task.Job",),)
+
diff --git a/addons/base_report_designer/report_desinger/openoffice_report/script/AddAttachment.py b/addons/base_report_designer/report_desinger/openoffice_report/script/AddAttachment.py
new file mode 100755
index 00000000000..1a144b1fbc5
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report/script/AddAttachment.py
@@ -0,0 +1,230 @@
+import os
+import uno
+import unohelper
+import xmlrpclib
+import base64
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from lib.error import ErrorDialog
+    from lib.tools import * 
+    from LoginTest import *
+    database="test"
+    uid = 3
+
+class AddAttachment(unohelper.Base, XJobExecutor ):
+    Kind = {
+        'PDF' : 'pdf',
+        'OpenOffice': 'sxw',
+    }
+    def __init__(self,ctx):
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+        LoginTest()
+        if not loginstatus and __name__=="package":
+            exit(1)
+
+        self.aSearchResult = []
+        desktop=getDesktop()
+        oDoc2 = desktop.getCurrentComponent()
+        docinfo=oDoc2.getDocumentInfo()
+
+        if docinfo.getUserFieldValue(2) <> "" and docinfo.getUserFieldValue(3) <> "":
+            self.win = DBModalDialog(60, 50, 180, 70, "Add Attachment to Server")
+            self.win.addFixedText("lblResourceType", 2 , 5, 100, 10, "Select Appropriate Resource Type:")
+            self.win.addComboListBox("lstResourceType", -2, 25, 176, 15,True)
+            self.win.addButton('btnOkWithoutInformation', -2 , -5, 25 , 15,'OK' ,actionListenerProc = self.btnOkWithoutInformation_clicked )
+        else:
+            self.win = DBModalDialog(60, 50, 180, 190, "Add Attachment to Server")
+            self.win.addFixedText("lblModuleName",2 , 9, 42, 20, "Select Module:")
+            self.win.addComboListBox("lstmodel", -2, 5, 134, 15,True)
+            self.lstModel = self.win.getControl( "lstmodel" )
+            self.dModel = {}
+
+            global passwd
+            self.password = passwd
+            # Open a new connexion to the server
+
+            sock = xmlrpclib.ServerProxy(docinfo.getUserFieldValue(0) +'/xmlrpc/object')
+            ids = sock.execute(database, uid, self.password, 'ir.module.module', 'search', [('name','=','base_report_model'),('state', '=', 'installed')])
+            if not len(ids):
+                # If the module 'base_report_model' is not installed, use the default model
+                self.dModel = {
+                    "Partner":'res.partner',
+                }
+            else:
+                sock = xmlrpclib.ServerProxy( docinfo.getUserFieldValue(0) + '/xmlrpc/object' )
+                ids = sock.execute(database, uid, self.password, 'base.report.model' , 'search', [])
+                res = sock.execute(database, uid, self.password, 'base.report.model' , 'read', ids, ['name','model_id'])
+                models = sock.execute(database, uid, self.password, 'ir.model' , 'read', map(lambda x:x['model_id'][0], res), ['model'])
+                models = dict(map(lambda x:(x['id'],x['model']), models))
+                self.dModel = dict(map(lambda x: (x['name'],models[x['model_id'][0]]), res))
+
+            for item in self.dModel.keys():
+                self.lstModel.addItem(item, self.lstModel.getItemCount())
+
+            self.win.addFixedText("lblSearchName",2 , 25, 60, 10, "Enter Search String:")
+            self.win.addEdit("txtSearchName", 2, 35, 149, 15,)
+            self.win.addButton('btnSearch', -2 , 35, 25 , 15,'Search' ,actionListenerProc = self.btnSearch_clicked )
+
+            self.win.addFixedText("lblSearchRecord", 2 , 55, 60, 10, "Search Result:")
+            self.win.addComboListBox("lstResource", -2, 65, 176, 70, False )
+            self.lstResource = self.win.getControl( "lstResource" )
+
+            self.win.addFixedText("lblResourceType", 2 , 137, 100, 20, "Select Appropriate Resource Type:")
+            self.win.addComboListBox("lstResourceType", -2, 147, 176, 15,True )
+
+            self.win.addButton('btnOkWithInformation', -2 , -5, 25 , 15,'OK' ,actionListenerProc = self.btnOkWithInformation_clicked )
+
+        self.lstResourceType = self.win.getControl( "lstResourceType" )
+        for kind in self.Kind.keys(): 
+            self.lstResourceType.addItem( kind, self.lstResourceType.getItemCount() )
+
+        self.win.addButton('btnCancel', -2 - 27 , -5 , 30 , 15, 'Cancel' ,actionListenerProc = self.btnCancel_clicked )
+        self.win.doModalDialog("lstResourceType", self.Kind.keys()[0])
+
+    def btnSearch_clicked( self, oActionEvent ):
+        modelSelectedItem = self.win.getListBoxSelectedItem("lstmodel")
+        if modelSelectedItem == "":
+            return
+
+        desktop=getDesktop()
+        oDoc2 = desktop.getCurrentComponent()
+        docinfo=oDoc2.getDocumentInfo()
+
+        sock = xmlrpclib.ServerProxy(docinfo.getUserFieldValue(0) +'/xmlrpc/object')
+        self.aSearchResult = sock.execute( database, uid, self.password, self.dModel[modelSelectedItem], 'name_search', self.win.getEditText("txtSearchName"))
+        self.win.removeListBoxItems("lstResource", 0, self.win.getListBoxItemCount("lstResource"))
+        if self.aSearchResult == []:
+            ErrorDialog("No search result found !!!", "", "Search ERROR" )
+            return
+
+        for result in self.aSearchResult:
+            self.lstResource.addItem(result[1],result[0])
+
+    def _send_attachment( self, name, data, res_model, res_id ):
+        desktop = getDesktop()
+        oDoc2 = desktop.getCurrentComponent()
+        docinfo = oDoc2.getDocumentInfo()
+        sock = xmlrpclib.ServerProxy( docinfo.getUserFieldValue(0) + '/xmlrpc/object' )
+        params = {
+            'name': name, 
+            'datas': base64.encodestring( data ), 
+            'datas_fname': name,
+            'res_model' : res_model, 
+            'res_id' : int(res_id),
+        }
+
+        return sock.execute( database, uid, self.password, 'ir.attachment', 'create', params )
+
+    def send_attachment( self, model, resource_id ):
+        desktop = getDesktop()
+        oDoc2 = desktop.getCurrentComponent()
+        docinfo = oDoc2.getDocumentInfo()
+
+        if oDoc2.getURL() == "":
+            ErrorDialog("Please save your file", "", "Saving ERROR" )
+            return None 
+
+        url = oDoc2.getURL()
+        if self.Kind[self.win.getListBoxSelectedItem("lstResourceType")] == "pdf":
+            url = self.doc2pdf(url[7:])
+
+        if url == None:
+            ErrorDialog( "Ploblem in creating PDF", "", "PDF Error" )
+            return None 
+
+        url = url[7:]
+        data = read_data_from_file( get_absolute_file_path( url ) )
+        return self._send_attachment( os.path.basename( url ), data, model, resource_id )
+
+    def btnOkWithoutInformation_clicked( self, oActionEvent ):
+        desktop = getDesktop()
+        oDoc2 = desktop.getCurrentComponent()
+        docinfo = oDoc2.getDocumentInfo()
+
+        if self.win.getListBoxSelectedItem("lstResourceType") == "":
+            ErrorDialog("Please select resource type", "", "Selection ERROR" )
+            return 
+
+        res = self.send_attachment( docinfo.getUserFieldValue(3), docinfo.getUserFieldValue(2) )
+        self.win.endExecute()
+
+    def btnOkWithInformation_clicked(self,oActionEvent):
+        if self.win.getListBoxSelectedItem("lstResourceType") == "":
+            ErrorDialog( "Please select resource type", "", "Selection ERROR" )
+            return 
+
+        if self.win.getListBoxSelectedItem("lstResource") == "" or self.win.getListBoxSelectedItem("lstmodel") == "":
+            ErrorDialog("Please select Model and Resource","","Selection ERROR")
+            return 
+
+        resourceid = None
+        for s in self.aSearchResult:
+            if s[1] == self.win.getListBoxSelectedItem("lstResource"):
+                resourceid = s[0]
+                break
+
+        if resourceid == None:
+            ErrorDialog("No resource selected !!!", "", "Resource ERROR" )
+            return 
+
+        res = self.send_attachment( self.dModel[self.win.getListBoxSelectedItem('lstmodel')], resourceid )
+        self.win.endExecute()
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
+    def doc2pdf(self, strFile):
+        oDoc = None
+        strFilterSubName = ''
+
+        strUrl = convertToURL( strFile )
+        desktop = getDesktop()
+        oDoc = desktop.loadComponentFromURL( strUrl, "_blank", 0, Array(self._MakePropertyValue("Hidden",True)))
+        if oDoc:
+            strFilterSubName = ""
+            # select appropriate filter
+            if oDoc.supportsService("com.sun.star.presentation.PresentationDocument"):
+                strFilterSubName = "impress_pdf_Export"
+            elif oDoc.supportsService("com.sun.star.sheet.SpreadsheetDocument"):
+                strFilterSubName = "calc_pdf_Export"
+            elif oDoc.supportsService("com.sun.star.text.WebDocument"):
+                strFilterSubName = "writer_web_pdf_Export"
+            elif oDoc.supportsService("com.sun.star.text.GlobalDocument"):
+                strFilterSubName = "writer_globaldocument_pdf_Export"
+            elif oDoc.supportsService("com.sun.star.text.TextDocument"):
+                strFilterSubName = "writer_pdf_Export"
+            elif oDoc.supportsService("com.sun.star.drawing.DrawingDocument"):
+                strFilterSubName = "draw_pdf_Export"
+            elif oDoc.supportsService("com.sun.star.formula.FormulaProperties"):
+                strFilterSubName = "math_pdf_Export"
+            elif oDoc.supportsService("com.sun.star.chart.ChartDocument"):
+                strFilterSubName = "chart_pdf_Export"
+            else:
+                pass
+
+            filename = len(strFilterSubName) > 0 and convertToURL( os.path.splitext( strFile )[0] + ".pdf" ) or None
+
+            if len(strFilterSubName) > 0:
+                oDoc.storeToURL( filename, Array(self._MakePropertyValue("FilterName", strFilterSubName ),self._MakePropertyValue("CompressMode", "1" )))
+
+            oDoc.close(True)
+            # Can be None if len(strFilterSubName) <= 0
+            return filename
+
+    def _MakePropertyValue(self, cName = "", uValue = u"" ):
+       oPropertyValue = createUnoStruct( "com.sun.star.beans.PropertyValue" )
+       if cName:
+          oPropertyValue.Name = cName
+       if uValue:
+          oPropertyValue.Value = uValue
+       return oPropertyValue
+
+
+if __name__<>"package" and __name__=="__main__":
+    AddAttachment(None)
+elif __name__=="package":
+    g_ImplementationHelper = unohelper.ImplementationHelper()
+    g_ImplementationHelper.addImplementation( AddAttachment, "org.openoffice.openerp.report.addattachment", ("com.sun.star.task.Job",),)
diff --git a/addons/base_report_designer/report_desinger/openoffice_report/script/Change.py b/addons/base_report_designer/report_desinger/openoffice_report/script/Change.py
new file mode 100755
index 00000000000..fa662fb4adc
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report/script/Change.py
@@ -0,0 +1,59 @@
+if __name__<>"package":
+    from lib.gui import *
+    from lib.functions import *
+
+class Change:
+    def __init__(self, aVal= None, sURL=""):
+        self.win=DBModalDialog(60, 50, 120, 90, "Connect to Open ERP Server")
+
+        self.win.addFixedText("lblVariable", 38, 12, 60, 15, "Server")
+
+        self.win.addEdit("txtHost",-2,9,60,15,sURL[sURL.find("/")+2:sURL.rfind(":")])
+
+        self.win.addFixedText("lblReportName",45 , 31, 60, 15, "Port")
+        self.win.addEdit("txtPort",-2,28,60,15,sURL[sURL.rfind(":")+1:])
+
+        self.win.addFixedText("lblLoginName", 2, 51, 60, 15, "Protocol Connection")
+
+        self.win.addComboListBox("lstProtocol", -2, 48, 60, 15, True)
+        self.lstProtocol = self.win.getControl( "lstProtocol" )
+
+        self.lstProtocol.addItem( "XML-RPC", 0)
+        #self.lstProtocol.addItem( "XML-RPC secure", 1)
+        #self.lstProtocol.addItem( "NET-RPC (faster)", 2)
+
+        self.win.addButton( 'btnOK', -2, -5, 30, 15, 'Ok', actionListenerProc = self.btnOkOrCancel_clicked )
+
+        self.win.addButton( 'btnCancel', -2 - 30 - 5 ,-5, 30, 15, 'Cancel', actionListenerProc = self.btnOkOrCancel_clicked )
+        self.aVal=aVal
+        self.protocol = { 
+            'XML-RPC': 'http://', 
+            'XML-RPC secure': 'https://', 
+            'NET-RPC (faster)': 'socket://',
+        }
+
+        sValue=self.protocol.keys()[0]
+        if sURL<>"":
+            sValue=self.protocol.keys()[self.protocol.values().index(sURL[:sURL.find("/")+2])]
+
+        self.win.doModalDialog( "lstProtocol", sValue)
+
+    def cmbProtocol_selected(self,oItemEvent):
+        pass
+
+    def btnOkOrCancel_clicked(self,oActionEvent):
+        if oActionEvent.Source.getModel().Name == "btnOK":
+            url = self.protocol[self.win.getListBoxSelectedItem("lstProtocol")]+self.win.getEditText("txtHost")+":"+self.win.getEditText("txtPort")
+            res = getConnectionStatus(url)
+            if res == -1:
+                self.aVal.append("Could not connect to the server!")
+            elif res == 0:
+                self.aVal.append("No Database found !!!")
+            else:
+                self.aVal.append(url)
+            self.aVal.append(res)
+            self.win.endExecute()
+        elif oActionEvent.Source.getModel().Name =="btnCancel":
+            self.win.endExecute()
+
+
diff --git a/addons/base_report_designer/report_desinger/openoffice_report/script/LoginTest.py b/addons/base_report_designer/report_desinger/openoffice_report/script/LoginTest.py
new file mode 100755
index 00000000000..daf81591c1a
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report/script/LoginTest.py
@@ -0,0 +1,10 @@
+
+if __name__<>"package":
+    from ServerParameter import *
+    from lib.gui import *
+
+class LoginTest:
+    def __init__(self):
+        if not loginstatus:
+            ServerParameter(None)
+
diff --git a/addons/base_report_designer/report_desinger/openoffice_report/script/ServerParameter.py b/addons/base_report_designer/report_desinger/openoffice_report/script/ServerParameter.py
new file mode 100755
index 00000000000..812dbe061e3
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report/script/ServerParameter.py
@@ -0,0 +1,118 @@
+import uno
+import string
+import unohelper
+import xmlrpclib
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from lib.error import ErrorDialog
+    from lib.functions import *
+    from Change import *
+    database="test"
+
+class ServerParameter( unohelper.Base, XJobExecutor ):
+    def __init__(self,ctx):
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        self.win=DBModalDialog(60, 50, 160, 108, "Server Connection Parameter")
+
+        self.win.addFixedText("lblVariable", 2, 12, 35, 15, "Server URL")
+        if docinfo.getUserFieldValue(0)=="":
+            docinfo.setUserFieldValue(0,"http://localhost:8069")
+        self.win.addEdit("txtHost",-34,9,91,15,docinfo.getUserFieldValue(0))
+        self.win.addButton('btnChange',-2 ,9,30,15,'Change' ,actionListenerProc = self.btnChange_clicked )
+
+        self.win.addFixedText("lblDatabaseName", 6, 31, 31, 15, "Database")
+        #self.win.addFixedText("lblMsg", -2,28,123,15)
+        self.win.addComboListBox("lstDatabase", -2,28,123,15, True)
+        self.lstDatabase = self.win.getControl( "lstDatabase" )
+        #self.win.selectListBoxItem( "lstDatabase", docinfo.getUserFieldValue(2), True )
+        #self.win.setEnabled("lblMsg",False)
+
+        self.win.addFixedText("lblLoginName", 17, 51, 20, 15, "Login")
+        self.win.addEdit("txtLoginName",-2,48,123,15,docinfo.getUserFieldValue(1))
+
+        self.win.addFixedText("lblPassword", 6, 70, 31, 15, "Password")
+        self.win.addEdit("txtPassword",-2,67,123,15,)
+        self.win.setEchoChar("txtPassword",42)
+
+
+        self.win.addButton('btnOK',-2 ,-5, 60,15,'Connect', actionListenerProc = self.btnOk_clicked )
+
+        self.win.addButton('btnCancel',-2 - 60 - 5 ,-5, 35,15,'Cancel', actionListenerProc = self.btnCancel_clicked )
+        sValue=""
+        if docinfo.getUserFieldValue(0)<>"":
+            res=getConnectionStatus(docinfo.getUserFieldValue(0))
+            if res == -1:
+                sValue="Could not connect to the server!"
+                self.lstDatabase.addItem("Could not connect to the server!",0)
+            elif res == 0:
+                sValue="No Database found !!!"
+                self.lstDatabase.addItem("No Database found !!!",0)
+            else:
+                self.win.removeListBoxItems("lstDatabase", 0, self.win.getListBoxItemCount("lstDatabase"))
+                for i in range(len(res)):
+                    self.lstDatabase.addItem(res[i],i)
+                sValue = database
+
+        self.win.doModalDialog("lstDatabase",sValue)
+
+        #self.win.doModalDialog("lstDatabase",docinfo.getUserFieldValue(2))
+
+    def btnOk_clicked(self,oActionEvent):
+        sock = xmlrpclib.ServerProxy(self.win.getEditText("txtHost")+'/xmlrpc/common')
+        sDatabase=self.win.getListBoxSelectedItem("lstDatabase")
+        sLogin=self.win.getEditText("txtLoginName")
+        sPassword=self.win.getEditText("txtPassword")
+        UID = sock.login(sDatabase,sLogin,sPassword)
+        if not UID:
+            ErrorDialog("Connection Refuse...","Please enter valid Login/Password")
+        else:
+            desktop=getDesktop()
+            doc = desktop.getCurrentComponent()
+            docinfo=doc.getDocumentInfo()
+            docinfo.setUserFieldValue(0,self.win.getEditText("txtHost"))
+            docinfo.setUserFieldValue(1,self.win.getEditText("txtLoginName"))
+            global passwd
+            passwd=self.win.getEditText("txtPassword")
+            global loginstatus
+            loginstatus=True
+            global database
+            database=sDatabase
+            global uid
+            uid=UID
+            #docinfo.setUserFieldValue(2,self.win.getListBoxSelectedItem("lstDatabase"))
+            #docinfo.setUserFieldValue(3,"")
+            ErrorDialog(" You can start creating your report in \nthe current document.","Take care to save it as a .SXW file \nbefore sending to the server.","Message")
+            self.win.endExecute()
+
+    def btnCancel_clicked(self, oActionEvent ):
+        self.win.endExecute()
+
+    def btnChange_clicked(self,oActionEvent):
+        try:
+            aVal=[]
+            url= self.win.getEditText("txtHost")
+            Change(aVal,url)
+            if aVal[1]== -1:
+                ErrorDialog(aVal[0],"")
+            elif aVal[1]==0:
+                ErrorDialog(aVal[0],"")
+            else:
+                self.win.setEditText("txtHost",aVal[0])
+                self.win.removeListBoxItems("lstDatabase", 0, self.win.getListBoxItemCount("lstDatabase"))
+                for i in range(len(aVal[1])):
+                    self.lstDatabase.addItem(aVal[1][i],i)
+        except Exception, e:
+            print "Exception: %s\n", repr(e)
+
+
+if __name__<>"package" and __name__=="__main__":
+    ServerParameter(None)
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( ServerParameter, "org.openoffice.openerp.report.serverparam", ("com.sun.star.task.Job",),)
+
diff --git a/addons/base_report_designer/report_desinger/openoffice_report/script/__init__.py b/addons/base_report_designer/report_desinger/openoffice_report/script/__init__.py
new file mode 100755
index 00000000000..3ecd05aa6da
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report/script/__init__.py
@@ -0,0 +1,6 @@
+import lib
+import Change
+import ServerParameter
+import LoginTest
+import About
+import AddAttachment
diff --git a/addons/base_report_designer/report_desinger/openoffice_report/script/import b/addons/base_report_designer/report_desinger/openoffice_report/script/import
new file mode 100755
index 00000000000..e14c925b619
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report/script/import
@@ -0,0 +1,2 @@
+__name__="package"
+
diff --git a/addons/base_report_designer/report_desinger/openoffice_report/script/lib/__init__.py b/addons/base_report_designer/report_desinger/openoffice_report/script/lib/__init__.py
new file mode 100755
index 00000000000..0227903f9e6
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report/script/lib/__init__.py
@@ -0,0 +1,4 @@
+import actions
+import error
+import functions
+import gui
\ No newline at end of file
diff --git a/addons/base_report_designer/report_desinger/openoffice_report/script/lib/actions.py b/addons/base_report_designer/report_desinger/openoffice_report/script/lib/actions.py
new file mode 100755
index 00000000000..4f553346c45
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report/script/lib/actions.py
@@ -0,0 +1,64 @@
+import uno
+import unohelper
+import os
+#--------------------------------------------------
+# An ActionListener adapter.
+# This object implements com.sun.star.awt.XActionListener.
+# When actionPerformed is called, this will call an arbitrary
+#  python procedure, passing it...
+#   1. the oActionEvent
+#   2. any other parameters you specified to this object's constructor (as a tuple).
+if __name__<>"package":
+    os.system( "ooffice '-accept=socket,host=localhost,port=2002;urp;'" )
+passwd=""
+database=""
+uid=""
+loginstatus=False
+from com.sun.star.awt import XActionListener
+class ActionListenerProcAdapter( unohelper.Base, XActionListener ):
+    def __init__( self, oProcToCall, tParams=() ):
+        self.oProcToCall = oProcToCall # a python procedure
+        self.tParams = tParams # a tuple
+
+    # oActionEvent is a com.sun.star.awt.ActionEvent struct.
+    def actionPerformed( self, oActionEvent ):
+        if callable( self.oProcToCall ):
+            apply( self.oProcToCall, (oActionEvent,) + self.tParams )
+
+#--------------------------------------------------
+# An ItemListener adapter.
+# This object implements com.sun.star.awt.XItemListener.
+# When itemStateChanged is called, this will call an arbitrary
+#  python procedure, passing it...
+#   1. the oItemEvent
+#   2. any other parameters you specified to this object's constructor (as a tuple).
+from com.sun.star.awt import XItemListener
+class ItemListenerProcAdapter( unohelper.Base, XItemListener ):
+    def __init__( self, oProcToCall, tParams=() ):
+        self.oProcToCall = oProcToCall # a python procedure
+        self.tParams = tParams # a tuple
+
+    # oItemEvent is a com.sun.star.awt.ItemEvent struct.
+    def itemStateChanged( self, oItemEvent ):
+        if callable( self.oProcToCall ):
+            apply( self.oProcToCall, (oItemEvent,) + self.tParams )
+
+#--------------------------------------------------
+# An TextListener adapter.
+# This object implements com.sun.star.awt.XTextistener.
+# When textChanged is called, this will call an arbitrary
+#  python procedure, passing it...
+#   1. the oTextEvent
+#   2. any other parameters you specified to this object's constructor (as a tuple).
+from com.sun.star.awt import XTextListener
+class TextListenerProcAdapter( unohelper.Base, XTextListener ):
+    def __init__( self, oProcToCall, tParams=() ):
+        self.oProcToCall = oProcToCall # a python procedure
+        self.tParams = tParams # a tuple
+
+    # oTextEvent is a com.sun.star.awt.TextEvent struct.
+    def textChanged( self, oTextEvent ):
+        if callable( self.oProcToCall ):
+            apply( self.oProcToCall, (oTextEvent,) + self.tParams )
+
+
diff --git a/addons/base_report_designer/report_desinger/openoffice_report/script/lib/error.py b/addons/base_report_designer/report_desinger/openoffice_report/script/lib/error.py
new file mode 100755
index 00000000000..2dd692723f9
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report/script/lib/error.py
@@ -0,0 +1,13 @@
+if __name__<>"package":
+    from gui import *
+class ErrorDialog:
+    def __init__(self,sErrorMsg, sErrorHelpMsg="",sTitle="Error Message"):
+        self.win = DBModalDialog(50, 50, 150, 90, sTitle)
+        self.win.addFixedText("lblErrMsg", 5, 5, 190, 25, sErrorMsg)
+        self.win.addFixedText("lblErrHelpMsg", 5, 30, 190, 25, sErrorHelpMsg)
+        self.win.addButton('btnOK', 55,-5,40,15,'Ok'
+                     ,actionListenerProc = self.btnOkOrCancel_clicked )
+        self.win.doModalDialog("",None)
+    def btnOkOrCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
diff --git a/addons/base_report_designer/report_desinger/openoffice_report/script/lib/functions.py b/addons/base_report_designer/report_desinger/openoffice_report/script/lib/functions.py
new file mode 100755
index 00000000000..91e2a43e994
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report/script/lib/functions.py
@@ -0,0 +1,296 @@
+import uno
+import xmlrpclib
+import re
+import socket
+import cPickle
+import marshal
+import tempfile
+if __name__<>"package":
+    from gui import *
+    database="test"
+    uid = 3
+
+def genTree(object,aList,insField,host,level=3, ending=[], ending_excl=[], recur=[], root='', actualroot=""):
+    try:
+        sock = xmlrpclib.ServerProxy(host+'/xmlrpc/object')
+        desktop=getDesktop()
+        doc =desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        res = sock.execute(database, uid, docinfo.getUserFieldValue(1), object , 'fields_get')
+        key = res.keys()
+        key.sort()
+        for k in key:
+            if (not ending or res[k]['type'] in ending) and ((not ending_excl) or not (res[k]['type'] in ending_excl)):
+                insField.addItem(root+'/'+res[k]["string"],len(aList))
+                aList.append(actualroot+'/'+k)
+            if (res[k]['type'] in recur) and (level>0):
+                genTree(res[k]['relation'],aList,insField,host ,level-1, ending, ending_excl, recur,root+'/'+res[k]["string"],actualroot+'/'+k)
+    except:
+        import traceback;traceback.print_exc()
+
+def VariableScope(oTcur,insVariable,aObjectList,aComponentAdd,aItemList,sTableName=""):
+    if sTableName.find(".") != -1:
+        print sTableName,1
+	for i in range(len(aItemList)):
+            if aComponentAdd[i]==sTableName:
+		sLVal=aItemList[i][1][aItemList[i][1].find(",'")+2:aItemList[i][1].find("')")]
+                for j in range(len(aObjectList)):
+		    if aObjectList[j][:aObjectList[j].find("(")] == sLVal:
+                        insVariable.append(aObjectList[j])
+	VariableScope(oTcur,insVariable,aObjectList,aComponentAdd,aItemList, sTableName[:sTableName.rfind(".")])
+    else:
+	for i in range(len(aItemList)):
+            if aComponentAdd[i]==sTableName:
+		sLVal=aItemList[i][1][aItemList[i][1].find(",'")+2:aItemList[i][1].find("')")]
+                for j in range(len(aObjectList)):
+		    if aObjectList[j][:aObjectList[j].find("(")] == sLVal and sLVal!="":
+                        print aObjectList[j]
+                        insVariable.append(aObjectList[j])
+
+def getList(aObjectList,host,count):
+    desktop=getDesktop()
+    doc =desktop.getCurrentComponent()
+    docinfo=doc.getDocumentInfo()
+    sMain=""
+    if not count == 0:
+        if count >= 1:
+            oParEnum = doc.getTextFields().createEnumeration()
+            while oParEnum.hasMoreElements():
+                oPar = oParEnum.nextElement()
+                if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+                    sItem=oPar.Items[1]
+		    if sItem[sItem.find("(")+1:sItem.find(",")]=="objects":
+			sMain = sItem[sItem.find(",'")+2:sItem.find("')")]
+            oParEnum = doc.getTextFields().createEnumeration()
+            aObjectList.append("List of " + docinfo.getUserFieldValue(3))
+            while oParEnum.hasMoreElements():
+                oPar = oParEnum.nextElement()
+                if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+                    sItem=oPar.Items[1]
+		    if sItem[sItem.find("[[ ")+3:sItem.find("(")]=="repeatIn":
+			if sItem[sItem.find("(")+1:sItem.find(",")]=="objects":
+			    aObjectList.append(sItem[sItem.rfind(",'")+2:sItem.rfind("')")] + "(" + docinfo.getUserFieldValue(3) + ")")
+                        else:
+			    sTemp=sItem[sItem.find("(")+1:sItem.find(",")]
+			    if sMain == sTemp[:sTemp.find(".")]:
+				getRelation(docinfo.getUserFieldValue(3), sItem[sItem.find(".")+1:sItem.find(",")], sItem[sItem.find(",'")+2:sItem.find("')")],aObjectList,host)
+                            else:
+				sPath=getPath(sItem[sItem.find("(")+1:sItem.find(",")], sMain)
+				getRelation(docinfo.getUserFieldValue(3), sPath[sPath.find(".")+1:], sItem[sItem.find(",'")+2:sItem.find("')")],aObjectList,host)
+    else:
+        aObjectList.append("List of " + docinfo.getUserFieldValue(3))
+
+def getRelation(sRelName, sItem, sObjName, aObjectList, host ):
+        sock = xmlrpclib.ServerProxy(host+'/xmlrpc/object')
+        desktop=getDesktop()
+        doc =desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        res = sock.execute(database, uid, docinfo.getUserFieldValue(1), sRelName , 'fields_get')
+        key = res.keys()
+        for k in key:
+            if sItem.find(".") == -1:
+                if k == sItem:
+                    aObjectList.append(sObjName + "(" + res[k]['relation'] + ")")
+                    return 0
+	    if k == sItem[:sItem.find(".")]:
+		getRelation(res[k]['relation'], sItem[sItem.find(".")+1:], sObjName,aObjectList,host)
+
+
+def getPath(sPath,sMain):
+    desktop=getDesktop()
+    doc =desktop.getCurrentComponent()
+    oParEnum = doc.getTextFields().createEnumeration()
+    while oParEnum.hasMoreElements():
+        oPar = oParEnum.nextElement()
+        if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+            sItem=oPar.Items[1]
+	    if sPath[:sPath.find(".")] == sMain:
+                break;
+            else:
+                res = re.findall('\\[\\[ *([a-zA-Z0-9_\.]+) *\\]\\]',sPath)
+                if len(res) <> 0:
+		    if sItem[sItem.find(",'")+2:sItem.find("')")] == sPath[:sPath.find(".")]:
+			sPath =  sItem[sItem.find("(")+1:sItem.find(",")] + sPath[sPath.find("."):]
+                        getPath(sPath, sMain)
+    return sPath
+
+def EnumDocument(aItemList,aComponentAdd):
+    desktop = getDesktop()
+    parent=""
+    bFlag = False
+    Doc =desktop.getCurrentComponent()
+    #oVC = Doc.CurrentController.getViewCursor()
+    oParEnum = Doc.getTextFields().createEnumeration()
+    while oParEnum.hasMoreElements():
+        oPar = oParEnum.nextElement()
+        if oPar.Anchor.TextTable:
+            #parent = oPar.Anchor.TextTable.Name
+            getChildTable(oPar.Anchor.TextTable,aItemList,aComponentAdd)
+        elif oPar.Anchor.TextSection:
+            parent = oPar.Anchor.TextSection.Name
+        elif oPar.Anchor.Text:
+            parent = "Document"
+        sItem=oPar.Items[1]
+	if sItem[sItem.find("[[ ")+3:sItem.find("(")]=="repeatIn" and not oPar.Items in aItemList:
+	    aItemList.append( oPar.Items )
+	    aComponentAdd.append( parent )
+
+def getChildTable(oPar,aItemList,aComponentAdd,sTableName=""):
+    sNames = oPar.getCellNames()
+    bEmptyTableFlag=True
+    for val in sNames:
+        oCell = oPar.getCellByName(val)
+        oCurEnum = oCell.createEnumeration()
+        while oCurEnum.hasMoreElements():
+            try:
+                oCur = oCurEnum.nextElement()
+
+                if oCur.supportsService("com.sun.star.text.TextTable"):
+                    if sTableName=="":
+                        print 2
+                        getChildTable(oCur,aItemList,aComponentAdd,oPar.Name)
+                    else:
+                        print 1
+                        getChildTable(oCur,aItemList,aComponentAdd,sTableName+"."+oPar.Name)
+                else:
+                    oSecEnum = oCur.createEnumeration()
+                    while oSecEnum.hasMoreElements():
+                        oSubSection = oSecEnum.nextElement()
+                        if oSubSection.supportsService("com.sun.star.text.TextField"):
+                            bEmptyTableFlag=False
+                            sItem=oSubSection.TextField.Items[1]
+			    if sItem[sItem.find("[[ ")+3:sItem.find("(")]=="repeatIn":
+                                if aItemList.__contains__(oSubSection.TextField.Items)==False:
+                                    aItemList.append(oSubSection.TextField.Items)
+                                if sTableName=="":
+                                    if  aComponentAdd.__contains__(oPar.Name)==False:
+                                        aComponentAdd.append(oPar.Name)
+                                else:
+                                    if aComponentAdd.__contains__(sTableName+"."+oPar.Name)==False:
+                                        aComponentAdd.append(sTableName+"."+oPar.Name)
+
+            except:
+                import traceback;traceback.print_exc()
+    if bEmptyTableFlag==True:
+        aItemList.append((u'',u''))
+        if sTableName=="":
+            if  aComponentAdd.__contains__(oPar.Name)==False:
+                aComponentAdd.append(oPar.Name)
+        else:
+            if aComponentAdd.__contains__(sTableName+"."+oPar.Name)==False:
+                aComponentAdd.append(sTableName+"."+oPar.Name)
+    return 0
+
+def getRecersiveSection(oCurrentSection,aSectionList):
+        desktop=getDesktop()
+        doc =desktop.getCurrentComponent()
+        oParEnum=doc.getText().createEnumeration()
+        aSectionList.append(oCurrentSection.Name)
+        if oCurrentSection.ParentSection:
+            getRecersiveSection(oCurrentSection.ParentSection,aSectionList)
+        else:
+            return
+def getConnectionStatus(url):
+    m = re.match('^(http[s]?://|socket://)([\w.\-]+):(\d{1,5})$', url or '')
+    if not m:
+        return -1
+    if m.group(1) == 'http://' or m.group(1) == 'https://':
+        sock = xmlrpclib.ServerProxy(url + '/xmlrpc/db')
+        try:
+            return sock.list()
+        except:
+            return -1
+    else:
+        sock = mysocket
+        #sock = xmlrpclib.ServerProxy(url + '/xmlrpc/common')
+        try:
+            sock.connect(m.group(2), int(m.group(3)))
+            sock.mysend(('db', 'list'))
+            res = sock.myreceive()
+            sock.disconnect()
+            return res
+        except Exception, e:
+            return -1
+
+class Myexception(Exception):
+    def __init__(self, faultCode, faultString):
+        self.faultCode = faultCode
+        self.faultString = faultString
+
+class mysocket:
+    def __init__(self, sock=None):
+        if sock is None:
+            self.sock = socket.socket(
+            socket.AF_INET, socket.SOCK_STREAM)
+        else:
+            self.sock = sock
+        self.sock.settimeout(60)
+    def connect(self, host, port=False):
+        if not port:
+            protocol, buf = host.split('//')
+            host, port = buf.split(':')
+        self.sock.connect((host, int(port)))
+    def disconnect(self):
+        self.sock.shutdown(socket.SHUT_RDWR)
+        self.sock.close()
+    def mysend(self, msg, exception=False, traceback=None):
+        msg = cPickle.dumps([msg,traceback])
+        size = len(msg)
+        self.sock.send('%8d' % size)
+        self.sock.send(exception and "1" or "0")
+        totalsent = 0
+        while totalsent < size:
+            sent = self.sock.send(msg[totalsent:])
+            if sent == 0:
+                raise RuntimeError, "socket connection broken"
+            totalsent = totalsent + sent
+    def myreceive(self):
+        buf=''
+        while len(buf) < 8:
+            chunk = self.sock.recv(8 - len(buf))
+            if chunk == '':
+                raise RuntimeError, "socket connection broken"
+            buf += chunk
+        size = int(buf)
+        buf = self.sock.recv(1)
+        if buf != "0":
+            exception = buf
+        else:
+            exception = False
+        msg = ''
+        while len(msg) < size:
+            chunk = self.sock.recv(size-len(msg))
+            if chunk == '':
+                raise RuntimeError, "socket connection broken"
+            msg = msg + chunk
+        res = cPickle.loads(msg)
+        if isinstance(res[0],Exception):
+            if exception:
+                raise Myexception(str(res[0]), str(res[1]))
+            raise res[0]
+        else:
+            return res[0]
+
+def GetAFileName():
+    oFileDialog=None
+    iAccept=None
+    sPath=""
+    InitPath=""
+    oUcb=None
+    oFileDialog = createUnoService("com.sun.star.ui.dialogs.FilePicker")
+    oUcb = createUnoService("com.sun.star.ucb.SimpleFileAccess")
+    oFileDialog.appendFilter("OpenERP Report File","*.sxw")
+    oFileDialog.setCurrentFilter("OpenERP Report File")
+    if InitPath == "":
+        InitPath =tempfile.gettempdir()
+    #End If
+    if oUcb.exists(InitPath):
+        oFileDialog.setDisplayDirectory(InitPath)
+    #End If
+    iAccept = oFileDialog.execute()
+    if iAccept == 1:
+        sPath = oFileDialog.Files[0]
+    oFileDialog.dispose()
+    return sPath
+
+
diff --git a/addons/base_report_designer/report_desinger/openoffice_report/script/lib/gui.py b/addons/base_report_designer/report_desinger/openoffice_report/script/lib/gui.py
new file mode 100755
index 00000000000..0e41e34f32b
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report/script/lib/gui.py
@@ -0,0 +1,758 @@
+import uno
+import unohelper
+if __name__<>"package":
+    from actions import *
+
+
+#------------------------------------------------------------
+#   Uno ServiceManager access
+#   A different version of this routine and global variable
+#    is needed for code running inside a component.
+#------------------------------------------------------------
+
+
+# The ServiceManager of the running OOo.
+# It is cached in a global variable.
+goServiceManager = False
+def getServiceManager( cHost="localhost", cPort="2002" ):
+    """Get the ServiceManager from the running OpenOffice.org.
+        Then retain it in the global variable goServiceManager for future use.
+        This is similar to the GetProcessServiceManager() in OOo Basic.
+    """
+    global goServiceManager
+    if not goServiceManager:
+        # Get the uno component context from the PyUNO runtime
+        oLocalContext = uno.getComponentContext()
+        # Create the UnoUrlResolver on the Python side.
+
+        # Connect to the running OpenOffice.org and get its context.
+        if __name__<>"package":
+            oLocalResolver = oLocalContext.ServiceManager.createInstanceWithContext(
+                                    "com.sun.star.bridge.UnoUrlResolver", oLocalContext )
+            oContext = oLocalResolver.resolve( "uno:socket,host=" + cHost + ",port=" + cPort + ";urp;StarOffice.ComponentContext" )
+        # Get the ServiceManager object
+            goServiceManager = oContext.ServiceManager
+        else:
+            goServiceManager=oLocalContext.ServiceManager
+
+    return goServiceManager
+
+
+#------------------------------------------------------------
+#   Uno convenience functions
+#   The stuff in this section is just to make
+#    python progrmaming of OOo more like using OOo Basic.
+#------------------------------------------------------------
+
+
+# This is the same as ServiceManager.createInstance( ... )
+def createUnoService( cClass ):
+    """A handy way to create a global objects within the running OOo.
+    Similar to the function of the same name in OOo Basic.
+    """
+    oServiceManager = getServiceManager()
+    oObj = oServiceManager.createInstance( cClass )
+    return oObj
+
+
+# The StarDesktop object.  (global like in OOo Basic)
+# It is cached in a global variable.
+StarDesktop = None
+def getDesktop():
+    """An easy way to obtain the Desktop object from a running OOo.
+    """
+    global StarDesktop
+    if StarDesktop == None:
+        StarDesktop = createUnoService( "com.sun.star.frame.Desktop" )
+    return StarDesktop
+# preload the StarDesktop variable.
+#getDesktop()
+
+
+# The CoreReflection object.
+# It is cached in a global variable.
+goCoreReflection = False
+def getCoreReflection():
+    global goCoreReflection
+    if not goCoreReflection:
+        goCoreReflection = createUnoService( "com.sun.star.reflection.CoreReflection" )
+    return goCoreReflection
+
+
+def createUnoStruct( cTypeName ):
+    """Create a UNO struct and return it.
+    Similar to the function of the same name in OOo Basic.
+    """
+    oCoreReflection = getCoreReflection()
+    # Get the IDL class for the type name
+    oXIdlClass = oCoreReflection.forName( cTypeName )
+    # Create the struct.
+    oReturnValue, oStruct = oXIdlClass.createObject( None )
+    return oStruct
+
+#------------------------------------------------------------
+#   API helpers
+#------------------------------------------------------------
+
+def hasUnoInterface( oObject, cInterfaceName ):
+    """Similar to Basic's HasUnoInterfaces() function, but singular not plural."""
+
+    # Get the Introspection service.
+    oIntrospection = createUnoService( "com.sun.star.beans.Introspection" )
+
+    # Now inspect the object to learn about it.
+    oObjInfo = oIntrospection.inspect( oObject )
+
+    # Obtain an array describing all methods of the object.
+    oMethods = oObjInfo.getMethods( uno.getConstantByName( "com.sun.star.beans.MethodConcept.ALL" ) )
+    # Now look at every method.
+    for oMethod in oMethods:
+        # Check the method's interface to see if
+        #  these aren't the droids you're looking for.
+        cMethodInterfaceName = oMethod.getDeclaringClass().getName()
+        if cMethodInterfaceName == cInterfaceName:
+            return True
+    return False
+
+def hasUnoInterfaces( oObject, *cInterfaces ):
+    """Similar to the function of the same name in OOo Basic."""
+    for cInterface in cInterfaces:
+        if not hasUnoInterface( oObject, cInterface ):
+            return False
+    return True
+
+#------------------------------------------------------------
+#   High level general purpose functions
+#------------------------------------------------------------
+
+
+def makePropertyValue( cName=None, uValue=None, nHandle=None, nState=None ):
+    """Create a com.sun.star.beans.PropertyValue struct and return it.
+    """
+    oPropertyValue = createUnoStruct( "com.sun.star.beans.PropertyValue" )
+
+    if cName != None:
+        oPropertyValue.Name = cName
+    if uValue != None:
+        oPropertyValue.Value = uValue
+    if nHandle != None:
+        oPropertyValue.Handle = nHandle
+    if nState != None:
+        oPropertyValue.State = nState
+
+    return oPropertyValue
+
+
+def makePoint( nX, nY ):
+    """Create a com.sun.star.awt.Point struct."""
+    oPoint = createUnoStruct( "com.sun.star.awt.Point" )
+    oPoint.X = nX
+    oPoint.Y = nY
+    return oPoint
+
+
+def makeSize( nWidth, nHeight ):
+    """Create a com.sun.star.awt.Size struct."""
+    oSize = createUnoStruct( "com.sun.star.awt.Size" )
+    oSize.Width = nWidth
+    oSize.Height = nHeight
+    return oSize
+
+
+def makeRectangle( nX, nY, nWidth, nHeight ):
+    """Create a com.sun.star.awt.Rectangle struct."""
+    oRect = createUnoStruct( "com.sun.star.awt.Rectangle" )
+    oRect.X = nX
+    oRect.Y = nY
+    oRect.Width = nWidth
+    oRect.Height = nHeight
+    return oRect
+
+
+def Array( *args ):
+    """This is just sugar coating so that code from OOoBasic which
+    contains the Array() function can work perfectly in python."""
+    tArray = ()
+    for arg in args:
+        tArray += (arg,)
+    return tArray
+
+
+def loadComponentFromURL( cUrl, tProperties=() ):
+    """Open or Create a document from it's URL.
+    New documents are created from URL's such as:
+        private:factory/sdraw
+        private:factory/swriter
+        private:factory/scalc
+        private:factory/simpress
+    """
+    StarDesktop = getDesktop()
+    oDocument = StarDesktop.loadComponentFromURL( cUrl, "_blank", 0, tProperties )
+    return oDocument
+
+
+#------------------------------------------------------------
+#   Styles
+#------------------------------------------------------------
+
+
+def defineStyle( oDrawDoc, cStyleFamily, cStyleName, cParentStyleName=None ):
+    """Add a new style to the style catalog if it is not already present.
+    This returns the style object so that you can alter its properties.
+    """
+
+    oStyleFamily = oDrawDoc.getStyleFamilies().getByName( cStyleFamily )
+
+    # Does the style already exist?
+    if oStyleFamily.hasByName( cStyleName ):
+        # then get it so we can return it.
+        oStyle = oStyleFamily.getByName( cStyleName )
+    else:
+        # Create new style object.
+        oStyle = oDrawDoc.createInstance( "com.sun.star.style.Style" )
+
+        # Set its parent style
+        if cParentStyleName != None:
+            oStyle.setParentStyle( cParentStyleName )
+
+        # Add the new style to the style family.
+        oStyleFamily.insertByName( cStyleName, oStyle )
+
+    return oStyle
+
+
+def getStyle( oDrawDoc, cStyleFamily, cStyleName ):
+    """Lookup and return a style from the document.
+    """
+    return oDrawDoc.getStyleFamilies().getByName( cStyleFamily ).getByName( cStyleName )
+
+#------------------------------------------------------------
+#   General Utility functions
+#------------------------------------------------------------
+
+
+def convertToURL( cPathname ):
+    """Convert a Windows or Linux pathname into an OOo URL."""
+    if len( cPathname ) > 1:
+        if cPathname[1:2] == ":":
+            cPathname = "/" + cPathname[0] + "|" + cPathname[2:]
+    cPathname = cPathname.replace( "\\", "/" )
+    cPathname = "file://" + cPathname
+    return cPathname
+
+# The global Awt Toolkit.
+# This is initialized the first time it is needed.
+#goAwtToolkit = createUnoService( "com.sun.star.awt.Toolkit" )
+goAwtToolkit = None
+
+def getAwtToolkit():
+    global goAwtToolkit
+    if goAwtToolkit == None:
+        goAwtToolkit = createUnoService( "com.sun.star.awt.Toolkit" )
+    return goAwtToolkit
+
+# This class builds dialog boxes.
+# This can be used in two different ways...
+# 1. by subclassing it (elegant)
+# 2. without subclassing it (less elegant)
+class DBModalDialog:
+    """Class to build a dialog box from the com.sun.star.awt.* services.
+    This doesn't do anything you couldn't already do using OOo's UNO API,
+     this just makes it much easier.
+    You can change the dialog box size, position, title, etc.
+    You can add controls, and listeners for those controls to the dialog box.
+    This class can be used by subclassing it, or without subclassing it.
+    """
+    def __init__( self, nPositionX=None, nPositionY=None, nWidth=None, nHeight=None, cTitle=None ):
+        self.oDialogModel = createUnoService( "com.sun.star.awt.UnoControlDialogModel" )
+        if nPositionX != None:  self.oDialogModel.PositionX = nPositionX
+        if nPositionY != None:  self.oDialogModel.PositionY = nPositionY
+        if nWidth     != None:  self.oDialogModel.Width     = nWidth
+        if nHeight    != None:  self.oDialogModel.Height    = nHeight
+        if cTitle     != None:  self.oDialogModel.Title     = cTitle
+        self.oDialogControl = createUnoService( "com.sun.star.awt.UnoControlDialog" )
+        self.oDialogControl.setModel( self.oDialogModel )
+
+    def release( self ):
+        """Release resources.
+        After calling this, you can no longer use this object.
+        """
+        self.oDialogControl.dispose()
+
+    #--------------------------------------------------
+    #   Dialog box adjustments
+    #--------------------------------------------------
+
+    def setDialogPosition( self, nX, nY ):
+        self.oDialogModel.PositionX = nX
+        self.oDialogModel.PositionY = nY
+
+    def setDialogSize( self, nWidth, nHeight ):
+        self.oDialogModel.Width = nWidth
+        self.oDialogModel.Height = nHeight
+
+    def setDialogTitle( self, cCaption ):
+        self.oDialogModel.Title = cCaption
+
+    def setVisible( self, bVisible ):
+        self.oDialogControl.setVisible( bVisible )
+
+
+    #--------------------------------------------------
+    #   com.sun.star.awt.UnoControlButton
+    #--------------------------------------------------
+
+    # After you add a Button control, you can call self.setControlModelProperty()
+    #  passing any of the properties for a...
+    #       com.sun.star.awt.UnoControlButtonModel
+    #       com.sun.star.awt.UnoControlDialogElement
+    #       com.sun.star.awt.UnoControlModel
+    def addButton( self, cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                       cLabel=None,
+                       actionListenerProc=None,
+                       nTabIndex=None ):
+        self.addControl( "com.sun.star.awt.UnoControlButtonModel",
+                         cCtrlName, nPositionX, nPositionY, nWidth, nHeight, bDropdown=None,
+                         cLabel=cLabel,
+                         nTabIndex=nTabIndex )
+        if actionListenerProc != None:
+            self.addActionListenerProc( cCtrlName, actionListenerProc )
+
+    def setButtonLabel( self, cCtrlName, cLabel ):
+        """Set the label of the control."""
+        oControl = self.getControl( cCtrlName )
+        oControl.setLabel( cLabel )
+
+    #--------------------------------------------------
+    #   com.sun.star.awt.UnoControlEditModel
+    #--------------------------------------------------
+    def addEdit( self, cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                        cText=None,
+                        textListenerProc=None ):
+        """Add a Edit control to the window."""
+        self.addControl( "com.sun.star.awt.UnoControlEditModel",
+            cCtrlName, nPositionX, nPositionY, nWidth, nHeight, bDropdown=None)
+
+        if cText != None:
+            self.setEditText( cCtrlName, cText )
+        if textListenerProc != None:
+            self.addTextListenerProc( cCtrlName, textListenerProc )
+
+    #--------------------------------------------------
+    #   com.sun.star.awt.UnoControlCheckBox
+    #--------------------------------------------------
+
+    # After you add a CheckBox control, you can call self.setControlModelProperty()
+    #  passing any of the properties for a...
+    #       com.sun.star.awt.UnoControlCheckBoxModel
+    #       com.sun.star.awt.UnoControlDialogElement
+    #       com.sun.star.awt.UnoControlModel
+    def addCheckBox( self, cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                       cLabel=None,
+                       itemListenerProc=None,
+                       nTabIndex=None ):
+        self.addControl( "com.sun.star.awt.UnoControlCheckBoxModel",
+                         cCtrlName, nPositionX, nPositionY, nWidth, nHeight, bDropdown=None,
+                         cLabel=cLabel,
+                         nTabIndex=nTabIndex )
+        if itemListenerProc != None:
+            self.addItemListenerProc( cCtrlName, itemListenerProc )
+
+    def setEditText( self, cCtrlName, cText ):
+        """Set the text of the edit box."""
+        oControl = self.getControl( cCtrlName )
+        oControl.setText( cText )
+
+    def getEditText( self, cCtrlName):
+        """Set the text of the edit box."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.getText()
+
+    def setCheckBoxLabel( self, cCtrlName, cLabel ):
+        """Set the label of the control."""
+        oControl = self.getControl( cCtrlName )
+        oControl.setLabel( cLabel )
+
+    def getCheckBoxState( self, cCtrlName ):
+        """Get the state of the control."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.getState();
+
+    def setCheckBoxState( self, cCtrlName, nState ):
+        """Set the state of the control."""
+        oControl = self.getControl( cCtrlName )
+        oControl.setState( nState )
+
+    def enableCheckBoxTriState( self, cCtrlName, bTriStateEnable ):
+        """Enable or disable the tri state mode of the control."""
+        oControl = self.getControl( cCtrlName )
+        oControl.enableTriState( bTriStateEnable )
+
+
+    #--------------------------------------------------
+    #   com.sun.star.awt.UnoControlFixedText
+    #--------------------------------------------------
+
+    def addFixedText( self, cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                        cLabel=None ):
+        self.addControl( "com.sun.star.awt.UnoControlFixedTextModel",
+                         cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                         bDropdown=None,
+                         cLabel=cLabel )
+
+	return self.getControl( cCtrlName )
+
+    #--------------------------------------------------
+    #   Add Controls to dialog
+    #--------------------------------------------------
+
+    def addControl( self, cCtrlServiceName,
+                        cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                        bDropdown=None,
+                        cLabel=None,
+                        nTabIndex=None,
+                        sImagePath=None,
+                         ):
+        oControlModel = self.oDialogModel.createInstance( cCtrlServiceName )
+        self.oDialogModel.insertByName( cCtrlName, oControlModel )
+
+        # if negative coordinates are given for X or Y position,
+        #  then make that coordinate be relative to the right/bottom
+        #  edge of the dialog box instead of to the left/top.
+        if nPositionX < 0: nPositionX = self.oDialogModel.Width  + nPositionX - nWidth
+        if nPositionY < 0: nPositionY = self.oDialogModel.Height + nPositionY - nHeight
+        oControlModel.PositionX = nPositionX
+        oControlModel.PositionY = nPositionY
+        oControlModel.Width = nWidth
+        oControlModel.Height = nHeight
+        oControlModel.Name = cCtrlName
+
+        if bDropdown != None:
+            oControlModel.Dropdown = bDropdown
+
+        if cLabel != None:
+            oControlModel.Label = cLabel
+
+        if nTabIndex != None:
+            oControlModel.TabIndex = nTabIndex
+
+        if sImagePath != None:
+            oControlModel.ImageURL = sImagePath
+    #--------------------------------------------------
+    #   Access controls and control models
+    #--------------------------------------------------
+
+    #--------------------------------------------------
+    #   com.sun.star.awt.UnoContorlListBoxModel
+    #--------------------------------------------------
+
+
+    def addComboListBox( self, cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                        bDropdown=True,
+                        itemListenerProc=None,
+                        actionListenerProc=None ):
+        mod = self.addControl( "com.sun.star.awt.UnoControlListBoxModel",
+                         cCtrlName, nPositionX, nPositionY, nWidth, nHeight,bDropdown)
+        if itemListenerProc != None:
+            self.addItemListenerProc( cCtrlName, itemListenerProc )
+
+    def addListBoxItems( self, cCtrlName, tcItemTexts, nPosition=0 ):
+        """Add a tupple of items to the ListBox at specified position."""
+        oControl = self.getControl( cCtrlName )
+        oControl.addItems( tcItemTexts, nPosition )
+
+    def selectListBoxItem( self, cCtrlName, cItemText, bSelect=True ):
+        """Selects/Deselects the ispecified item."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.selectItem( cItemText, bSelect )
+
+    def selectListBoxItemPos( self, cCtrlName, nItemPos, bSelect=True ):
+        """Select/Deselect the item at the specified position."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.selectItemPos( nItemPos, bSelect )
+
+    def removeListBoxItems( self, cCtrlName, nPosition, nCount=1 ):
+        """Remove items from a ListBox."""
+        oControl = self.getControl( cCtrlName )
+        oControl.removeItems( nPosition, nCount )
+
+    def getListBoxItemCount( self, cCtrlName ):
+        """Get the number of items in a ListBox."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.getItemCount()
+
+    def getListBoxSelectedItem( self, cCtrlName ):
+        """Returns the currently selected item."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.getSelectedItem()
+
+    def getListBoxItem( self, cCtrlName, nPosition ):
+        """Return the item at specified position within the ListBox."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.getItem( nPosition )
+
+    def getListBoxSelectedItemPos(self,cCtrlName):
+
+        oControl = self.getControl( cCtrlName )
+        return oControl.getSelectedItemPos()
+
+    #--------------------------------------------------
+    #   com.sun.star.awt.UnoControlComboBoxModel
+    #--------------------------------------------------
+    def addComboBox( self, cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                        bDropdown=True,
+                        itemListenerProc=None,
+                        actionListenerProc=None ):
+
+        mod = self.addControl( "com.sun.star.awt.UnoControlComboBoxModel",
+                         cCtrlName, nPositionX, nPositionY, nWidth, nHeight,bDropdown)
+
+        if itemListenerProc != None:
+            self.addItemListenerProc( cCtrlName, itemListenerProc )
+        if actionListenerProc != None:
+            self.addActionListenerProc( cCtrlName, actionListenerProc )
+
+
+    def setComboBoxText( self, cCtrlName, cText ):
+        """Set the text of the ComboBox."""
+        oControl = self.getControl( cCtrlName )
+        oControl.setText( cText )
+
+    def getComboBoxText( self, cCtrlName):
+        """Set the text of the ComboBox."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.getText()
+
+    def getComboBoxSelectedText( self, cCtrlName ):
+        """Get the selected text of the ComboBox."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.getSelectedText();
+
+    def getControl( self, cCtrlName ):
+        """Get the control (not its model) for a particular control name.
+        The control returned includes the service com.sun.star.awt.UnoControl,
+         and another control-specific service which inherits from it.
+        """
+        oControl = self.oDialogControl.getControl( cCtrlName )
+        return oControl
+
+    def getControlModel( self, cCtrlName ):
+        """Get the control model (not the control) for a particular control name.
+        The model returned includes the service UnoControlModel,
+         and another control-specific service which inherits from it.
+        """
+        oControl = self.getControl( cCtrlName )
+        oControlModel = oControl.getModel()
+        return oControlModel
+    #---------------------------------------------------
+    #    com.sun.star.awt.UnoControlImageControlModel
+    #---------------------------------------------------
+    def addImageControl( self, cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                        sImagePath="",
+                        itemListenerProc=None,
+                        actionListenerProc=None ):
+
+        mod = self.addControl( "com.sun.star.awt.UnoControlImageControlModel",
+                         cCtrlName, nPositionX, nPositionY, nWidth, nHeight, sImagePath=sImagePath)
+
+        if itemListenerProc != None:
+            self.addItemListenerProc( cCtrlName, itemListenerProc )
+        if actionListenerProc != None:
+            self.addActionListenerProc( cCtrlName, actionListenerProc )
+
+
+    #--------------------------------------------------
+    #   Adjust properties of control models
+    #--------------------------------------------------
+
+    def setControlModelProperty( self, cCtrlName, cPropertyName, uValue ):
+        """Set the value of a property of a control's model.
+        This affects the control model, not the control.
+        """
+        oControlModel = self.getControlModel( cCtrlName )
+        oControlModel.setPropertyValue( cPropertyName, uValue )
+
+    def getControlModelProperty( self, cCtrlName, cPropertyName ):
+        """Get the value of a property of a control's model.
+        This affects the control model, not the control.
+        """
+        oControlModel = self.getControlModel( cCtrlName )
+        return oControlModel.getPropertyValue( cPropertyName )
+
+    #--------------------------------------------------
+    #   Sugar coated property adjustments to control models.
+    #--------------------------------------------------
+
+    def setEnabled( self, cCtrlName, bEnabled=True ):
+        """Supported controls...
+            UnoControlButtonModel
+            UnoControlCheckBoxModel
+        """
+        self.setControlModelProperty( cCtrlName, "Enabled", bEnabled )
+
+    def getEnabled( self, cCtrlName ):
+        """Supported controls...
+            UnoControlButtonModel
+            UnoControlCheckBoxModel
+        """
+
+        return self.getControlModelProperty( cCtrlName, "Enabled" )
+
+    def setState( self, cCtrlName, nState ):
+        """Supported controls...
+            UnoControlButtonModel
+            UnoControlCheckBoxModel
+        """
+        self.setControlModelProperty( cCtrlName, "State", nState )
+
+    def getState( self, cCtrlName ):
+        """Supported controls...
+            UnoControlButtonModel
+            UnoControlCheckBoxModel
+        """
+        return self.getControlModelProperty( cCtrlName, "State" )
+
+    def setLabel( self, cCtrlName, cLabel ):
+        """Supported controls...
+            UnoControlButtonModel
+            UnoControlCheckBoxModel
+        """
+        self.setControlModelProperty( cCtrlName, "Label", cLabel )
+
+    def getLabel( self, cCtrlName ):
+        """Supported controls...
+            UnoControlButtonModel
+            UnoControlCheckBoxModel
+        """
+        return self.getControlModelProperty( cCtrlName, "Label" )
+
+    def setHelpText( self, cCtrlName, cHelpText ):
+        """Supported controls...
+            UnoControlButtonModel
+            UnoControlCheckBoxModel
+        """
+        self.setControlModelProperty( cCtrlName, "HelpText", cHelpText )
+
+    def getHelpText( self, cCtrlName ):
+        """Supported controls...
+            UnoControlButtonModel
+            UnoControlCheckBoxModel
+        """
+        return self.getControlModelProperty( cCtrlName, "HelpText" )
+
+
+    #--------------------------------------------------
+    #   Adjust controls (not models)
+    #--------------------------------------------------
+
+    # The following apply to all controls which are a
+    #   com.sun.star.awt.UnoControl
+
+    def setDesignMode( self, cCtrlName, bDesignMode=True ):
+        oControl = self.getControl( cCtrlName )
+        oControl.setDesignMode( bDesignMode )
+
+    def isDesignMode( self, cCtrlName, bDesignMode=True ):
+        oControl = self.getControl( cCtrlName )
+        return oControl.isDesignMode()
+
+    def isTransparent( self, cCtrlName, bDesignMode=True ):
+        oControl = self.getControl( cCtrlName )
+        return oControl.isTransparent()
+
+
+    # The following apply to all controls which are a
+    #   com.sun.star.awt.UnoControlDialogElement
+
+    def setPosition( self, cCtrlName, nPositionX, nPositionY ):
+        self.setControlModelProperty( cCtrlName, "PositionX", nPositionX )
+        self.setControlModelProperty( cCtrlName, "PositionY", nPositionY )
+    def setPositionX( self, cCtrlName, nPositionX ):
+        self.setControlModelProperty( cCtrlName, "PositionX", nPositionX )
+    def setPositionY( self, cCtrlName, nPositionY ):
+        self.setControlModelProperty( cCtrlName, "PositionY", nPositionY )
+    def getPositionX( self, cCtrlName ):
+        return self.getControlModelProperty( cCtrlName, "PositionX" )
+    def getPositionY( self, cCtrlName ):
+        return self.getControlModelProperty( cCtrlName, "PositionY" )
+
+    def setSize( self, cCtrlName, nWidth, nHeight ):
+        self.setControlModelProperty( cCtrlName, "Width", nWidth )
+        self.setControlModelProperty( cCtrlName, "Height", nHeight )
+    def setWidth( self, cCtrlName, nWidth ):
+        self.setControlModelProperty( cCtrlName, "Width", nWidth )
+    def setHeight( self, cCtrlName, nHeight ):
+        self.setControlModelProperty( cCtrlName, "Height", nHeight )
+    def getWidth( self, cCtrlName ):
+        return self.getControlModelProperty( cCtrlName, "Width" )
+    def getHeight( self, cCtrlName ):
+        return self.getControlModelProperty( cCtrlName, "Height" )
+
+    def setTabIndex( self, cCtrlName, nWidth, nTabIndex ):
+        self.setControlModelProperty( cCtrlName, "TabIndex", nTabIndex )
+    def getTabIndex( self, cCtrlName ):
+        return self.getControlModelProperty( cCtrlName, "TabIndex" )
+
+    def setStep( self, cCtrlName, nWidth, nStep ):
+        self.setControlModelProperty( cCtrlName, "Step", nStep )
+    def getStep( self, cCtrlName ):
+        return self.getControlModelProperty( cCtrlName, "Step" )
+
+    def setTag( self, cCtrlName, nWidth, cTag ):
+        self.setControlModelProperty( cCtrlName, "Tag", cTag )
+    def getTag( self, cCtrlName ):
+        return self.getControlModelProperty( cCtrlName, "Tag" )
+
+    def setEchoChar(self, cCtrlName , cVal):
+        self.setControlModelProperty(cCtrlName, "EchoChar", cVal)
+    def getEchoChar(self, cCtrlName):
+        return self.setControlModelProperty(cCtrlName, "EchoChar")
+
+    #--------------------------------------------------
+    #   Add listeners to controls.
+    #--------------------------------------------------
+
+    # This applies to...
+    #   UnoControlButton
+    def addActionListenerProc( self, cCtrlName, actionListenerProc ):
+        """Create an com.sun.star.awt.XActionListener object and add it to a control.
+        A listener object is created which will call the python procedure actionListenerProc.
+        The actionListenerProc can be either a method or a global procedure.
+        The following controls support XActionListener:
+            UnoControlButton
+        """
+        oControl = self.getControl( cCtrlName )
+        oActionListener = ActionListenerProcAdapter( actionListenerProc )
+        oControl.addActionListener( oActionListener )
+
+    # This applies to...
+    #   UnoControlCheckBox
+    def addItemListenerProc( self, cCtrlName, itemListenerProc ):
+        """Create an com.sun.star.awt.XItemListener object and add it to a control.
+        A listener object is created which will call the python procedure itemListenerProc.
+        The itemListenerProc can be either a method or a global procedure.
+        The following controls support XActionListener:
+            UnoControlCheckBox
+        """
+        oControl = self.getControl( cCtrlName )
+        oActionListener = ItemListenerProcAdapter( itemListenerProc )
+        oControl.addItemListener( oActionListener )
+
+    #--------------------------------------------------
+    #   Display the modal dialog.
+    #--------------------------------------------------
+
+    def doModalDialog( self, sObjName,sValue):
+        """Display the dialog as a modal dialog."""
+        self.oDialogControl.setVisible( True )
+        if not sValue==None:
+            self.selectListBoxItem( sObjName, sValue, True )
+        self.oDialogControl.execute()
+
+    def endExecute( self ):
+        """Call this from within one of the listeners to end the modal dialog.
+        For instance, the listener on your OK or Cancel button would call this to end the dialog.
+        """
+        self.oDialogControl.endExecute()
+
+
diff --git a/addons/base_report_designer/report_desinger/openoffice_report/script/lib/tools.py b/addons/base_report_designer/report_desinger/openoffice_report/script/lib/tools.py
new file mode 100755
index 00000000000..09e7f96c46e
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report/script/lib/tools.py
@@ -0,0 +1,19 @@
+import urllib
+
+def get_absolute_file_path( url ):
+	url_unquoted = urllib.unquote(url)
+	return os.name == 'nt' and url_unquoted[1:] or url_unquoted 
+
+# This function reads the content of a file and return it to the caller
+def read_data_from_file( filename ):
+	fp = file( filename, "rb" )
+	data = fp.read()
+	fp.close()
+	return data
+
+# This function writes the content to a file
+def write_data_to_file( filename, data ):
+	fp = file( filename, 'wb' )
+	fp.write( data )
+	fp.close()
+
diff --git a/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/Makefile b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/Makefile
new file mode 100755
index 00000000000..9f6f50fe577
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/Makefile
@@ -0,0 +1,42 @@
+ZIP_FILE=openerp_report_designer.zip
+
+all: pack uninstall install
+
+create:
+	cat script/import \
+	    script/lib/actions.py \
+	    script/lib/error.py \
+	    script/lib/functions.py \
+	    script/lib/gui.py \
+	    script/lib/tools.py \
+	    script/lib/logreport.py\
+	    script/lib/rpc.py\
+	    script/lib/tiny_socket.py\
+	    script/Repeatln.py \
+	    script/Fields.py \
+	    script/Expression.py \
+	    script/modify.py \
+	    script/ServerParameter.py \
+	    script/Change.py \
+	    script/NewReport.py \
+	    script/LoginTest.py \
+	    script/ModifyExistingReport.py \
+	    script/SendToServer.py \
+	    script/About.py \
+	    script/ConvertBracesToField.py \
+	    script/ConvertFieldsToBraces.py \
+	    script/ExportToRML.py \
+	    script/Translation.py \
+	    script/AddAttachment.py > package/OpenERPReport.py
+
+pack: clean create
+	zip $(ZIP_FILE) `find package/ | grep -v svn` 
+	
+install:
+	sh /opt/openoffice.org3/program/unopkg add -v $(ZIP_FILE)
+	
+uninstall:
+	sh /opt/openoffice.org3/program/unopkg remove -v  $(ZIP_FILE)
+
+clean:
+	rm -f $(ZIP_FILE)
diff --git a/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/OOo_run.sh b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/OOo_run.sh
new file mode 100755
index 00000000000..a22ff96cf53
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/OOo_run.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+ooffice "-accept=socket,host=localhost,port=2002;urp;"
diff --git a/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/package/Addons.xcu b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/package/Addons.xcu
new file mode 100755
index 00000000000..8c840fd6620
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/package/Addons.xcu
@@ -0,0 +1,636 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<oor:component-data xmlns:oor="http://openoffice.org/2001/registry"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    oor:name="Addons" oor:package="org.openoffice.Office">
+    <node oor:name="AddonUI">
+        <node oor:name="OfficeMenuBar">
+            <node oor:name="org.openoffice.openerp.report" oor:op="replace">
+                <prop oor:name="Title" oor:type="xs:string">
+                    <value/>
+                    <value xml:lang="en-US">Open ERP ~Report</value>
+                    <value xml:lang="fr_FR">Open ERP Rapport</value>
+                </prop>
+                <prop oor:name="Target" oor:type="xs:string">
+                    <value>_self</value>
+                </prop>
+                <prop oor:name="ImageIdentifier" oor:type="xs:string">
+                    <value/>
+                </prop>
+                <node oor:name="Submenu">
+                    <node oor:name="m11" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.serverparam?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Server parameters</value>
+                            <value xml:lang="fr_FR">Paramètres serveur</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m12" oor:op="replace">
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>private:separator</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m21" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.repeatln?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Add a loop</value>
+                           <value xml:lang="fr_FR"> Ajouter une boucle</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m22" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.fields?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Add a field</value>
+                            <value xml:lang="fr_FR">Ajouter un champ</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+
+                    <node oor:name="m23" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.expression?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Add an expression</value>
+                            <value xml:lang="fr_FR">Ajouter une expression</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+
+                    <node oor:name="m24" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.langtag?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Add a lang tag</value>
+                            <value xml:lang="fr_FR">Ajouter un tag lang</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m25" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.modify?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Modify</value>
+                            <value xml:lang="fr_FR">Modifier</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m26" oor:op="replace">
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>private:separator</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m31" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.convertFB?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Conversion Fields -> Brackets</value>
+                            <value xml:lang="fr_FR">Conversion champs -> crochets</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m32" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.convertBF?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Conversion Brackets -> Fields</value>
+                            <value xml:lang="fr_FR">Conversion crochets -> champs</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m33" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.exporttorml?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Export to RML</value>
+                            <value xml:lang="fr_FR">Exporter en RML</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m34" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.addattachment?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Add Attachment</value>
+                            <value xml:lang="fr_FR">Envoyer comme attachement</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m35" oor:op="replace">
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>private:separator</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m41" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.sendtoserver?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Send to the server</value>
+                            <value xml:lang="fr_FR">Envoyer au serveur</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m42" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.opennewreport?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Open a new report</value>
+                            <value xml:lang="fr_FR">Nouveau rapport</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m43" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.modifyreport?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Modify Existing Report</value>
+                            <value xml:lang="fr_FR">Modifier un rapport</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m45" oor:op="replace">
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>private:separator</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m51" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.about?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">About</value>
+                            <value xml:lang="fr_FR">À propos de</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+                </node>
+            </node>
+        </node>
+
+        <node oor:name="OfficeToolBar">
+            <node oor:name="org.openoffice.openerp.report" oor:op="replace">
+                <node oor:name="m11" oor:op="replace">
+                    <prop oor:name="URL" oor:type="xs:string">
+                        <value>service:org.openoffice.openerp.report.serverparam?execute</value>
+                    </prop>
+                    <prop oor:name="ImageIdentifier" oor:type="xs:string">
+                        <value/>
+                    </prop>
+                    <prop oor:name="Title" oor:type="xs:string">
+                        <value/>
+                        <value xml:lang="en-US">Server parameters</value>
+                        <value xml:lang="fr_FR">Paramètres serveur</value>
+                    </prop>
+                    <prop oor:name="Target" oor:type="xs:string">
+                        <value>_self</value>
+                    </prop>
+                    <prop oor:name="Context" oor:type="xs:string">
+                        <value>com.sun.star.text.TextDocument</value>
+                    </prop>
+                </node>
+
+
+                <node oor:name="m12" oor:op="replace">
+                    <prop oor:name="Context" oor:type="xs:string">
+                        <value>com.sun.star.text.TextDocument</value>
+                    </prop>
+                    <prop oor:name="URL" oor:type="xs:string">
+                        <value>private:separator</value>
+                    </prop>
+                </node>
+                <node oor:name="m21" oor:op="replace">
+                    <prop oor:name="URL" oor:type="xs:string">
+                        <value>service:org.openoffice.openerp.report.repeatln?execute</value>
+                    </prop>
+                    <prop oor:name="ImageIdentifier" oor:type="xs:string">
+                        <value/>
+                    </prop>
+                    <prop oor:name="Title" oor:type="xs:string">
+                        <value/>
+                        <value xml:lang="en-US">Add a loop</value>
+                        <value xml:lang="fr_FR">Ajouter une boucle</value>
+                    </prop>
+                    <prop oor:name="Target" oor:type="xs:string">
+                        <value>_self</value>
+                    </prop>
+                    <prop oor:name="Context" oor:type="xs:string">
+                        <value>com.sun.star.text.TextDocument</value>
+                    </prop>
+                </node>
+                <node oor:name="m22" oor:op="replace">
+                    <prop oor:name="URL" oor:type="xs:string">
+                        <value>service:org.openoffice.openerp.report.fields?execute</value>
+                    </prop>
+                    <prop oor:name="ImageIdentifier" oor:type="xs:string">
+                        <value/>
+                    </prop>
+                    <prop oor:name="Title" oor:type="xs:string">
+                        <value/>
+                        <value xml:lang="en-US">Add a field</value>
+                    </prop>
+                    <prop oor:name="Target" oor:type="xs:string">
+                        <value>_self</value>
+                    </prop>
+                    <prop oor:name="Context" oor:type="xs:string">
+                        <value>com.sun.star.text.TextDocument</value>
+                    </prop>
+                </node>
+
+                <node oor:name="m23" oor:op="replace">
+                    <prop oor:name="URL" oor:type="xs:string">
+                        <value>service:org.openoffice.openerp.report.expression?execute</value>
+                    </prop>
+                    <prop oor:name="ImageIdentifier" oor:type="xs:string">
+                        <value/>
+                    </prop>
+                    <prop oor:name="Title" oor:type="xs:string">
+                        <value/>
+                        <value xml:lang="en-US">Add an expression</value>
+                        <value xml:lang="fr_FR">Ajouter une expression</value>>
+                    </prop>
+                    <prop oor:name="Target" oor:type="xs:string">
+                        <value>_self</value>
+                    </prop>
+                    <prop oor:name="Context" oor:type="xs:string">
+                        <value>com.sun.star.text.TextDocument</value>
+                    </prop>
+                </node>
+                <node oor:name="m24" oor:op="replace">
+                    <prop oor:name="URL" oor:type="xs:string">
+                        <value>service:org.openoffice.openerp.report.langtag?execute</value>
+                    </prop>
+                    <prop oor:name="ImageIdentifier" oor:type="xs:string">
+                        <value/>
+                    </prop>
+                    <prop oor:name="Title" oor:type="xs:string">
+                        <value/>
+                        <value xml:lang="en-US">Add a lang tag</value>
+                        <value xml:lang="fr_FR">Ajouter un tag lang</value>
+                    </prop>
+                    <prop oor:name="Target" oor:type="xs:string">
+                        <value>_self</value>
+                    </prop>
+                    <prop oor:name="Context" oor:type="xs:string">
+                        <value>com.sun.star.text.TextDocument</value>
+                    </prop>
+                </node>
+                <node oor:name="m25" oor:op="replace">
+                    <prop oor:name="URL" oor:type="xs:string">
+                        <value>service:org.openoffice.openerp.report.modify?execute</value>
+                    </prop>
+                    <prop oor:name="ImageIdentifier" oor:type="xs:string">
+                        <value/>
+                    </prop>
+                    <prop oor:name="Title" oor:type="xs:string">
+                        <value/>
+                        <value xml:lang="en-US">Modify</value>
+                        <value xml:lang="fr_FR">Modifier</value>
+                    </prop>
+                    <prop oor:name="Target" oor:type="xs:string">
+                        <value>_self</value>
+                    </prop>
+                    <prop oor:name="Context" oor:type="xs:string">
+                        <value>com.sun.star.text.TextDocument</value>
+                    </prop>
+                </node>
+                <node oor:name="m26" oor:op="replace">
+                    <prop oor:name="Context" oor:type="xs:string">
+                        <value>com.sun.star.text.TextDocument</value>
+                    </prop>
+                    <prop oor:name="URL" oor:type="xs:string">
+                        <value>private:separator</value>
+                    </prop>
+                </node>
+                <node oor:name="m31" oor:op="replace">
+                    <prop oor:name="URL" oor:type="xs:string">
+                        <value>service:org.openoffice.openerp.report.convertFB?execute</value>
+                    </prop>
+                    <prop oor:name="ImageIdentifier" oor:type="xs:string">
+                        <value/>
+                    </prop>
+                    <prop oor:name="Title" oor:type="xs:string">
+                        <value/>
+                        <value xml:lang="en-US">Conversion Fields -> Brackets</value>
+                        <value xml:lang="fr_FR">Domaines de conversion -> Supports</value>
+                    </prop>
+                    <prop oor:name="Target" oor:type="xs:string">
+                        <value>_self</value>
+                    </prop>
+                    <prop oor:name="Context" oor:type="xs:string">
+                        <value>com.sun.star.text.TextDocument</value>
+                    </prop>
+                </node>
+                <node oor:name="m32" oor:op="replace">
+                    <prop oor:name="URL" oor:type="xs:string">
+                        <value>service:org.openoffice.openerp.report.convertBF?execute</value>
+                    </prop>
+                    <prop oor:name="ImageIdentifier" oor:type="xs:string">
+                        <value/>
+                    </prop>
+                    <prop oor:name="Title" oor:type="xs:string">
+                        <value/>
+                        <value xml:lang="en-US">Conversion Brackets -> Fields</value>
+                        <value xml:lang="fr_FR">Supports de conversion -> Domaines</value>
+                    </prop>
+                    <prop oor:name="Target" oor:type="xs:string">
+                        <value>_self</value>
+                    </prop>
+                    <prop oor:name="Context" oor:type="xs:string">
+                        <value>com.sun.star.text.TextDocument</value>
+                    </prop>
+                </node>
+                <node oor:name="m33" oor:op="replace">
+                    <prop oor:name="URL" oor:type="xs:string">
+                        <value>service:org.openoffice.openerp.report.exporttorml?execute</value>
+                    </prop>
+                    <prop oor:name="ImageIdentifier" oor:type="xs:string">
+                        <value/>
+                    </prop>
+                    <prop oor:name="Title" oor:type="xs:string">
+                        <value/>
+                        <value xml:lang="en-US">Export to RML</value>
+                        <value xml:lang="fr_FR">RML à l'exportation</value>
+                    </prop>
+                    <prop oor:name="Target" oor:type="xs:string">
+                        <value>_self</value>
+                    </prop>
+                    <prop oor:name="Context" oor:type="xs:string">
+                        <value>com.sun.star.text.TextDocument</value>
+                    </prop>
+                </node>
+                <node oor:name="m45" oor:op="replace">
+                    <prop oor:name="Context" oor:type="xs:string">
+                        <value>com.sun.star.text.TextDocument</value>
+                    </prop>
+                    <prop oor:name="URL" oor:type="xs:string">
+                        <value>private:separator</value>
+                    </prop>
+                </node>
+                <node oor:name="m51" oor:op="replace">
+                    <prop oor:name="URL" oor:type="xs:string">
+                        <value>service:org.openoffice.openerp.report.about?execute</value>
+                    </prop>
+                    <prop oor:name="ImageIdentifier" oor:type="xs:string">
+                        <value/>
+                    </prop>
+                    <prop oor:name="Title" oor:type="xs:string">
+                        <value/>
+                        <value xml:lang="en-US">About</value>
+                        <value xml:lang="fr_FR">À propos de</value>
+                    </prop>
+                    <prop oor:name="Target" oor:type="xs:string">
+                        <value>_self</value>
+                    </prop>
+                    <prop oor:name="Context" oor:type="xs:string">
+                        <value>com.sun.star.text.TextDocument</value>
+                    </prop>
+                </node>
+            </node>
+        </node>
+        <node oor:name="Images">
+            <node oor:name="org.openoffice.openerp.report.image1" oor:op="replace">
+                <prop oor:name="URL">
+                    <value>service:org.openoffice.openerp.report.expression?execute</value>
+                </prop>
+                <node oor:name="UserDefinedImages">
+                    <prop oor:name="ImageSmallURL" oor:type="xs:string">
+                        <value>%origin%/images/expression_s.png</value>
+                    </prop>
+                    <prop oor:name="ImageBigURL" oor:type="xs:string">
+                        <value>%origin%/images/expression_b.png</value>
+                    </prop>
+                </node>
+            </node>
+            <node oor:name="org.openoffice.openerp.report.image2" oor:op="replace">
+                <prop oor:name="URL">
+                    <value>service:org.openoffice.openerp.report.repeatln?execute</value>
+                </prop>
+                <node oor:name="UserDefinedImages">
+                    <prop oor:name="ImageSmallURL" oor:type="xs:string">
+                        <value>%origin%/images/loop_s.png</value>
+                    </prop>
+                    <prop oor:name="ImageBigURL" oor:type="xs:string">
+                        <value>%origin%/images/loop_b.png</value>
+                    </prop>
+                </node>
+            </node>
+            <node oor:name="org.openoffice.openerp.report.image3" oor:op="replace">
+                <prop oor:name="URL">
+                    <value>service:org.openoffice.openerp.report.fields?execute</value>
+                </prop>
+                <node oor:name="UserDefinedImages">
+                    <prop oor:name="ImageSmallURL" oor:type="xs:string">
+                        <value>%origin%/images/field_s.png</value>
+                    </prop>
+                    <prop oor:name="ImageBigURL" oor:type="xs:string">
+                        <value>%origin%/images/field_b.png</value>
+                    </prop>
+                </node>
+            </node>
+            <node oor:name="org.openoffice.openerp.report.image4" oor:op="replace">
+                <prop oor:name="URL">
+                    <value>service:org.openoffice.openerp.report.exporttorml?execute</value>
+                </prop>
+                <node oor:name="UserDefinedImages">
+                    <prop oor:name="ImageSmallURL" oor:type="xs:string">
+                        <value>%origin%/images/export_rml_s.png</value>
+                    </prop>
+                    <prop oor:name="ImageBigURL" oor:type="xs:string">
+                        <value>%origin%/images/export_rml_b.png</value>
+                    </prop>
+                </node>
+            </node>
+            <node oor:name="org.openoffice.openerp.report.image5" oor:op="replace">
+                <prop oor:name="URL">
+                    <value>service:org.openoffice.openerp.report.convertFB?execute</value>
+                </prop>
+                <node oor:name="UserDefinedImages">
+                    <prop oor:name="ImageSmallURL" oor:type="xs:string">
+                        <value>%origin%/images/convetFtoB_s.png</value>
+                    </prop>
+                    <prop oor:name="ImageBigURL" oor:type="xs:string">
+                        <value>%origin%/images/convetFtoB_b.png</value>
+                    </prop>
+                </node>
+            </node>
+            <node oor:name="org.openoffice.openerp.report.image6" oor:op="replace">
+                <prop oor:name="URL">
+                    <value>service:org.openoffice.openerp.report.convertBF?execute</value>
+                </prop>
+                <node oor:name="UserDefinedImages">
+                    <prop oor:name="ImageSmallURL" oor:type="xs:string">
+                        <value>%origin%/images/convetBtoF_s.png</value>
+                    </prop>
+                    <prop oor:name="ImageBigURL" oor:type="xs:string">
+                        <value>%origin%/images/convetBtoF_b.png</value>
+                    </prop>
+                </node>
+            </node>
+            <node oor:name="org.openoffice.openerp.report.image7" oor:op="replace">
+                <prop oor:name="URL">
+                    <value>service:org.openoffice.openerp.report.modify?execute</value>
+                </prop>
+                <node oor:name="UserDefinedImages">
+                    <prop oor:name="ImageSmallURL" oor:type="xs:string">
+                        <value>%origin%/images/modify_s.png</value>
+                    </prop>
+                    <prop oor:name="ImageBigURL" oor:type="xs:string">
+                        <value>%origin%/images/modify_b.png</value>
+                    </prop>
+                </node>
+            </node>
+            <node oor:name="org.openoffice.openerp.report.image8" oor:op="replace">
+                <prop oor:name="URL">
+                    <value>service:org.openoffice.openerp.report.serverparam?execute</value>
+                </prop>
+                <node oor:name="UserDefinedImages">
+                    <prop oor:name="ImageSmallURL" oor:type="xs:string">
+                        <value>%origin%/images/logo_1.png</value>
+                    </prop>
+                    <prop oor:name="ImageBigURL" oor:type="xs:string" oor:width="100">
+                        <value>%origin%/images/logo_s.png</value>
+                    </prop>
+                </node>
+            </node>
+            <node oor:name="org.openoffice.openerp.report.image9" oor:op="replace">
+                <prop oor:name="URL">
+                    <value>service:org.openoffice.openerp.report.about?execute</value>
+                </prop>
+                <node oor:name="UserDefinedImages">
+                    <prop oor:name="ImageSmallURL" oor:type="xs:string">
+                        <value>%origin%/images/aboutus_s.png</value>
+                    </prop>
+                    <prop oor:name="ImageBigURL" oor:type="xs:string" oor:width="100">
+                        <value>%origin%/images/aboutus_b.png</value>
+                    </prop>
+                </node>
+            </node>
+            <node oor:name="org.openoffice.openerp.report.image10" oor:op="replace">
+                <prop oor:name="URL">
+                    <value>service:org.openoffice.openerp.report.langtag?execute</value>
+                </prop>
+                <node oor:name="UserDefinedImages">
+                    <prop oor:name="ImageSmallURL" oor:type="xs:string">
+                        <value>%origin%/images/lang_s.png</value>
+                    </prop>
+                    <prop oor:name="ImageBigURL" oor:type="xs:string" oor:width="100">
+                        <value>%origin%/images/lang_b.png</value>
+                    </prop>
+                </node>
+            </node>
+        </node>
+
+    </node>
+</oor:component-data>
diff --git a/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/package/OpenERPReport.py b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/package/OpenERPReport.py
new file mode 100755
index 00000000000..d6e32b51df7
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/package/OpenERPReport.py
@@ -0,0 +1,3609 @@
+__name__="package"
+
+import uno
+import unohelper
+import os
+#--------------------------------------------------
+# An ActionListener adapter.
+# This object implements com.sun.star.awt.XActionListener.
+# When actionPerformed is called, this will call an arbitrary
+#  python procedure, passing it...
+#   1. the oActionEvent
+#   2. any other parameters you specified to this object's constructor (as a tuple).
+if __name__<>"package":
+    os.system( "ooffice '-accept=socket,host=localhost,port=2002;urp;'" )
+passwd=""
+database=""
+uid=""
+loginstatus=False
+from com.sun.star.awt import XActionListener
+class ActionListenerProcAdapter( unohelper.Base, XActionListener ):
+    def __init__( self, oProcToCall, tParams=() ):
+        self.oProcToCall = oProcToCall # a python procedure
+        self.tParams = tParams # a tuple
+
+    # oActionEvent is a com.sun.star.awt.ActionEvent struct.
+    def actionPerformed( self, oActionEvent ):
+        if callable( self.oProcToCall ):
+            apply( self.oProcToCall, (oActionEvent,) + self.tParams )
+
+#--------------------------------------------------
+# An ItemListener adapter.
+# This object implements com.sun.star.awt.XItemListener.
+# When itemStateChanged is called, this will call an arbitrary
+#  python procedure, passing it...
+#   1. the oItemEvent
+#   2. any other parameters you specified to this object's constructor (as a tuple).
+from com.sun.star.awt import XItemListener
+class ItemListenerProcAdapter( unohelper.Base, XItemListener ):
+    def __init__( self, oProcToCall, tParams=() ):
+        self.oProcToCall = oProcToCall # a python procedure
+        self.tParams = tParams # a tuple
+
+    # oItemEvent is a com.sun.star.awt.ItemEvent struct.
+    def itemStateChanged( self, oItemEvent ):
+        if callable( self.oProcToCall ):
+            apply( self.oProcToCall, (oItemEvent,) + self.tParams )
+
+#--------------------------------------------------
+# An TextListener adapter.
+# This object implements com.sun.star.awt.XTextistener.
+# When textChanged is called, this will call an arbitrary
+#  python procedure, passing it...
+#   1. the oTextEvent
+#   2. any other parameters you specified to this object's constructor (as a tuple).
+from com.sun.star.awt import XTextListener
+class TextListenerProcAdapter( unohelper.Base, XTextListener ):
+    def __init__( self, oProcToCall, tParams=() ):
+        self.oProcToCall = oProcToCall # a python procedure
+        self.tParams = tParams # a tuple
+
+    # oTextEvent is a com.sun.star.awt.TextEvent struct.
+    def textChanged( self, oTextEvent ):
+        if callable( self.oProcToCall ):
+            apply( self.oProcToCall, (oTextEvent,) + self.tParams )
+
+
+if __name__<>"package":
+    from gui import *
+class ErrorDialog:
+    def __init__(self,sErrorMsg, sErrorHelpMsg="",sTitle="Error Message"):
+        self.win = DBModalDialog(50, 50, 150, 90, sTitle)
+        self.win.addFixedText("lblErrMsg", 5, 5, 190, 25, sErrorMsg)
+        self.win.addFixedText("lblErrHelpMsg", 5, 30, 190, 25, sErrorHelpMsg)
+        self.win.addButton('btnOK', 55,-5,40,15,'Ok'
+                     ,actionListenerProc = self.btnOkOrCancel_clicked )
+        self.win.doModalDialog("",None)
+    def btnOkOrCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
+import uno
+import xmlrpclib
+import re
+import socket
+import cPickle
+import marshal
+import tempfile
+if __name__<>"package":
+    from gui import *
+    from logreport import *
+    from rpc import *
+    database="test"
+    uid = 1
+
+def genTree(object,aList,insField,host,level=3, ending=[], ending_excl=[], recur=[], root='', actualroot=""):
+    try:
+        global url
+        sock=RPCSession(url)
+        global passwd
+        res = sock.execute(database, uid, passwd, object , 'fields_get')
+        key = res.keys()
+        key.sort()
+        for k in key:
+            if (not ending or res[k]['type'] in ending) and ((not ending_excl) or not (res[k]['type'] in ending_excl)):
+                insField.addItem(root+'/'+res[k]["string"],len(aList))
+                aList.append(actualroot+'/'+k)
+            if (res[k]['type'] in recur) and (level>0):
+                genTree(res[k]['relation'],aList,insField,host ,level-1, ending, ending_excl, recur,root+'/'+res[k]["string"],actualroot+'/'+k)
+    except:
+        obj=Logger()
+        import traceback,sys
+        info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+        obj.log_write('Function', LOG_ERROR, info)
+
+def VariableScope(oTcur,insVariable,aObjectList,aComponentAdd,aItemList,sTableName=""):
+    if sTableName.find(".") != -1:
+	for i in range(len(aItemList)):
+            if aComponentAdd[i]==sTableName:
+		sLVal=aItemList[i][1][aItemList[i][1].find(",'")+2:aItemList[i][1].find("')")]
+                for j in range(len(aObjectList)):
+		    if aObjectList[j][:aObjectList[j].find("(")] == sLVal:
+                        insVariable.append(aObjectList[j])
+	VariableScope(oTcur,insVariable,aObjectList,aComponentAdd,aItemList, sTableName[:sTableName.rfind(".")])
+    else:
+	for i in range(len(aItemList)):
+            if aComponentAdd[i]==sTableName:
+		sLVal=aItemList[i][1][aItemList[i][1].find(",'")+2:aItemList[i][1].find("')")]
+                for j in range(len(aObjectList)):
+		    if aObjectList[j][:aObjectList[j].find("(")] == sLVal and sLVal!="":
+                        insVariable.append(aObjectList[j])
+
+def getList(aObjectList,host,count):
+    desktop=getDesktop()
+    doc =desktop.getCurrentComponent()
+    docinfo=doc.getDocumentInfo()
+    sMain=""
+    if not count == 0:
+        if count >= 1:
+            oParEnum = doc.getTextFields().createEnumeration()
+            while oParEnum.hasMoreElements():
+                oPar = oParEnum.nextElement()
+                if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+                    sItem=oPar.Items[1]
+                    if sItem[sItem.find("(")+1:sItem.find(",")]=="objects":
+                        sMain = sItem[sItem.find(",'")+2:sItem.find("')")]
+                        oParEnum = doc.getTextFields().createEnumeration()
+                        while oParEnum.hasMoreElements():
+                            oPar = oParEnum.nextElement()
+                            if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+                                sItem=oPar.Items[1]
+                                if sItem[sItem.find("[[ ")+3:sItem.find("(")]=="repeatIn":
+                                    if sItem[sItem.find("(")+1:sItem.find(",")]=="objects":
+                                        aObjectList.append(sItem[sItem.rfind(",'")+2:sItem.rfind("')")] + "(" + docinfo.getUserFieldValue(3) + ")")
+                                    else:
+                                        sTemp=sItem[sItem.find("(")+1:sItem.find(",")]
+                                        if sMain == sTemp[:sTemp.find(".")]:
+                                            getRelation(docinfo.getUserFieldValue(3), sItem[sItem.find(".")+1:sItem.find(",")], sItem[sItem.find(",'")+2:sItem.find("')")],aObjectList,host)
+                                        else:
+                                            sPath=getPath(sItem[sItem.find("(")+1:sItem.find(",")], sMain)
+                                            getRelation(docinfo.getUserFieldValue(3), sPath, sItem[sItem.find(",'")+2:sItem.find("')")],aObjectList,host)
+    else:
+        aObjectList.append("List of " + docinfo.getUserFieldValue(3))
+
+def getRelation(sRelName, sItem, sObjName, aObjectList, host ):
+        global url
+        sock=RPCSession(url)
+        global passwd
+        res = sock.execute(database, uid, passwd, sRelName , 'fields_get')
+        key = res.keys()
+        for k in key:
+            if sItem.find(".") == -1:
+                if k == sItem:
+                    aObjectList.append(sObjName + "(" + res[k]['relation'] + ")")
+                    return 0
+	    if k == sItem[:sItem.find(".")]:
+		getRelation(res[k]['relation'], sItem[sItem.find(".")+1:], sObjName,aObjectList,host)
+
+
+def getPath(sPath,sMain):
+    desktop=getDesktop()
+    doc =desktop.getCurrentComponent()
+    oParEnum = doc.getTextFields().createEnumeration()
+    while oParEnum.hasMoreElements():
+        oPar = oParEnum.nextElement()
+        if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+            sItem=oPar.Items[1]
+	    if sPath[:sPath.find(".")] == sMain:
+                break;
+            else:
+                res = re.findall('\\[\\[ *([a-zA-Z0-9_\.]+) *\\]\\]',sPath)
+                if len(res) <> 0:
+		    if sItem[sItem.find(",'")+2:sItem.find("')")] == sPath[:sPath.find(".")]:
+			sPath =  sItem[sItem.find("(")+1:sItem.find(",")] + sPath[sPath.find("."):]
+                        getPath(sPath, sMain)
+    return sPath
+
+def EnumDocument(aItemList,aComponentAdd):
+    desktop = getDesktop()
+    parent=""
+    bFlag = False
+    Doc =desktop.getCurrentComponent()
+    #oVC = Doc.CurrentController.getViewCursor()
+    oParEnum = Doc.getTextFields().createEnumeration()
+    while oParEnum.hasMoreElements():
+        oPar = oParEnum.nextElement()
+        if oPar.Anchor.TextTable:
+            #parent = oPar.Anchor.TextTable.Name
+            getChildTable(oPar.Anchor.TextTable,aItemList,aComponentAdd)
+        elif oPar.Anchor.TextSection:
+            parent = oPar.Anchor.TextSection.Name
+        elif oPar.Anchor.Text:
+            parent = "Document"
+        sItem=oPar.Items[1].replace(' ',"")
+        if sItem[sItem.find("[[ ")+3:sItem.find("(")]=="repeatIn" and not oPar.Items in aItemList:
+            templist=oPar.Items[0],sItem
+            aItemList.append( templist )
+        aComponentAdd.append( parent )
+
+def getChildTable(oPar,aItemList,aComponentAdd,sTableName=""):
+    sNames = oPar.getCellNames()
+    bEmptyTableFlag=True
+    for val in sNames:
+        oCell = oPar.getCellByName(val)
+        oCurEnum = oCell.createEnumeration()
+        while oCurEnum.hasMoreElements():
+            try:
+                oCur = oCurEnum.nextElement()
+
+                if oCur.supportsService("com.sun.star.text.TextTable"):
+                    if sTableName=="":
+                        getChildTable(oCur,aItemList,aComponentAdd,oPar.Name)
+                    else:
+                        getChildTable(oCur,aItemList,aComponentAdd,sTableName+"."+oPar.Name)
+                else:
+                    oSecEnum = oCur.createEnumeration()
+                    while oSecEnum.hasMoreElements():
+                        oSubSection = oSecEnum.nextElement()
+                        if oSubSection.supportsService("com.sun.star.text.TextField"):
+                            bEmptyTableFlag=False
+                            sItem=oSubSection.TextField.Items[1]
+                            if sItem[sItem.find("[[ ")+3:sItem.find("(")]=="repeatIn":
+                                if aItemList.__contains__(oSubSection.TextField.Items)==False:
+                                    aItemList.append(oSubSection.TextField.Items)
+                                if sTableName=="":
+                                    if  aComponentAdd.__contains__(oPar.Name)==False:
+                                        aComponentAdd.append(oPar.Name)
+                                else:
+                                    if aComponentAdd.__contains__(sTableName+"."+oPar.Name)==False:
+                                        aComponentAdd.append(sTableName+"."+oPar.Name)
+            except:
+                obj=Logger()
+                import traceback,sys
+                info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+                obj.log_write('Function', LOG_ERROR, info)
+    if bEmptyTableFlag==True:
+        aItemList.append((u'',u''))
+        if sTableName=="":
+            if  aComponentAdd.__contains__(oPar.Name)==False:
+                aComponentAdd.append(oPar.Name)
+        else:
+            if aComponentAdd.__contains__(sTableName+"."+oPar.Name)==False:
+                aComponentAdd.append(sTableName+"."+oPar.Name)
+    return 0
+
+def getRecersiveSection(oCurrentSection,aSectionList):
+        desktop=getDesktop()
+        doc =desktop.getCurrentComponent()
+        oParEnum=doc.getText().createEnumeration()
+        aSectionList.append(oCurrentSection.Name)
+        if oCurrentSection.ParentSection:
+            getRecersiveSection(oCurrentSection.ParentSection,aSectionList)
+        else:
+            return
+
+def GetAFileName():
+    oFileDialog=None
+    iAccept=None
+    sPath=""
+    InitPath=""
+    oUcb=None
+    oFileDialog = createUnoService("com.sun.star.ui.dialogs.FilePicker")
+    oUcb = createUnoService("com.sun.star.ucb.SimpleFileAccess")
+    oFileDialog.appendFilter("OpenERP Report File","*.sxw")
+    oFileDialog.setCurrentFilter("OpenERP Report File")
+    if InitPath == "":
+        InitPath =tempfile.gettempdir()
+    #End If
+    if oUcb.exists(InitPath):
+        oFileDialog.setDisplayDirectory(InitPath)
+    #End If
+    iAccept = oFileDialog.execute()
+    if iAccept == 1:
+        sPath = oFileDialog.Files[0]
+    oFileDialog.dispose()
+    return sPath
+
+
+import uno
+import unohelper
+import pythonloader
+if __name__<>"package":
+    from actions import *
+
+
+#------------------------------------------------------------
+#   Uno ServiceManager access
+#   A different version of this routine and global variable
+#    is needed for code running inside a component.
+#------------------------------------------------------------
+
+
+# The ServiceManager of the running OOo.
+# It is cached in a global variable.
+goServiceManager = False
+pythonloader.DEBUG = 0
+def getServiceManager( cHost="localhost", cPort="2002" ):
+    """Get the ServiceManager from the running OpenOffice.org.
+        Then retain it in the global variable goServiceManager for future use.
+        This is similar to the GetProcessServiceManager() in OOo Basic.
+    """
+    global goServiceManager
+    global pythonloader
+    if not goServiceManager:
+        # Get the uno component context from the PyUNO runtime
+        oLocalContext = uno.getComponentContext()
+        # Create the UnoUrlResolver on the Python side.
+
+        # Connect to the running OpenOffice.org and get its context.
+        if __name__<>"package":
+            oLocalResolver = oLocalContext.ServiceManager.createInstanceWithContext(
+                                    "com.sun.star.bridge.UnoUrlResolver", oLocalContext )
+            oContext = oLocalResolver.resolve( "uno:socket,host=" + cHost + ",port=" + cPort + ";urp;StarOffice.ComponentContext" )
+        # Get the ServiceManager object
+            goServiceManager = oContext.ServiceManager
+        else:
+            goServiceManager=oLocalContext.ServiceManager
+
+    return goServiceManager
+
+
+#------------------------------------------------------------
+#   Uno convenience functions
+#   The stuff in this section is just to make
+#    python progrmaming of OOo more like using OOo Basic.
+#------------------------------------------------------------
+
+
+# This is the same as ServiceManager.createInstance( ... )
+def createUnoService( cClass ):
+    """A handy way to create a global objects within the running OOo.
+    Similar to the function of the same name in OOo Basic.
+    """
+    oServiceManager = getServiceManager()
+    oObj = oServiceManager.createInstance( cClass )
+    return oObj
+
+
+# The StarDesktop object.  (global like in OOo Basic)
+# It is cached in a global variable.
+StarDesktop = None
+def getDesktop():
+    """An easy way to obtain the Desktop object from a running OOo.
+    """
+    global StarDesktop
+    if StarDesktop == None:
+        StarDesktop = createUnoService( "com.sun.star.frame.Desktop" )
+    return StarDesktop
+# preload the StarDesktop variable.
+#getDesktop()
+
+
+# The CoreReflection object.
+# It is cached in a global variable.
+goCoreReflection = False
+def getCoreReflection():
+    global goCoreReflection
+    if not goCoreReflection:
+        goCoreReflection = createUnoService( "com.sun.star.reflection.CoreReflection" )
+    return goCoreReflection
+
+
+def createUnoStruct( cTypeName ):
+    """Create a UNO struct and return it.
+    Similar to the function of the same name in OOo Basic.
+    """
+    oCoreReflection = getCoreReflection()
+    # Get the IDL class for the type name
+    oXIdlClass = oCoreReflection.forName( cTypeName )
+    # Create the struct.
+    oReturnValue, oStruct = oXIdlClass.createObject( None )
+    return oStruct
+
+#------------------------------------------------------------
+#   API helpers
+#------------------------------------------------------------
+
+def hasUnoInterface( oObject, cInterfaceName ):
+    """Similar to Basic's HasUnoInterfaces() function, but singular not plural."""
+
+    # Get the Introspection service.
+    oIntrospection = createUnoService( "com.sun.star.beans.Introspection" )
+
+    # Now inspect the object to learn about it.
+    oObjInfo = oIntrospection.inspect( oObject )
+
+    # Obtain an array describing all methods of the object.
+    oMethods = oObjInfo.getMethods( uno.getConstantByName( "com.sun.star.beans.MethodConcept.ALL" ) )
+    # Now look at every method.
+    for oMethod in oMethods:
+        # Check the method's interface to see if
+        #  these aren't the droids you're looking for.
+        cMethodInterfaceName = oMethod.getDeclaringClass().getName()
+        if cMethodInterfaceName == cInterfaceName:
+            return True
+    return False
+
+def hasUnoInterfaces( oObject, *cInterfaces ):
+    """Similar to the function of the same name in OOo Basic."""
+    for cInterface in cInterfaces:
+        if not hasUnoInterface( oObject, cInterface ):
+            return False
+    return True
+
+#------------------------------------------------------------
+#   High level general purpose functions
+#------------------------------------------------------------
+
+
+def makePropertyValue( cName=None, uValue=None, nHandle=None, nState=None ):
+    """Create a com.sun.star.beans.PropertyValue struct and return it.
+    """
+    oPropertyValue = createUnoStruct( "com.sun.star.beans.PropertyValue" )
+
+    if cName != None:
+        oPropertyValue.Name = cName
+    if uValue != None:
+        oPropertyValue.Value = uValue
+    if nHandle != None:
+        oPropertyValue.Handle = nHandle
+    if nState != None:
+        oPropertyValue.State = nState
+
+    return oPropertyValue
+
+
+def makePoint( nX, nY ):
+    """Create a com.sun.star.awt.Point struct."""
+    oPoint = createUnoStruct( "com.sun.star.awt.Point" )
+    oPoint.X = nX
+    oPoint.Y = nY
+    return oPoint
+
+
+def makeSize( nWidth, nHeight ):
+    """Create a com.sun.star.awt.Size struct."""
+    oSize = createUnoStruct( "com.sun.star.awt.Size" )
+    oSize.Width = nWidth
+    oSize.Height = nHeight
+    return oSize
+
+
+def makeRectangle( nX, nY, nWidth, nHeight ):
+    """Create a com.sun.star.awt.Rectangle struct."""
+    oRect = createUnoStruct( "com.sun.star.awt.Rectangle" )
+    oRect.X = nX
+    oRect.Y = nY
+    oRect.Width = nWidth
+    oRect.Height = nHeight
+    return oRect
+
+
+def Array( *args ):
+    """This is just sugar coating so that code from OOoBasic which
+    contains the Array() function can work perfectly in python."""
+    tArray = ()
+    for arg in args:
+        tArray += (arg,)
+    return tArray
+
+
+def loadComponentFromURL( cUrl, tProperties=() ):
+    """Open or Create a document from it's URL.
+    New documents are created from URL's such as:
+        private:factory/sdraw
+        private:factory/swriter
+        private:factory/scalc
+        private:factory/simpress
+    """
+    StarDesktop = getDesktop()
+    oDocument = StarDesktop.loadComponentFromURL( cUrl, "_blank", 0, tProperties )
+    return oDocument
+
+
+#------------------------------------------------------------
+#   Styles
+#------------------------------------------------------------
+
+
+def defineStyle( oDrawDoc, cStyleFamily, cStyleName, cParentStyleName=None ):
+    """Add a new style to the style catalog if it is not already present.
+    This returns the style object so that you can alter its properties.
+    """
+
+    oStyleFamily = oDrawDoc.getStyleFamilies().getByName( cStyleFamily )
+
+    # Does the style already exist?
+    if oStyleFamily.hasByName( cStyleName ):
+        # then get it so we can return it.
+        oStyle = oStyleFamily.getByName( cStyleName )
+    else:
+        # Create new style object.
+        oStyle = oDrawDoc.createInstance( "com.sun.star.style.Style" )
+
+        # Set its parent style
+        if cParentStyleName != None:
+            oStyle.setParentStyle( cParentStyleName )
+
+        # Add the new style to the style family.
+        oStyleFamily.insertByName( cStyleName, oStyle )
+
+    return oStyle
+
+
+def getStyle( oDrawDoc, cStyleFamily, cStyleName ):
+    """Lookup and return a style from the document.
+    """
+    return oDrawDoc.getStyleFamilies().getByName( cStyleFamily ).getByName( cStyleName )
+
+#------------------------------------------------------------
+#   General Utility functions
+#------------------------------------------------------------
+
+
+def convertToURL( cPathname ):
+    """Convert a Windows or Linux pathname into an OOo URL."""
+    if len( cPathname ) > 1:
+        if cPathname[1:2] == ":":
+            cPathname = "/" + cPathname[0] + "|" + cPathname[2:]
+    cPathname = cPathname.replace( "\\", "/" )
+    cPathname = "file://" + cPathname
+    return cPathname
+
+# The global Awt Toolkit.
+# This is initialized the first time it is needed.
+#goAwtToolkit = createUnoService( "com.sun.star.awt.Toolkit" )
+goAwtToolkit = None
+
+def getAwtToolkit():
+    global goAwtToolkit
+    if goAwtToolkit == None:
+        goAwtToolkit = createUnoService( "com.sun.star.awt.Toolkit" )
+    return goAwtToolkit
+
+# This class builds dialog boxes.
+# This can be used in two different ways...
+# 1. by subclassing it (elegant)
+# 2. without subclassing it (less elegant)
+class DBModalDialog:
+    """Class to build a dialog box from the com.sun.star.awt.* services.
+    This doesn't do anything you couldn't already do using OOo's UNO API,
+     this just makes it much easier.
+    You can change the dialog box size, position, title, etc.
+    You can add controls, and listeners for those controls to the dialog box.
+    This class can be used by subclassing it, or without subclassing it.
+    """
+    def __init__( self, nPositionX=None, nPositionY=None, nWidth=None, nHeight=None, cTitle=None ):
+        self.oDialogModel = createUnoService( "com.sun.star.awt.UnoControlDialogModel" )
+        if nPositionX != None:  self.oDialogModel.PositionX = nPositionX
+        if nPositionY != None:  self.oDialogModel.PositionY = nPositionY
+        if nWidth     != None:  self.oDialogModel.Width     = nWidth
+        if nHeight    != None:  self.oDialogModel.Height    = nHeight
+        if cTitle     != None:  self.oDialogModel.Title     = cTitle
+        self.oDialogControl = createUnoService( "com.sun.star.awt.UnoControlDialog" )
+        self.oDialogControl.setModel( self.oDialogModel )
+
+    def release( self ):
+        """Release resources.
+        After calling this, you can no longer use this object.
+        """
+        self.oDialogControl.dispose()
+
+    #--------------------------------------------------
+    #   Dialog box adjustments
+    #--------------------------------------------------
+
+    def setDialogPosition( self, nX, nY ):
+        self.oDialogModel.PositionX = nX
+        self.oDialogModel.PositionY = nY
+
+    def setDialogSize( self, nWidth, nHeight ):
+        self.oDialogModel.Width = nWidth
+        self.oDialogModel.Height = nHeight
+
+    def setDialogTitle( self, cCaption ):
+        self.oDialogModel.Title = cCaption
+
+    def setVisible( self, bVisible ):
+        self.oDialogControl.setVisible( bVisible )
+
+
+    #--------------------------------------------------
+    #   com.sun.star.awt.UnoControlButton
+    #--------------------------------------------------
+
+    # After you add a Button control, you can call self.setControlModelProperty()
+    #  passing any of the properties for a...
+    #       com.sun.star.awt.UnoControlButtonModel
+    #       com.sun.star.awt.UnoControlDialogElement
+    #       com.sun.star.awt.UnoControlModel
+    def addButton( self, cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                       cLabel=None,
+                       actionListenerProc=None,
+                       nTabIndex=None ):
+        self.addControl( "com.sun.star.awt.UnoControlButtonModel",
+                         cCtrlName, nPositionX, nPositionY, nWidth, nHeight, bDropdown=None, bMultiSelection=None,
+                         cLabel=cLabel,
+                         nTabIndex=nTabIndex )
+        if actionListenerProc != None:
+            self.addActionListenerProc( cCtrlName, actionListenerProc )
+
+    def setButtonLabel( self, cCtrlName, cLabel ):
+        """Set the label of the control."""
+        oControl = self.getControl( cCtrlName )
+        oControl.setLabel( cLabel )
+
+    #--------------------------------------------------
+    #   com.sun.star.awt.UnoControlEditModel
+    #--------------------------------------------------
+    def addEdit( self, cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                        cText=None,
+                        textListenerProc=None ):
+        """Add a Edit control to the window."""
+        self.addControl( "com.sun.star.awt.UnoControlEditModel",
+            cCtrlName, nPositionX, nPositionY, nWidth, nHeight, bDropdown=None)
+
+        if cText != None:
+            self.setEditText( cCtrlName, cText )
+        if textListenerProc != None:
+            self.addTextListenerProc( cCtrlName, textListenerProc )
+
+    #--------------------------------------------------
+    #   com.sun.star.awt.UnoControlCheckBox
+    #--------------------------------------------------
+
+    # After you add a CheckBox control, you can call self.setControlModelProperty()
+    #  passing any of the properties for a...
+    #       com.sun.star.awt.UnoControlCheckBoxModel
+    #       com.sun.star.awt.UnoControlDialogElement
+    #       com.sun.star.awt.UnoControlModel
+    def addCheckBox( self, cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                       cLabel=None,
+                       itemListenerProc=None,
+                       nTabIndex=None ):
+        self.addControl( "com.sun.star.awt.UnoControlCheckBoxModel",
+                         cCtrlName, nPositionX, nPositionY, nWidth, nHeight, bDropdown=None,  bMultiSelection=None,
+                         cLabel=cLabel,
+                         nTabIndex=nTabIndex )
+        if itemListenerProc != None:
+            self.addItemListenerProc( cCtrlName, itemListenerProc )
+
+    def setEditText( self, cCtrlName, cText ):
+        """Set the text of the edit box."""
+        oControl = self.getControl( cCtrlName )
+        oControl.setText( cText )
+
+    def getEditText( self, cCtrlName):
+        """Set the text of the edit box."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.getText()
+
+    def setCheckBoxLabel( self, cCtrlName, cLabel ):
+        """Set the label of the control."""
+        oControl = self.getControl( cCtrlName )
+        oControl.setLabel( cLabel )
+
+    def getCheckBoxState( self, cCtrlName ):
+        """Get the state of the control."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.getState();
+
+    def setCheckBoxState( self, cCtrlName, nState ):
+        """Set the state of the control."""
+        oControl = self.getControl( cCtrlName )
+        oControl.setState( nState )
+
+    def enableCheckBoxTriState( self, cCtrlName, bTriStateEnable ):
+        """Enable or disable the tri state mode of the control."""
+        oControl = self.getControl( cCtrlName )
+        oControl.enableTriState( bTriStateEnable )
+
+
+    #--------------------------------------------------
+    #   com.sun.star.awt.UnoControlFixedText
+    #--------------------------------------------------
+
+    def addFixedText( self, cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                        cLabel=None ):
+        self.addControl( "com.sun.star.awt.UnoControlFixedTextModel",
+                         cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                         bDropdown=None, bMultiSelection=None,
+                         cLabel=cLabel )
+
+        return self.getControl( cCtrlName )
+
+    #--------------------------------------------------
+    #   Add Controls to dialog
+    #--------------------------------------------------
+
+    def addControl( self, cCtrlServiceName,
+                        cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                        bDropdown=None,
+                        bMultiSelection=None,
+                        cLabel=None,
+                        nTabIndex=None,
+                        sImagePath=None,
+                         ):
+        oControlModel = self.oDialogModel.createInstance( cCtrlServiceName )
+        self.oDialogModel.insertByName( cCtrlName, oControlModel )
+        # if negative coordinates are given for X or Y position,
+        #  then make that coordinate be relative to the right/bottom
+        #  edge of the dialog box instead of to the left/top.
+        if nPositionX < 0: nPositionX = self.oDialogModel.Width  + nPositionX - nWidth
+        if nPositionY < 0: nPositionY = self.oDialogModel.Height + nPositionY - nHeight
+        oControlModel.PositionX = nPositionX
+        oControlModel.PositionY = nPositionY
+        oControlModel.Width = nWidth
+        oControlModel.Height = nHeight
+        oControlModel.Name = cCtrlName
+
+        if bDropdown != None:
+            oControlModel.Dropdown = bDropdown
+
+        if bMultiSelection!=None:
+            oControlModel.MultiSelection=bMultiSelection
+
+        if cLabel != None:
+            oControlModel.Label = cLabel
+
+        if nTabIndex != None:
+            oControlModel.TabIndex = nTabIndex
+
+        if sImagePath != None:
+            oControlModel.ImageURL = sImagePath
+    #--------------------------------------------------
+    #   Access controls and control models
+    #--------------------------------------------------
+
+    #--------------------------------------------------
+    #   com.sun.star.awt.UnoContorlListBoxModel
+    #--------------------------------------------------
+
+
+    def addComboListBox( self, cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                        bDropdown=True,
+                        bMultiSelection=False,
+                        itemListenerProc=None,
+                        actionListenerProc=None,
+                        ):
+
+        mod = self.addControl( "com.sun.star.awt.UnoControlListBoxModel",
+                         cCtrlName, nPositionX, nPositionY, nWidth, nHeight,bDropdown,bMultiSelection )
+
+        if itemListenerProc != None:
+            self.addItemListenerProc( cCtrlName, itemListenerProc )
+
+    def addListBoxItems( self, cCtrlName, tcItemTexts, nPosition=0 ):
+        """Add a tupple of items to the ListBox at specified position."""
+        oControl = self.getControl( cCtrlName )
+        oControl.addItems( tcItemTexts, nPosition )
+
+    def selectListBoxItem( self, cCtrlName, cItemText, bSelect=True ):
+        """Selects/Deselects the ispecified item."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.selectItem( cItemText, bSelect )
+
+    def selectListBoxItemPos( self, cCtrlName, nItemPos, bSelect=True ):
+        """Select/Deselect the item at the specified position."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.selectItemPos( nItemPos, bSelect )
+
+    def removeListBoxItems( self, cCtrlName, nPosition, nCount=1 ):
+        """Remove items from a ListBox."""
+        oControl = self.getControl( cCtrlName )
+        oControl.removeItems( nPosition, nCount )
+
+    def getListBoxItemCount( self, cCtrlName ):
+        """Get the number of items in a ListBox."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.getItemCount()
+
+    def getListBoxSelectedItem( self, cCtrlName ):
+        """Returns the currently selected item."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.getSelectedItem()
+
+    def getListBoxItem( self, cCtrlName, nPosition ):
+        """Return the item at specified position within the ListBox."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.getItem( nPosition )
+
+    def getListBoxSelectedItemPos(self,cCtrlName):
+
+        oControl = self.getControl( cCtrlName )
+        return oControl.getSelectedItemPos()
+
+    def getListBoxSelectedItems(self,cCtrlName):
+        oControl = self.getControl( cCtrlName )
+        return oControl.getSelectedItems()
+
+    def getListBoxSelectedItemsPos(self,cCtrlName):
+
+        oControl = self.getControl( cCtrlName )
+        return oControl.getSelectedItemsPos()
+
+    #--------------------------------------------------
+    #   com.sun.star.awt.UnoControlComboBoxModel
+    #--------------------------------------------------
+    def addComboBox( self, cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                        bDropdown=True,
+                        itemListenerProc=None,
+                        actionListenerProc=None ):
+
+        mod = self.addControl( "com.sun.star.awt.UnoControlComboBoxModel",
+                         cCtrlName, nPositionX, nPositionY, nWidth, nHeight,bDropdown)
+        if itemListenerProc != None:
+            self.addItemListenerProc( cCtrlName, itemListenerProc )
+        if actionListenerProc != None:
+            self.addActionListenerProc( cCtrlName, actionListenerProc )
+
+
+    def setComboBoxText( self, cCtrlName, cText ):
+        """Set the text of the ComboBox."""
+        oControl = self.getControl( cCtrlName )
+        oControl.setText( cText )
+
+    def getComboBoxText( self, cCtrlName):
+        """Set the text of the ComboBox."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.getText()
+
+    def getComboBoxSelectedText( self, cCtrlName ):
+        """Get the selected text of the ComboBox."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.getSelectedText();
+
+    def getControl( self, cCtrlName ):
+        """Get the control (not its model) for a particular control name.
+        The control returned includes the service com.sun.star.awt.UnoControl,
+         and another control-specific service which inherits from it.
+        """
+        oControl = self.oDialogControl.getControl( cCtrlName )
+        return oControl
+
+    def getControlModel( self, cCtrlName ):
+        """Get the control model (not the control) for a particular control name.
+        The model returned includes the service UnoControlModel,
+         and another control-specific service which inherits from it.
+        """
+        oControl = self.getControl( cCtrlName )
+        oControlModel = oControl.getModel()
+        return oControlModel
+    #---------------------------------------------------
+    #    com.sun.star.awt.UnoControlImageControlModel
+    #---------------------------------------------------
+    def addImageControl( self, cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                        sImagePath="",
+                        itemListenerProc=None,
+                        actionListenerProc=None ):
+
+        mod = self.addControl( "com.sun.star.awt.UnoControlImageControlModel",
+                         cCtrlName, nPositionX, nPositionY, nWidth, nHeight, sImagePath=sImagePath)
+
+        if itemListenerProc != None:
+            self.addItemListenerProc( cCtrlName, itemListenerProc )
+        if actionListenerProc != None:
+            self.addActionListenerProc( cCtrlName, actionListenerProc )
+
+
+    #--------------------------------------------------
+    #   Adjust properties of control models
+    #--------------------------------------------------
+
+    def setControlModelProperty( self, cCtrlName, cPropertyName, uValue ):
+        """Set the value of a property of a control's model.
+        This affects the control model, not the control.
+        """
+        oControlModel = self.getControlModel( cCtrlName )
+        oControlModel.setPropertyValue( cPropertyName, uValue )
+
+    def getControlModelProperty( self, cCtrlName, cPropertyName ):
+        """Get the value of a property of a control's model.
+        This affects the control model, not the control.
+        """
+        oControlModel = self.getControlModel( cCtrlName )
+        return oControlModel.getPropertyValue( cPropertyName )
+
+    #--------------------------------------------------
+    #   Sugar coated property adjustments to control models.
+    #--------------------------------------------------
+
+    def setEnabled( self, cCtrlName, bEnabled=True ):
+        """Supported controls...
+            UnoControlButtonModel
+            UnoControlCheckBoxModel
+        """
+        self.setControlModelProperty( cCtrlName, "Enabled", bEnabled )
+
+    def getEnabled( self, cCtrlName ):
+        """Supported controls...
+            UnoControlButtonModel
+            UnoControlCheckBoxModel
+        """
+
+        return self.getControlModelProperty( cCtrlName, "Enabled" )
+
+    def setState( self, cCtrlName, nState ):
+        """Supported controls...
+            UnoControlButtonModel
+            UnoControlCheckBoxModel
+        """
+        self.setControlModelProperty( cCtrlName, "State", nState )
+
+    def getState( self, cCtrlName ):
+        """Supported controls...
+            UnoControlButtonModel
+            UnoControlCheckBoxModel
+        """
+        return self.getControlModelProperty( cCtrlName, "State" )
+
+    def setLabel( self, cCtrlName, cLabel ):
+        """Supported controls...
+            UnoControlButtonModel
+            UnoControlCheckBoxModel
+        """
+        self.setControlModelProperty( cCtrlName, "Label", cLabel )
+
+    def getLabel( self, cCtrlName ):
+        """Supported controls...
+            UnoControlButtonModel
+            UnoControlCheckBoxModel
+        """
+        return self.getControlModelProperty( cCtrlName, "Label" )
+
+    def setHelpText( self, cCtrlName, cHelpText ):
+        """Supported controls...
+            UnoControlButtonModel
+            UnoControlCheckBoxModel
+        """
+        self.setControlModelProperty( cCtrlName, "HelpText", cHelpText )
+
+    def getHelpText( self, cCtrlName ):
+        """Supported controls...
+            UnoControlButtonModel
+            UnoControlCheckBoxModel
+        """
+        return self.getControlModelProperty( cCtrlName, "HelpText" )
+
+
+    #--------------------------------------------------
+    #   Adjust controls (not models)
+    #--------------------------------------------------
+
+    # The following apply to all controls which are a
+    #   com.sun.star.awt.UnoControl
+
+    def setDesignMode( self, cCtrlName, bDesignMode=True ):
+        oControl = self.getControl( cCtrlName )
+        oControl.setDesignMode( bDesignMode )
+
+    def isDesignMode( self, cCtrlName, bDesignMode=True ):
+        oControl = self.getControl( cCtrlName )
+        return oControl.isDesignMode()
+
+    def isTransparent( self, cCtrlName, bDesignMode=True ):
+        oControl = self.getControl( cCtrlName )
+        return oControl.isTransparent()
+
+
+    # The following apply to all controls which are a
+    #   com.sun.star.awt.UnoControlDialogElement
+
+    def setPosition( self, cCtrlName, nPositionX, nPositionY ):
+        self.setControlModelProperty( cCtrlName, "PositionX", nPositionX )
+        self.setControlModelProperty( cCtrlName, "PositionY", nPositionY )
+    def setPositionX( self, cCtrlName, nPositionX ):
+        self.setControlModelProperty( cCtrlName, "PositionX", nPositionX )
+    def setPositionY( self, cCtrlName, nPositionY ):
+        self.setControlModelProperty( cCtrlName, "PositionY", nPositionY )
+    def getPositionX( self, cCtrlName ):
+        return self.getControlModelProperty( cCtrlName, "PositionX" )
+    def getPositionY( self, cCtrlName ):
+        return self.getControlModelProperty( cCtrlName, "PositionY" )
+
+    def setSize( self, cCtrlName, nWidth, nHeight ):
+        self.setControlModelProperty( cCtrlName, "Width", nWidth )
+        self.setControlModelProperty( cCtrlName, "Height", nHeight )
+    def setWidth( self, cCtrlName, nWidth ):
+        self.setControlModelProperty( cCtrlName, "Width", nWidth )
+    def setHeight( self, cCtrlName, nHeight ):
+        self.setControlModelProperty( cCtrlName, "Height", nHeight )
+    def getWidth( self, cCtrlName ):
+        return self.getControlModelProperty( cCtrlName, "Width" )
+    def getHeight( self, cCtrlName ):
+        return self.getControlModelProperty( cCtrlName, "Height" )
+
+    def setTabIndex( self, cCtrlName, nWidth, nTabIndex ):
+        self.setControlModelProperty( cCtrlName, "TabIndex", nTabIndex )
+    def getTabIndex( self, cCtrlName ):
+        return self.getControlModelProperty( cCtrlName, "TabIndex" )
+
+    def setStep( self, cCtrlName, nWidth, nStep ):
+        self.setControlModelProperty( cCtrlName, "Step", nStep )
+    def getStep( self, cCtrlName ):
+        return self.getControlModelProperty( cCtrlName, "Step" )
+
+    def setTag( self, cCtrlName, nWidth, cTag ):
+        self.setControlModelProperty( cCtrlName, "Tag", cTag )
+    def getTag( self, cCtrlName ):
+        return self.getControlModelProperty( cCtrlName, "Tag" )
+
+    def setEchoChar(self, cCtrlName , cVal):
+        self.setControlModelProperty(cCtrlName, "EchoChar", cVal)
+    def getEchoChar(self, cCtrlName):
+        return self.setControlModelProperty(cCtrlName, "EchoChar")
+
+    #--------------------------------------------------
+    #   Add listeners to controls.
+    #--------------------------------------------------
+
+    # This applies to...
+    #   UnoControlButton
+    def addActionListenerProc( self, cCtrlName, actionListenerProc ):
+        """Create an com.sun.star.awt.XActionListener object and add it to a control.
+        A listener object is created which will call the python procedure actionListenerProc.
+        The actionListenerProc can be either a method or a global procedure.
+        The following controls support XActionListener:
+            UnoControlButton
+        """
+        oControl = self.getControl( cCtrlName )
+        oActionListener = ActionListenerProcAdapter( actionListenerProc )
+        oControl.addActionListener( oActionListener )
+
+    # This applies to...
+    #   UnoControlCheckBox
+    def addItemListenerProc( self, cCtrlName, itemListenerProc ):
+        """Create an com.sun.star.awt.XItemListener object and add it to a control.
+        A listener object is created which will call the python procedure itemListenerProc.
+        The itemListenerProc can be either a method or a global procedure.
+        The following controls support XActionListener:
+            UnoControlCheckBox
+        """
+        oControl = self.getControl( cCtrlName )
+        oActionListener = ItemListenerProcAdapter( itemListenerProc )
+        oControl.addItemListener( oActionListener )
+
+    #--------------------------------------------------
+    #   Display the modal dialog.
+    #--------------------------------------------------
+
+    def doModalDialog( self, sObjName,sValue):
+        """Display the dialog as a modal dialog."""
+        self.oDialogControl.setVisible( True )
+        if not sValue==None:
+            self.selectListBoxItem( sObjName, sValue, True )
+        self.oDialogControl.execute()
+
+    def endExecute( self ):
+        """Call this from within one of the listeners to end the modal dialog.
+        For instance, the listener on your OK or Cancel button would call this to end the dialog.
+        """
+        self.oDialogControl.endExecute()
+
+import urllib
+
+def get_absolute_file_path( url ):
+	url_unquoted = urllib.unquote(url)
+	return os.name == 'nt' and url_unquoted[1:] or url_unquoted 
+
+# This function reads the content of a file and return it to the caller
+def read_data_from_file( filename ):
+	fp = file( filename, "rb" )
+	data = fp.read()
+	fp.close()
+	return data
+
+# This function writes the content to a file
+def write_data_to_file( filename, data ):
+	fp = file( filename, 'wb' )
+	fp.write( data )
+	fp.close()
+
+import logging
+import tempfile
+LOG_DEBUG='debug'
+LOG_INFO='info'
+LOG_WARNING='warn'
+LOG_ERROR='error'
+LOG_CRITICAL='critical'
+
+def log_detail(self):
+    import os
+    logger = logging.getLogger()
+    logfile_name = os.path.join(tempfile.gettempdir(), "report_designer.log")
+    hdlr = logging.FileHandler(logfile_name)
+    formatter = logging.Formatter('%(asctime)s %(levelname)s %(message)s')
+    hdlr.setFormatter(formatter)
+    logger.addHandler(hdlr)
+    logger.setLevel(logging.INFO)
+
+class Logger(object):
+    def log_write(self,name,level,msg):
+        log = logging.getLogger(name)
+        getattr(log,level)(msg)
+
+    def shutdown(self):
+        logging.shutdown()
+
+import time
+import socket
+import xmlrpclib
+#import tiny_socket
+import re
+
+class RPCGateway(object):
+    def __init__(self, host, port, protocol):
+
+        self.protocol = protocol
+        self.host = host
+        self.port = port
+
+    def get_url(self):
+
+        """Get the url
+        """
+        return "%s://%s:%s/"%(self.protocol, self.host, self.port)
+
+    def listdb(self):
+        """Get the list of databases.
+        """
+        pass
+
+    def login(self, db, user, password):
+        pass
+
+    def execute(self, obj, method, *args):
+        pass
+
+
+
+class RPCSession(object):
+    def __init__(self,url):
+
+        m = re.match('^(http[s]?://|socket://)([\w.\-]+):(\d{1,5})$', url or '')
+
+        host = m.group(2)
+        port = m.group(3)
+        protocol = m.group(1)
+        if not m:
+            return -1
+        if protocol == 'http://' or protocol == 'http://':
+            self.gateway = XMLRPCGateway(host, port, 'http')
+        elif protocol == 'socket://':
+
+            self.gateway = NETRPCGateway(host, port)
+
+    def listdb(self):
+        return self.gateway.listdb()
+
+    def login(self, db, user, password):
+
+        if password is None:
+            return -1
+
+        uid = self.gateway.login(db, user or '', password or '')
+
+        if uid <= 0:
+            return -1
+
+        self.uid = uid
+        self.db = db
+        self.password = password
+        self.open = True
+        return uid
+
+
+    def execute(self, obj, method, *args):
+        try:
+            result = self.gateway.execute(obj, method, *args)
+            return self.__convert(result)
+        except Exception,e:
+          import traceback,sys
+          info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+
+    def __convert(self, result):
+
+        if isinstance(result, basestring):
+            # try to convert into unicode string
+            try:
+                return ustr(result)
+            except Exception, e:
+                return result
+
+        elif isinstance(result, list):
+            return [self.__convert(val) for val in result]
+
+        elif isinstance(result, tuple):
+            return tuple([self.__convert(val) for val in result])
+
+        elif isinstance(result, dict):
+            newres = {}
+            for key, val in result.items():
+                newres[key] = self.__convert(val)
+
+            return newres
+
+        else:
+            return result
+
+class XMLRPCGateway(RPCGateway):
+    """XML-RPC implementation.
+    """
+    def __init__(self, host, port, protocol='http'):
+
+        super(XMLRPCGateway, self).__init__(host, port, protocol)
+        global rpc_url
+        rpc_url =  self.get_url() + 'xmlrpc/'
+
+    def listdb(self):
+        global rpc_url
+        sock = xmlrpclib.ServerProxy(rpc_url + 'db')
+        try:
+            return sock.list()
+        except Exception, e:
+            return -1
+
+    def login(self, db, user, password):
+
+        global rpc_url
+
+        sock = xmlrpclib.ServerProxy(rpc_url + 'common')
+
+        try:
+            res = sock.login(db, user, password)
+        except Exception, e:
+            import traceback,sys
+            info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+            return -1
+
+        return res
+
+    def execute(self, sDatabase,UID,sPassword,obj, method, *args):
+        global rpc_url
+
+        sock = xmlrpclib.ServerProxy(rpc_url + 'object')
+
+        return sock.execute(sDatabase,UID,sPassword, obj ,method,*args)
+
+
+
+class NETRPCGateway(RPCGateway):
+    def __init__(self, host, port):
+
+        super(NETRPCGateway, self).__init__(host, port, 'socket')
+
+    def listdb(self):
+        sock = mysocket()
+        try:
+            sock.connect(self.host, self.port)
+            sock.mysend(('db', 'list'))
+            res = sock.myreceive()
+            sock.disconnect()
+            return res
+        except Exception, e:
+            return -1
+
+    def login(self, db, user, password):
+        sock =  mysocket()
+        try:
+            sock.connect(self.host, self.port)
+            sock.mysend(('common', 'login', db, user, password))
+            res = sock.myreceive()
+            sock.disconnect()
+        except Exception, e:
+            return -1
+        return res
+    def execute(self,obj, method, *args):
+        sock = mysocket()
+        try:
+            sock.connect(self.host, self.port)
+            data=(('object', 'execute',obj,method,)+args)
+            sock.mysend(data)
+            res=sock.myreceive()
+            sock.disconnect()
+            return res
+
+        except Exception,e:
+            import traceback,sys
+            info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+
+
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import socket
+import cPickle
+import cStringIO
+import marshal
+
+class Myexception(Exception):
+    def __init__(self, faultCode, faultString):
+        self.faultCode = faultCode
+        self.faultString = faultString
+        self.args = (faultCode, faultString)
+
+class mysocket:
+    def __init__(self, sock=None):
+        if sock is None:
+            self.sock = socket.socket(
+            socket.AF_INET, socket.SOCK_STREAM)
+        else:
+            self.sock = sock
+        self.sock.settimeout(120)
+    def connect(self, host, port=False):
+        if not port:
+            protocol, buf = host.split('//')
+            host, port = buf.split(':')
+        self.sock.connect((host, int(port)))
+    def disconnect(self):
+        self.sock.shutdown(socket.SHUT_RDWR)
+        self.sock.close()
+    def mysend(self, msg, exception=False, traceback=None):
+
+        msg = cPickle.dumps([msg,traceback])
+        size = len(msg)
+        self.sock.send('%8d' % size)
+        self.sock.send(exception and "1" or "0")
+        totalsent = 0
+        while totalsent < size:
+            sent = self.sock.send(msg[totalsent:])
+            if sent == 0:
+                raise RuntimeError, "socket connection broken"
+            totalsent = totalsent + sent
+    def myreceive(self):
+        buf=''
+        while len(buf) < 8:
+            chunk = self.sock.recv(8 - len(buf))
+            if chunk == '':
+                raise RuntimeError, "socket connection broken"
+            buf += chunk
+        size = int(buf)
+        buf = self.sock.recv(1)
+        if buf != "0":
+            exception = buf
+        else:
+            exception = False
+        msg = ''
+        while len(msg) < size:
+            chunk = self.sock.recv(size-len(msg))
+            if chunk == '':
+                raise RuntimeError, "socket connection broken"
+            msg = msg + chunk
+        msgio = cStringIO.StringIO(msg)
+        unpickler = cPickle.Unpickler(msgio)
+        unpickler.find_global = None
+        res = unpickler.load()
+
+        if isinstance(res[0],Exception):
+            if exception:
+                raise Myexception(str(res[0]), str(res[1]))
+            raise res[0]
+        else:
+            return res[0]
+
+
+
+import uno
+import string
+import unohelper
+import xmlrpclib
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from lib.error import ErrorDialog
+    from lib.functions import *
+    from ServerParameter import *
+    from lib.logreport import *
+    from lib.rpc import *
+    from LoginTest import *
+
+    database="test_db1"
+    uid = 3
+
+
+#class RepeatIn:
+class RepeatIn( unohelper.Base, XJobExecutor ):
+    def __init__(self,sObject="",sVariable="",sFields="",sDisplayName="",bFromModify=False):
+        # Interface Design
+        LoginTest()
+        self.logobj=Logger()
+        if not loginstatus and __name__=="package":
+            exit(1)
+
+        self.win = DBModalDialog(60, 50, 180, 250, "RepeatIn Builder")
+        self.win.addFixedText("lblVariable", 2, 12, 60, 15, "Objects to loop on :")
+        self.win.addComboBox("cmbVariable", 180-120-2, 10, 120, 15,True, itemListenerProc=self.cmbVariable_selected)
+        self.insVariable = self.win.getControl( "cmbVariable" )
+
+        self.win.addFixedText("lblFields", 10, 32, 60, 15, "Field to loop on :")
+        self.win.addComboListBox("lstFields", 180-120-2, 30, 120, 150, False,itemListenerProc=self.lstbox_selected)
+        self.insField = self.win.getControl( "lstFields" )
+
+        self.win.addFixedText("lblName", 12, 187, 60, 15, "Variable name :")
+        self.win.addEdit("txtName", 180-120-2, 185, 120, 15,)
+
+        self.win.addFixedText("lblUName", 8, 207, 60, 15, "Displayed name :")
+        self.win.addEdit("txtUName", 180-120-2, 205, 120, 15,)
+
+        self.win.addButton('btnOK',-2 ,-10,45,15,'Ok', actionListenerProc = self.btnOk_clicked )
+
+        self.win.addButton('btnCancel',-2 - 45 - 5 ,-10,45,15,'Cancel', actionListenerProc = self.btnCancel_clicked )
+
+        global passwd
+        self.password = passwd
+        global url
+        self.sock=RPCSession(url)
+        # Variable Declaration
+        self.sValue=None
+        self.sObj=None
+        self.aSectionList=[]
+        self.sGVariable=sVariable
+        self.sGDisplayName=sDisplayName
+        self.aItemList=[]
+        self.aComponentAdd=[]
+        self.aObjectList=[]
+        self.aListRepeatIn=[]
+        self.aVariableList=[]
+        # Call method to perform Enumration on Report Document
+        EnumDocument(self.aItemList,self.aComponentAdd)
+        # Perform checking that Field-1 and Field - 4 is available or not alos get Combobox
+        # filled if condition is true
+        desktop = getDesktop()
+        doc = desktop.getCurrentComponent()
+        docinfo = doc.getDocumentInfo()
+        # Check weather Field-1 is available if not then exit from application
+        self.sMyHost= ""
+
+        if not docinfo.getUserFieldValue(3) == "" and not docinfo.getUserFieldValue(0)=="":
+            self.sMyHost= docinfo.getUserFieldValue(0)
+            self.count=0
+            oParEnum = doc.getTextFields().createEnumeration()
+
+            while oParEnum.hasMoreElements():
+                oPar = oParEnum.nextElement()
+                if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+                    self.count += 1
+
+            getList(self.aObjectList, self.sMyHost,self.count)
+            cursor = doc.getCurrentController().getViewCursor()
+            text = cursor.getText()
+            tcur = text.createTextCursorByRange(cursor)
+
+            self.aVariableList.extend( filter( lambda obj: obj[:obj.find(" ")] == "List", self.aObjectList ) )
+
+            for i in range(len(self.aItemList)):
+                try:
+                    anItem = self.aItemList[i][1]
+                    component = self.aComponentAdd[i]
+
+                    if component == "Document":
+                        sLVal = anItem[anItem.find(",'") + 2:anItem.find("')")]
+                        self.aVariableList.extend( filter( lambda obj: obj[:obj.find("(")] == sLVal, self.aObjectList ) )
+
+                    if tcur.TextSection:
+                        getRecersiveSection(tcur.TextSection,self.aSectionList)
+                        if component in self.aSectionList:
+                            sLVal = anItem[anItem.find(",'") + 2:anItem.find("')")]
+                            self.aVariableList.extend( filter( lambda obj: obj[:obj.find("(")] == sLVal, self.aObjectList ) )
+
+                    if tcur.TextTable:
+                        if not component == "Document" and component[component.rfind(".") + 1:] == tcur.TextTable.Name:
+                            VariableScope( tcur, self.aVariableList, self.aObjectList, self.aComponentAdd, self.aItemList, component )
+                except :
+                    import traceback,sys
+                    info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+                    self.logobj.log_write('RepeatIn', LOG_ERROR, info)
+            self.bModify=bFromModify
+
+            if self.bModify==True:
+
+                if sObject=="":
+                    self.insVariable.setText("List of "+docinfo.getUserFieldValue(3))
+                    self.insField.addItem("objects",self.win.getListBoxItemCount("lstFields"))
+                    self.win.setEditText("txtName", sVariable)
+                    self.win.setEditText("txtUName",sDisplayName)
+                    self.sValue= "objects"
+                else:
+                    sItem=""
+		    for anObject in self.aObjectList:
+			if anObject[:anObject.find("(")] == sObject:
+			    sItem = anObject
+			    self.insVariable.setText( sItem )
+
+		    genTree(
+			sItem[sItem.find("(")+1:sItem.find(")")],
+			self.aListRepeatIn,
+			self.insField,
+			self.sMyHost,
+			2,
+			ending=['one2many','many2many'],
+			recur=['one2many','many2many']
+		    )
+
+                    self.sValue= self.win.getListBoxItem("lstFields",self.aListRepeatIn.index(sFields))
+
+            for var in self.aVariableList:
+
+		if var[:8] <> 'List of ':
+		    self.model_ids = self.sock.execute(database, uid, self.password, 'ir.model' ,  'search', [('model','=',var[var.find("(")+1:var.find(")")])])
+                else:
+		    self.model_ids = self.sock.execute(database, uid, self.password, 'ir.model' ,  'search', [('model','=',var[8:])])
+                fields=['name','model']
+                self.model_res = self.sock.execute(database, uid, self.password, 'ir.model', 'read', self.model_ids,fields)
+                if self.model_res <> []:
+		    if var[:8]<>'List of ':
+                        self.insVariable.addItem(var[:var.find("(")+1] + self.model_res[0]['name'] + ")" ,self.insVariable.getItemCount())
+                    else:
+                        self.insVariable.addItem('List of ' + self.model_res[0]['name'] ,self.insVariable.getItemCount())
+                else:
+                    self.insVariable.addItem(var ,self.insVariable.getItemCount())
+
+            self.win.doModalDialog("lstFields",self.sValue)
+        else:
+            ErrorDialog("Please Select Appropriate module" ,"Create new report from: \nOpenERP -> Open a New Report")
+            self.win.endExecute()
+
+    def lstbox_selected(self,oItemEvent):
+        sItem=self.win.getListBoxSelectedItem("lstFields")
+        sMain=self.aListRepeatIn[self.win.getListBoxSelectedItemPos("lstFields")]
+
+        if self.bModify==True:
+            self.win.setEditText("txtName", self.sGVariable)
+            self.win.setEditText("txtUName",self.sGDisplayName)
+        else:
+	    self.win.setEditText("txtName",sMain[sMain.rfind("/")+1:])
+	    self.win.setEditText("txtUName","|-."+sItem[sItem.rfind("/")+1:]+".-|")
+
+    def cmbVariable_selected(self,oItemEvent):
+
+        if self.count > 0 :
+
+            desktop=getDesktop()
+            doc =desktop.getCurrentComponent()
+            docinfo=doc.getDocumentInfo()
+            self.win.removeListBoxItems("lstFields", 0, self.win.getListBoxItemCount("lstFields"))
+            sItem=self.win.getComboBoxText("cmbVariable")
+            for var in self.aVariableList:
+		if var[:8]=='List of ':
+		    if var[:8]==sItem[:8]:
+                        sItem = var
+		elif var[:var.find("(")+1] == sItem[:sItem.find("(")+1]:
+                    sItem = var
+            self.aListRepeatIn=[]
+
+	    data = ( sItem[sItem.rfind(" ") + 1:] == docinfo.getUserFieldValue(3) ) and docinfo.getUserFieldValue(3) or sItem[sItem.find("(")+1:sItem.find(")")]
+	    genTree( data, self.aListRepeatIn, self.insField, self.sMyHost, 2, ending=['one2many','many2many'], recur=['one2many','many2many'] )
+
+            self.win.selectListBoxItemPos("lstFields", 0, True )
+
+        else:
+            sItem=self.win.getComboBoxText("cmbVariable")
+            for var in self.aVariableList:
+                if var[:8]=='List of ' and var[:8] == sItem[:8]:
+                    sItem = var
+            if sItem.find(".")==-1:
+                temp=sItem[sItem.rfind("x_"):]
+            else:
+                temp=sItem[sItem.rfind(".")+1:]
+            self.win.setEditText("txtName",temp)
+            self.win.setEditText("txtUName","|-."+temp+".-|")
+            self.insField.addItem("objects",self.win.getListBoxItemCount("lstFields"))
+            self.win.selectListBoxItemPos("lstFields", 0, True )
+
+    def btnOk_clicked(self, oActionEvent):
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        cursor = doc.getCurrentController().getViewCursor()
+        selectedItem = self.win.getListBoxSelectedItem( "lstFields" )
+        selectedItemPos = self.win.getListBoxSelectedItemPos( "lstFields" )
+        txtName = self.win.getEditText( "txtName" )
+        txtUName = self.win.getEditText( "txtUName" )
+        if selectedItem != "" and txtName != "" and txtUName != "":
+            sKey=u""+ txtUName
+            if selectedItem == "objects":
+                sValue=u"[[ repeatIn(" + selectedItem + ",'" + txtName + "') ]]"
+            else:
+                sObjName=self.win.getComboBoxText("cmbVariable")
+                sObjName=sObjName[:sObjName.find("(")]
+                sValue=u"[[ repeatIn(" + sObjName + self.aListRepeatIn[selectedItemPos].replace("/",".") + ",'" + txtName +"') ]]"
+
+            if self.bModify == True:
+                oCurObj = cursor.TextField
+                oCurObj.Items = (sKey,sValue)
+                oCurObj.update()
+            else:
+                oInputList = doc.createInstance("com.sun.star.text.TextField.DropDown")
+                if self.win.getListBoxSelectedItem("lstFields") == "objects":
+                    oInputList.Items = (sKey,sValue)
+                    doc.Text.insertTextContent(cursor,oInputList,False)
+                else:
+                    sValue=u"[[ repeatIn(" + sObjName + self.aListRepeatIn[selectedItemPos].replace("/",".") + ",'" + txtName +"') ]]"
+                    if cursor.TextTable==None:
+                        oInputList.Items = (sKey,sValue)
+                        doc.Text.insertTextContent(cursor,oInputList,False)
+                    else:
+                        oInputList.Items = (sKey,sValue)
+                        widget = ( cursor.TextTable or selectedItem <> 'objects' ) and cursor.TextTable.getCellByName( cursor.Cell.CellName ) or doc.Text
+                        widget.insertTextContent(cursor,oInputList,False)
+                self.win.endExecute()
+        else:
+            ErrorDialog("Please Fill appropriate data in Object Field or Name field \nor select perticular value from the list of fields")
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
+if __name__<>"package" and __name__=="__main__":
+    RepeatIn()
+elif __name__=="package":
+    g_ImplementationHelper = unohelper.ImplementationHelper()
+    g_ImplementationHelper.addImplementation( RepeatIn, "org.openoffice.openerp.report.repeatln", ("com.sun.star.task.Job",),)
+
+
+import uno
+import string
+import unohelper
+import xmlrpclib
+
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from lib.functions import *
+    from lib.error import ErrorDialog
+    from LoginTest import *
+    from lib.logreport import *
+    from lib.rpc import *
+    database="report"
+    uid = 3
+
+
+class Fields(unohelper.Base, XJobExecutor ):
+    def __init__(self,sVariable="",sFields="",sDisplayName="",bFromModify=False):
+        LoginTest()
+        if not loginstatus and __name__=="package":
+            exit(1)
+        self.logobj=Logger()
+        self.win = DBModalDialog(60, 50, 200, 225, "Field Builder")
+
+        self.win.addFixedText("lblVariable", 27, 12, 60, 15, "Variable :")
+        self.win.addComboBox("cmbVariable", 180-120-2, 10, 130, 15,True, itemListenerProc=self.cmbVariable_selected)
+        self.insVariable = self.win.getControl( "cmbVariable" )
+
+        self.win.addFixedText("lblFields", 10, 32, 60, 15, "Variable Fields :")
+        self.win.addComboListBox("lstFields", 180-120-2, 30, 130, 150, False,True,itemListenerProc=self.lstbox_selected)
+        self.insField = self.win.getControl( "lstFields" )
+
+        self.win.addFixedText("lblUName", 8, 187, 60, 15, "Displayed name :")
+        self.win.addEdit("txtUName", 180-120-2, 185, 130, 15,)
+
+        self.win.addButton('btnOK',-5 ,-5,45,15,'Ok' ,actionListenerProc = self.btnOk_clicked )
+        self.win.addButton('btnCancel',-5 - 45 - 5 ,-5,45,15,'Cancel' ,actionListenerProc = self.btnCancel_clicked )
+
+        global passwd
+        self.password = passwd
+        global url
+        self.sock=RPCSession(url)
+
+        self.sValue=None
+        self.sObj=None
+        self.aSectionList=[]
+        self.sGDisplayName=sDisplayName
+        self.aItemList=[]
+        self.aComponentAdd=[]
+        self.aObjectList=[]
+        self.aListFields=[]
+        self.aVariableList=[]
+        EnumDocument(self.aItemList,self.aComponentAdd)
+        desktop=getDesktop()
+        doc =desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        self.sMyHost= ""
+
+        if not docinfo.getUserFieldValue(3) == "" and not docinfo.getUserFieldValue(0)=="":
+            self.sMyHost = docinfo.getUserFieldValue(0)
+            self.count = 0
+            oParEnum = doc.getTextFields().createEnumeration()
+
+            while oParEnum.hasMoreElements():
+                oPar = oParEnum.nextElement()
+                if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+                    self.count += 1
+
+            getList(self.aObjectList, self.sMyHost,self.count)
+            cursor = doc.getCurrentController().getViewCursor()
+            text = cursor.getText()
+            tcur = text.createTextCursorByRange(cursor)
+
+            self.aVariableList.extend( filter( lambda obj: obj[:obj.find("(")] == "Objects", self.aObjectList ) )
+
+            for i in range(len(self.aItemList)):
+                try:
+                    anItem = self.aItemList[i][1]
+                    component = self.aComponentAdd[i]
+
+                    if component == "Document":
+                        sLVal = anItem[anItem.find(",'") + 2:anItem.find("')")]
+                        self.aVariableList.extend( filter( lambda obj: obj[:obj.find("(")] == sLVal, self.aObjectList ) )
+
+                    if tcur.TextSection:
+                        getRecersiveSection(tcur.TextSection,self.aSectionList)
+                        if component in self.aSectionList:
+                            sLVal = anItem[anItem.find(",'") + 2:anItem.find("')")]
+                            self.aVariableList.extend( filter( lambda obj: obj[:obj.find("(")] == sLVal, self.aObjectList ) )
+
+                    if tcur.TextTable:
+                        if not component == "Document" and component[component.rfind(".")+1:] == tcur.TextTable.Name:
+                            VariableScope(tcur, self.aVariableList, self.aObjectList, self.aComponentAdd, self.aItemList, component)
+                except:
+                    import traceback,sys
+                    info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+                    self.logobj.log_write('Fields', LOG_ERROR, info)
+
+            self.bModify=bFromModify
+            if self.bModify==True:
+                sItem=""
+                for anObject in self.aObjectList:
+                    if anObject[:anObject.find("(")] == sVariable:
+                        sItem = anObject
+                        self.insVariable.setText(sItem)
+                genTree(
+                    sItem[sItem.find("(")+1:sItem.find(")")],
+                    self.aListFields,
+                    self.insField,
+                    self.sMyHost,
+                    2,
+                    ending_excl=['one2many','many2one','many2many','reference'],
+                    recur=['many2one']
+                )
+                self.sValue= self.win.getListBoxItem("lstFields",self.aListFields.index(sFields))
+            for var in self.aVariableList:
+
+                    self.model_ids =self.sock.execute(database, uid, self.password, 'ir.model' ,  'search', [('model','=',var[var.find("(")+1:var.find(")")])])
+                    fields=['name','model']
+                    self.model_res = self.sock.execute(database, uid, self.password, 'ir.model', 'read', self.model_ids,fields)
+                    if self.model_res <> []:
+                        self.insVariable.addItem(var[:var.find("(")+1] + self.model_res[0]['name'] + ")" ,self.insVariable.getItemCount())
+                    else:
+                        self.insVariable.addItem(var ,self.insVariable.getItemCount())
+
+            self.win.doModalDialog("lstFields",self.sValue)
+        else:
+            ErrorDialog("Please insert user define field Field-1 or Field-4","Just go to File->Properties->User Define \nField-1 Eg. http://localhost:8069 \nOR \nField-4 Eg. account.invoice")
+            self.win.endExecute()
+
+    def lstbox_selected(self,oItemEvent):
+        try:
+
+            desktop=getDesktop()
+            doc =desktop.getCurrentComponent()
+            docinfo=doc.getDocumentInfo()
+            sItem= self.win.getComboBoxText("cmbVariable")
+            for var in self.aVariableList:
+                if var[:var.find("(")+1]==sItem[:sItem.find("(")+1]:
+                    sItem = var
+            sMain=self.aListFields[self.win.getListBoxSelectedItemPos("lstFields")]
+            sObject=self.getRes(self.sock,sItem[sItem.find("(")+1:-1],sMain[1:])
+            ids = self.sock.execute(database, uid, self.password, sObject ,  'search', [])
+            res = self.sock.execute(database, uid, self.password, sObject , 'read',[ids[0]])
+            self.win.setEditText("txtUName",res[0][sMain[sMain.rfind("/")+1:]])
+        except:
+            import traceback,sys
+            info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+            self.logobj.log_write('Fields', LOG_ERROR, info)
+            self.win.setEditText("txtUName","TTT")
+        if self.bModify:
+            self.win.setEditText("txtUName",self.sGDisplayName)
+
+    def getRes(self,sock ,sObject,sVar):
+        desktop=getDesktop()
+        doc =desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        res = sock.execute(database, uid, self.password, sObject , 'fields_get')
+        key = res.keys()
+        key.sort()
+        myval=None
+        if not sVar.find("/")==-1:
+	    myval=sVar[:sVar.find("/")]
+        else:
+            myval=sVar
+        if myval in key:
+            if (res[myval]['type'] in ['many2one']):
+                sObject = res[myval]['relation']
+		return self.getRes(sock,res[myval]['relation'], sVar[sVar.find("/")+1:])
+            else:
+                return sObject
+
+    def cmbVariable_selected(self,oItemEvent):
+        if self.count > 0 :
+            try:
+                desktop=getDesktop()
+                doc =desktop.getCurrentComponent()
+                docinfo=doc.getDocumentInfo()
+                self.win.removeListBoxItems("lstFields", 0, self.win.getListBoxItemCount("lstFields"))
+                self.aListFields=[]
+                tempItem = self.win.getComboBoxText("cmbVariable")
+                for var in self.aVariableList:
+                    if var[:var.find("(")] == tempItem[:tempItem.find("(")]:
+                        sItem=var
+
+                genTree(
+                    sItem[sItem.find("(")+1:sItem.find(")")],
+                    self.aListFields,
+                    self.insField,
+                    self.sMyHost,
+                    2,
+                    ending_excl=['one2many','many2one','many2many','reference'],
+                    recur=['many2one']
+                )
+            except:
+                import traceback,sys
+                info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+                self.logobj.log_write('Fields', LOG_ERROR, info)
+
+    def btnOk_clicked( self, oActionEvent ):
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        cursor = doc.getCurrentController().getViewCursor()
+        for i in self.win.getListBoxSelectedItemsPos("lstFields"):
+                itemSelected = self.aListFields[i]
+                itemSelectedPos = i
+                txtUName=self.win.getEditText("txtUName")
+                sKey=u""+txtUName
+                if itemSelected != "" and txtUName != "" and self.bModify==True :
+                    txtUName=self.sGDisplayName
+                    sKey=u""+txtUName
+                    txtUName=self.sGDisplayName
+                    oCurObj=cursor.TextField
+                    sObjName=self.insVariable.getText()
+                    sObjName=sObjName[:sObjName.find("(")]
+                    sValue=u"[[ " + sObjName + self.aListFields[itemSelectedPos].replace("/",".") + " ]]"
+                    oCurObj.Items = (sKey,sValue)
+                    oCurObj.update()
+                    self.win.endExecute()
+                elif itemSelected != "" and txtUName != "" :
+
+                    oInputList = doc.createInstance("com.sun.star.text.TextField.DropDown")
+                    sObjName=self.win.getComboBoxText("cmbVariable")
+                    sObjName=sObjName[:sObjName.find("(")]
+
+                    widget = ( cursor.TextTable and cursor.TextTable.getCellByName( cursor.Cell.CellName ) or doc.Text )
+
+                    sValue = u"[[ " + sObjName + self.aListFields[itemSelectedPos].replace("/",".") + " ]]"
+                    oInputList.Items = (sKey,sValue)
+                    widget.insertTextContent(cursor,oInputList,False)
+                    self.win.endExecute()
+                else:
+                    ErrorDialog("Please Fill appropriate data in Name field \nor select perticular value from the list of fields")
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
+if __name__<>"package" and __name__=="__main__":
+    Fields()
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( Fields, "org.openoffice.openerp.report.fields", ("com.sun.star.task.Job",),)
+
+import uno
+import string
+import unohelper
+import xmlrpclib
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from lib.error import ErrorDialog
+    from lib.functions import *
+    database="test"
+    uid = 3
+
+class Expression(unohelper.Base, XJobExecutor ):
+    def __init__(self,sExpression="",sName="", bFromModify=False):
+        LoginTest()
+        if not loginstatus and __name__=="package":
+            exit(1)
+        self.win = DBModalDialog(60, 50, 180, 65, "Expression Builder")
+        self.win.addFixedText("lblExpression",17 , 10, 35, 15, "Expression :")
+        self.win.addEdit("txtExpression", -5, 5, 123, 15)
+        self.win.addFixedText("lblName", 2, 30, 50, 15, "Displayed Name :")
+        self.win.addEdit("txtName", -5, 25, 123, 15)
+        self.win.addButton( "btnOK", -5, -5, 40, 15, "OK", actionListenerProc = self.btnOk_clicked )
+        self.win.addButton( "btnCancel", -5 - 40 -5, -5, 40, 15, "Cancel", actionListenerProc = self.btnCancel_clicked )
+        self.bModify=bFromModify
+        if self.bModify==True:
+            self.win.setEditText("txtExpression",sExpression)
+            self.win.setEditText("txtName",sName)
+        self.win.doModalDialog("",None)
+
+
+    def btnOk_clicked( self, oActionEvent ):
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        text = doc.Text
+        cursor = doc.getCurrentController().getViewCursor()
+        if self.bModify==True:
+            oCurObj=cursor.TextField
+            sKey=u""+self.win.getEditText("txtName")
+            sValue=u"[[ " + self.win.getEditText("txtExpression") + " ]]"
+            oCurObj.Items = (sKey,sValue)
+            oCurObj.update()
+            self.win.endExecute()
+        else:
+            oInputList = doc.createInstance("com.sun.star.text.TextField.DropDown")
+            if self.win.getEditText("txtName")!="" and self.win.getEditText("txtExpression")!="":
+                sKey=u""+self.win.getEditText("txtName")
+                sValue=u"[[ " + self.win.getEditText("txtExpression") + " ]]"
+                if cursor.TextTable==None:
+                    oInputList.Items = (sKey,sValue)
+                    text.insertTextContent(cursor,oInputList,False)
+                else:
+                    oTable = cursor.TextTable
+                    oCurCell = cursor.Cell
+                    tableText = oTable.getCellByName( oCurCell.CellName )
+                    oInputList.Items = (sKey,sValue)
+                    tableText.insertTextContent(cursor,oInputList,False)
+                self.win.endExecute()
+            else:
+                ErrorDialog("Please Fill appropriate data in Name field or \nExpression field")
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
+if __name__<>"package" and __name__=="__main__":
+    Expression()
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( Expression, "org.openoffice.openerp.report.expression", ("com.sun.star.task.Job",),)
+
+import re
+import uno
+import string
+import unohelper
+import xmlrpclib
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from Expression import Expression
+    from Fields import Fields
+    from Repeatln import RepeatIn
+    from lib.error import *
+    database="test"
+    uid = 3
+
+class modify(unohelper.Base, XJobExecutor ):
+    def __init__( self, ctx ):
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+
+        # Variable Declaration
+        desktop = getDesktop()
+        doc = desktop.getCurrentComponent()
+        docinfo = doc.getDocumentInfo()
+        self.oVC = doc.CurrentController.getViewCursor()
+        if not docinfo.getUserFieldValue(0)=="":
+            self.sMyHost= docinfo.getUserFieldValue(0)
+        else:
+            ErrorDialog(
+		"Please insert user define field Field-1",
+		"Just go to File->Properties->User Define \n"
+		"Field-1 Eg. http://localhost:8069"
+	    )
+            exit(1)
+
+        # Check weather Field-4 is available or not otherwise exit from application
+        if not docinfo.getUserFieldValue(3) == "" and not docinfo.getUserFieldValue(0)=="":
+            if self.oVC.TextField:
+                self.oCurObj=self.oVC.TextField
+		item = self.oCurObj.Items[0]
+
+		kind, group1, group2 = self.getOperation(self.oCurObj.Items[1] )
+
+		start_group1 = group1[:group1.find(".")]
+		stop_group1 = group1[group1.find("."):].replace(".", "/")
+
+                if kind == "field":
+		    Fields( start_group1, stop_group1, item, True )
+                elif kind == "expression":
+                    Expression( group1, item, True )
+                elif kind == "repeatIn":
+		    RepeatIn( start_group1, group2, stop_group1, item, True )
+            else:
+                ErrorDialog(
+		    "Please place your cursor at begaining of field \n"
+		    "which you want to modify",""
+		)
+
+        else:
+            ErrorDialog(
+		"Please insert user define field Field-1 or Field-4",
+		"Just go to File->Properties->User Define \n"
+		"Field-1 Eg. http://localhost:8069 \n"
+		"OR \n"
+		"Field-4 Eg. account.invoice"
+	    )
+            exit(1)
+
+    def getOperation(self, str):
+        #str = "[[ RepeatIn(objects, 'variable') ]]" #repeatIn
+        #str = "[[ saleorder.partner_id.name ]]" # field
+        #str = "[[ some thing complex ]]" # expression
+        method1 = lambda x: (u'repeatIn', x.group(1), x.group(2))
+        method2 = lambda x: (u'field', x.group(1), None)
+        method3 = lambda x: (u'expression', x.group(1), None)
+        regexes = [
+	    ('\\[\\[ *repeatIn\\( *(.+)*, *\'([a-zA-Z0-9_]+)\' *\\) *\\]\\]', method1),
+	    ('\\[\\[ *([a-zA-Z0-9_\.]+) *\\]\\]', method2),
+	    ('\\[\\[ *(.+) *\\]\\]', method3)
+        ]
+        for (rule,method) in regexes:
+	    res = re.match(rule, str)
+	    if res:
+		return method(res)
+
+if __name__<>"package":
+    modify(None)
+else:
+    g_ImplementationHelper.addImplementation( modify, "org.openoffice.openerp.report.modify", ("com.sun.star.task.Job",),)
+
+import uno
+import string
+import unohelper
+import xmlrpclib
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from lib.error import ErrorDialog
+    from lib.functions import *
+    from lib.logreport import *
+    from lib.rpc import *
+    from Change import *
+    database="test"
+
+class ServerParameter( unohelper.Base, XJobExecutor ):
+    def __init__(self,ctx):
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+        desktop=getDesktop()
+        log_detail(self)
+        self.logobj=Logger()
+        doc = desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        self.win=DBModalDialog(60, 50, 160, 108, "Server Connection Parameter")
+
+        self.win.addFixedText("lblVariable", 2, 12, 35, 15, "Server URL")
+        if docinfo.getUserFieldValue(0)=="":
+            docinfo.setUserFieldValue(0,"http://localhost:8069")
+        self.win.addEdit("txtHost",-34,9,91,15,docinfo.getUserFieldValue(0))
+        self.win.addButton('btnChange',-2 ,9,30,15,'Change', actionListenerProc = self.btnChange_clicked )
+
+        self.win.addFixedText("lblDatabaseName", 6, 31, 31, 15, "Database")
+        #self.win.addFixedText("lblMsg", -2,28,123,15)
+#        self.win.addComboListBox("lstDatabase", -2,28,123,15, True)
+#        self.lstDatabase = self.win.getControl( "lstDatabase" )
+        #self.win.selectListBoxItem( "lstDatabase", docinfo.getUserFieldValue(2), True )
+        #self.win.setEnabled("lblMsg",False)
+
+        self.win.addFixedText("lblLoginName", 17, 51, 20, 15, "Login")
+        self.win.addEdit("txtLoginName",-2,48,123,15,docinfo.getUserFieldValue(1))
+
+        self.win.addFixedText("lblPassword", 6, 70, 31, 15, "Password")
+        self.win.addEdit("txtPassword",-2,67,123,15,)
+        self.win.setEchoChar("txtPassword",42)
+
+
+        self.win.addButton('btnOK',-2 ,-5, 60,15,'Connect' ,actionListenerProc = self.btnOk_clicked )
+
+        self.win.addButton('btnCancel',-2 - 60 - 5 ,-5, 35,15,'Cancel' ,actionListenerProc = self.btnCancel_clicked )
+        sValue=""
+        if docinfo.getUserFieldValue(0)<>"":
+            global url
+            global result
+            url=docinfo.getUserFieldValue(0)
+            self.sock=RPCSession(url)
+            res=self.sock.listdb()
+            result=res
+            if res == -1:
+                self.win.addEdit("lstDatabase",-2,28,123,15)
+#                sValue="Could not connect to the server!"
+#                self.lstDatabase.addItem("Could not connect to the server!",0)
+            elif res == 0:
+                sValue="No Database found !!!"
+                self.lstDatabase.addItem("No Database found !!!",0)
+            else:
+                self.win.addComboListBox("lstDatabase", -2,28,123,15, True)
+                self.lstDatabase = self.win.getControl( "lstDatabase" )
+                self.win.removeListBoxItems("lstDatabase", 0, self.win.getListBoxItemCount("lstDatabase"))
+                for i in range(len(res)):
+                    self.lstDatabase.addItem(res[i],i)
+                sValue = database
+        if sValue:
+            self.win.doModalDialog("lstDatabase",sValue)
+        else:
+            self.win.doModalDialog("lstDatabase",None)
+
+        #self.win.doModalDialog("lstDatabase",docinfo.getUserFieldValue(2))
+
+    def btnOk_clicked(self,oActionEvent):
+
+
+        sLogin=self.win.getEditText("txtLoginName")
+        sPassword=self.win.getEditText("txtPassword")
+        global url
+        global result
+        if result==-1:
+            sDatabase=self.win.getEditText("lstDatabase")
+        else:
+            sDatabase=self.win.getListBoxSelectedItem("lstDatabase")
+        self.sock=RPCSession(url)
+        UID = self.sock.login(sDatabase,sLogin,sPassword)
+        if not UID :
+            ErrorDialog("Connection Refuse...","Please enter valid Login/Password")
+            self.win.endExecute()
+        try:
+
+            ids  = self.sock.execute(sDatabase,UID,sPassword, 'res.groups' ,  'search', [('name','=','OpenOfficeReportDesigner')])
+            ids_module =self.sock.execute(sDatabase, UID, sPassword, 'ir.module.module', 'search', [('name','=','base_report_designer'),('state', '=', 'installed')])
+            dict_groups =self.sock.execute(sDatabase, UID,sPassword, 'res.groups' , 'read',ids,['users'])
+        except :
+            import traceback,sys
+            info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+            self.logobj.log_write('ServerParameter', LOG_ERROR, info)
+
+        if not len(ids) :
+            ErrorDialog("Group Not Found!!!  Create a group  named  \n\n"'"OpenOfficeReportDesigner"'"  \n\n  ","","Group Name Error")
+            self.logobj.log_write('Group Error',LOG_WARNING, ':Create a  group OpenOfficeReportDesigner   using database %s' % (sDatabase))
+            self.win.endExecute()
+        if not len(ids_module):
+            ErrorDialog("Please Install base_report_designer module", "", "Module Uninstalled Error")
+            self.logobj.log_write('Module Not Found',LOG_WARNING, ':base_report_designer not install in  database %s' % (sDatabase))
+            self.win.endExecute()
+
+        if UID not in dict_groups[0]['users']:
+            ErrorDialog("Connection Refuse...","You have not access these Report Designer")
+            self.logobj.log_write('Connection Refuse',LOG_WARNING, " Not Access Report Designer ")
+            self.win.endExecute()
+        else:
+            desktop=getDesktop()
+            doc = desktop.getCurrentComponent()
+            docinfo=doc.getDocumentInfo()
+            docinfo.setUserFieldValue(0,self.win.getEditText("txtHost"))
+            docinfo.setUserFieldValue(1,self.win.getEditText("txtLoginName"))
+            global passwd
+            passwd=self.win.getEditText("txtPassword")
+            global loginstatus
+            loginstatus=True
+            global database
+            database=sDatabase
+            global uid
+            uid=UID
+            #docinfo.setUserFieldValue(2,self.win.getListBoxSelectedItem("lstDatabase"))
+            #docinfo.setUserFieldValue(3,"")
+
+            ErrorDialog(" You can start creating your report in \n  \t the current document.","After Creating  sending to the server.","Message")
+            self.logobj.log_write('successful login',LOG_INFO, ':successful login from %s  using database %s' % (sLogin, sDatabase))
+            self.win.endExecute()
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
+    def btnChange_clicked(self,oActionEvent):
+        aVal=[]
+        url= self.win.getEditText("txtHost")
+        Change(aVal,url)
+        if aVal[1]== -1:
+           self.win.getEditText("lstDatabase")
+        elif aVal[1]==0:
+            ErrorDialog(aVal[0],"")
+        else:
+            self.win.setEditText("txtHost",aVal[0])
+            self.win.removeListBoxItems("lstDatabase", 0, self.win.getListBoxItemCount("lstDatabase"))
+            for i in range(len(aVal[1])):
+                self.lstDatabase.addItem(aVal[1][i],i)
+
+
+if __name__<>"package" and __name__=="__main__":
+    ServerParameter(None)
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( ServerParameter, "org.openoffice.openerp.report.serverparam", ("com.sun.star.task.Job",),)
+
+if __name__<>"package":
+    from lib.gui import *
+    from lib.functions import *
+    from lib.rpc import *
+
+class Change:
+    def __init__(self, aVal= None, sURL=""):
+        self.win=DBModalDialog(60, 50, 120, 90, "Connect to Open ERP Server")
+
+        self.win.addFixedText("lblVariable", 38, 12, 60, 15, "Server")
+
+        self.win.addEdit("txtHost",-2,9,60,15,sURL[sURL.find("/")+2:sURL.rfind(":")])
+
+        self.win.addFixedText("lblReportName",45 , 31, 60, 15, "Port")
+        self.win.addEdit("txtPort",-2,28,60,15,sURL[sURL.rfind(":")+1:])
+
+        self.win.addFixedText("lblLoginName", 2, 51, 60, 15, "Protocol Connection")
+
+        self.win.addComboListBox("lstProtocol", -2, 48, 60, 15, True)
+        self.lstProtocol = self.win.getControl( "lstProtocol" )
+
+#        self.lstProtocol.addItem( "XML-RPC", 0)
+        #self.lstProtocol.addItem( "XML-RPC secure", 1)
+        #self.lstProtocol.addItem( "NET-RPC (faster)", 2)
+
+        self.win.addButton( 'btnOK', -2, -5, 30, 15, 'Ok', actionListenerProc = self.btnOk_clicked )
+
+        self.win.addButton( 'btnCancel', -2 - 30 - 5 ,-5, 30, 15, 'Cancel', actionListenerProc = self.btnCancel_clicked )
+        self.aVal=aVal
+        self.protocol = {
+            'XML-RPC': 'http://',
+            'XML-RPC secure': 'https://',
+            'NET-RPC': 'socket://',
+        }
+        for i in self.protocol.keys():
+            self.lstProtocol.addItem(i,self.lstProtocol.getItemCount() )
+
+        sValue=self.protocol.keys()[0]
+        if sURL<>"":
+            sValue=self.protocol.keys()[self.protocol.values().index(sURL[:sURL.find("/")+2])]
+
+        self.win.doModalDialog( "lstProtocol", sValue)
+
+    def btnOk_clicked(self,oActionEvent):
+        global url
+        url = self.protocol[self.win.getListBoxSelectedItem("lstProtocol")]+self.win.getEditText("txtHost")+":"+self.win.getEditText("txtPort")
+        self.sock=RPCSession(url)
+        res=self.sock.listdb()
+        if res == -1:
+            self.aVal.append(url)
+        elif res == 0:
+            self.aVal.append("No Database found !!!")
+        else:
+            self.aVal.append(url)
+        self.aVal.append(res)
+        self.win.endExecute()
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
+
+import uno
+import string
+import unohelper
+import xmlrpclib
+
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from lib.error import ErrorDialog
+    from lib.functions import *
+    from lib.logreport import *
+    from LoginTest import *
+    from lib.rpc import *
+    database="test"
+    uid = 3
+#
+#
+#
+# Start OpenOffice.org, listen for connections and open testing document
+#
+#
+class NewReport(unohelper.Base, XJobExecutor):
+    def __init__(self,ctx):
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+        LoginTest()
+        self.logobj=Logger()
+        if not loginstatus and __name__=="package":
+            exit(1)
+        self.win=DBModalDialog(60, 50, 180, 115, "Open New Report")
+        self.win.addFixedText("lblModuleSelection", 2, 2, 60, 15, "Module Selection")
+        self.win.addComboListBox("lstModule", -2,13,176,80 , False)
+        self.lstModule = self.win.getControl( "lstModule" )
+        self.aModuleName=[]
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+
+        global passwd
+        self.password = passwd
+        global url
+        self.sock=RPCSession(url)
+        ids = self.sock.execute(database, uid, self.password, 'ir.model' , 'search',[])
+        fields = [ 'model','name']
+        res = self.sock.execute(database, uid, self.password, 'ir.model' , 'read', ids, fields)
+        res.sort(lambda x, y: cmp(x['name'],y['name']))
+
+        for i in range(len(res)):
+            self.lstModule.addItem(res[i]['name'],self.lstModule.getItemCount())
+            self.aModuleName.append(res[i]['model'])
+        self.win.addButton('btnOK',-2 ,-5, 70,15,'Use Module in Report' ,actionListenerProc = self.btnOk_clicked )
+        self.win.addButton('btnCancel',-2 - 70 - 5 ,-5, 35,15,'Cancel' ,actionListenerProc = self.btnCancel_clicked )
+        self.win.doModalDialog("",None)
+
+    def btnOk_clicked(self,oActionEvent):
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        docinfo.setUserFieldValue(3,self.aModuleName[self.lstModule.getSelectedItemPos()])
+        self.logobj.log_write('Module Name',LOG_INFO, ':Module use in creating a report %s  using database %s' % (self.aModuleName[self.lstModule.getSelectedItemPos()], database))
+        self.win.endExecute()
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
+if __name__<>"package" and __name__=="__main__":
+    NewReport(None)
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( \
+            NewReport,
+            "org.openoffice.openerp.report.opennewreport",
+            ("com.sun.star.task.Job",),)
+
+if __name__<>"package":
+    from ServerParameter import *
+    from lib.gui import *
+
+class LoginTest:
+    def __init__(self):
+        if not loginstatus:
+            ServerParameter(None)
+
+
+
+import uno
+import string
+import unohelper
+import xmlrpclib
+import base64, tempfile
+
+
+from com.sun.star.task import XJobExecutor
+import os
+import sys
+if __name__<>'package':
+    from lib.gui import *
+    from lib.error import *
+    from LoginTest import *
+    from lib.logreport import *
+    from lib.rpc import *
+    database="test"
+    uid = 3
+
+#
+class ModifyExistingReport(unohelper.Base, XJobExecutor):
+    def __init__(self,ctx):
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+
+        LoginTest()
+        if not loginstatus and __name__=="package":
+            exit(1)
+
+        self.win = DBModalDialog(60, 50, 180, 120, "Modify Existing Report")
+        self.win.addFixedText("lblReport", 2, 3, 60, 15, "Report Selection")
+        self.win.addComboListBox("lstReport", -1,15,178,80 , False )
+        self.lstReport = self.win.getControl( "lstReport" )
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        self.logobj=Logger()
+        self.hostname = docinfo.getUserFieldValue(0)
+        global passwd
+        self.password = passwd
+        global url
+        self.sock=RPCSession(url)
+        # Open a new connexion to the server
+
+
+        ids = self.sock.execute(database, uid, self.password, 'ir.module.module', 'search', [('name','=','base_report_designer'),('state', '=', 'installed')])
+        if not len(ids):
+            ErrorDialog("Please Install base_report_designer module", "", "Module Uninstalled Error")
+            exit(1)
+
+        ids = self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'search', [('report_xsl', '=', False),('report_xml', '=', False)])
+
+        fields=['id', 'name','report_name','model']
+
+        self.reports = self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'read', ids, fields)
+        self.report_with_id = []
+
+        for report in self.reports:
+            if report['name']<>"":
+                model_ids = self.sock.execute(database, uid, self.password, 'ir.model' ,  'search', [('model','=', report['model'])])
+                model_res_other =self.sock.execute(database, uid, self.password, 'ir.model', 'read', model_ids, [ 'name', 'model' ] )
+                if model_res_other <> []:
+                    name = model_res_other[0]['name'] + " - " + report['name']
+                else:
+                    name = report['name'] + " - " + report['model']
+                self.report_with_id.append( (report['id'], name, report['model'] ) )
+
+        self.report_with_id.sort( lambda x, y: cmp( x[1], y[1] ) )
+
+        for id, report_name, model_name in self.report_with_id:
+            self.lstReport.addItem( report_name, self.lstReport.getItemCount() )
+
+        self.win.addButton('btnSave',10,-5,50,15,'Open Report' ,actionListenerProc = self.btnOk_clicked )
+        self.win.addButton('btnCancel',-10 ,-5,50,15,'Cancel' ,actionListenerProc = self.btnCancel_clicked )
+        self.win.addButton('btnDelete',15 -80 ,-5,50,15,'Delete Report',actionListenerProc = self.btnDelete_clicked)
+        self.win.doModalDialog("lstReport",self.report_with_id[0][1] )
+
+    def btnOk_clicked(self, oActionEvent):
+        try:
+            desktop=getDesktop()
+            doc = desktop.getCurrentComponent()
+            docinfo=doc.getDocumentInfo()
+
+            selectedItemPos = self.win.getListBoxSelectedItemPos( "lstReport" )
+            id = self.report_with_id[ selectedItemPos ][0]
+
+            res = self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'report_get', id)
+
+            if res['file_type'] in ['sxw','odt'] :
+               file_type = res['file_type']
+            else :
+               file_type = 'sxw'
+
+            fp_name = tempfile.mktemp('.'+file_type)
+            fp_name1="r"+fp_name
+            fp_path=os.path.join(fp_name1).replace("\\","/")
+            fp_win=fp_path[1:]
+
+            filename = ( os.name == 'nt' and fp_win or fp_name )
+            if res['report_sxw_content']:
+                write_data_to_file( filename, base64.decodestring(res['report_sxw_content']))
+            url = "file:///%s" % filename
+
+            arr=Array(makePropertyValue("MediaType","application/vnd.sun.xml.writer"),)
+            oDoc2 = desktop.loadComponentFromURL(url, "openerp", 55, arr)
+            docinfo2=oDoc2.getDocumentInfo()
+            docinfo2.setUserFieldValue(0, self.hostname)
+            docinfo2.setUserFieldValue(1,self.password)
+            docinfo2.setUserFieldValue(2,id)
+            docinfo2.setUserFieldValue(3,self.report_with_id[selectedItemPos][2])
+
+            oParEnum = oDoc2.getTextFields().createEnumeration()
+            while oParEnum.hasMoreElements():
+                oPar = oParEnum.nextElement()
+                if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+                    oPar.SelectedItem = oPar.Items[0]
+                    oPar.update()
+            if oDoc2.isModified():
+                if oDoc2.hasLocation() and not oDoc2.isReadonly():
+                    oDoc2.store()
+
+            ErrorDialog("Download is Completed","Your file has been placed here :\n"+ fp_name,"Download Message")
+            obj=Logger()
+            obj.log_write('Modify Existing Report',LOG_INFO, ':successful download report  %s  using database %s' % (self.report_with_id[selectedItemPos][2], database))
+        except Exception, e:
+            ErrorDialog("Report has not been downloaded", "Report: %s\nDetails: %s" % ( fp_name, str(e) ),"Download Message")
+            import traceback,sys
+            info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+            self.logobj.log_write('ModifyExistingReport', LOG_ERROR, info)
+
+        self.win.endExecute()
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
+    def btnDelete_clicked( self, oActionEvent ):
+         desktop=getDesktop()
+         doc = desktop.getCurrentComponent()
+         docinfo=doc.getDocumentInfo()
+
+         selectedItemPos = self.win.getListBoxSelectedItemPos( "lstReport" )
+         name=self.win.getListBoxSelectedItem ("lstReport")
+         id = self.report_with_id[ selectedItemPos ][0]
+         temp = self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'unlink', id,)
+         str_value='ir.actions.report.xml,'+str(id)
+         ids = self.sock.execute(database, uid, self.password, 'ir.values' ,  'search',[('value','=',str_value)])
+         if ids:
+              rec = self.sock.execute(database, uid, self.password, 'ir.values', 'unlink', ids,)
+         else :
+            pass
+         if temp:
+              ErrorDialog("Report","Report has been Delete:\n "+name,"Message")
+              self.logobj.log_write('Delete Report',LOG_INFO, ':successful delete report  %s  using database %s' % (name, database))
+
+         else:
+             ErrorDialog("Report","Report has not Delete:\n"+name," Message")
+         self.win.endExecute()
+
+
+
+if __name__<>"package" and __name__=="__main__":
+    ModifyExistingReport(None)
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( ModifyExistingReport, "org.openoffice.openerp.report.modifyreport", ("com.sun.star.task.Job",),)
+
+
+import uno
+import string
+import unohelper
+import random
+import xmlrpclib
+import base64, tempfile
+from com.sun.star.task import XJobExecutor
+import os
+import sys
+if __name__<>'package':
+    from lib.gui import *
+    from lib.error import *
+    from lib.functions import *
+    from lib.logreport import *
+    from lib.tools import *
+    from LoginTest import *
+    from lib.rpc import *
+    database="report"
+    uid = 3
+
+#
+#
+class SendtoServer(unohelper.Base, XJobExecutor):
+    Kind = {
+        'PDF' : 'pdf',
+        'OpenOffice': 'sxw',
+        'HTML' : 'html'
+    }
+
+    def __init__(self,ctx):
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+        LoginTest()
+        self.logobj=Logger()
+        if not loginstatus and __name__=="package":
+            exit(1)
+
+        global passwd
+        self.password = passwd
+        global url
+        self.sock=RPCSession(url)
+        desktop=getDesktop()
+        oDoc2 = desktop.getCurrentComponent()
+        docinfo=oDoc2.getDocumentInfo()
+
+        self.ids = self.sock.execute(database, uid, self.password, 'ir.module.module', 'search', [('name','=','base_report_designer'),('state', '=', 'installed')])
+        if not len(self.ids):
+            ErrorDialog("Please Install base_report_designer module", "", "Module Uninstalled Error")
+            exit(1)
+
+        report_name = ""
+        name=""
+        if docinfo.getUserFieldValue(2)<>"" :
+            try:
+                fields=['name','report_name']
+                self.res_other = self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'read', [int(docinfo.getUserFieldValue(2))],fields)
+                name = self.res_other[0]['name']
+                report_name = self.res_other[0]['report_name']
+            except:
+                import traceback,sys
+                info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+                self.logob.log_write('ServerParameter', LOG_ERROR, info)
+        elif docinfo.getUserFieldValue(3) <> "":
+            name = ""
+            result =  "rnd"
+            for i in range(5):
+                result =result + random.choice('abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890')
+
+            report_name = docinfo.getUserFieldValue(3) + "." + result
+        else:
+            ErrorDialog("Please select appropriate module...","Note: use OpenERP Report -> Open a new Report", "Module selection ERROR");
+            exit(1)
+
+        self.win = DBModalDialog(60, 50, 180, 100, "Send To Server")
+        self.win.addFixedText("lblName",10 , 9, 40, 15, "Report Name :")
+        self.win.addEdit("txtName", -5, 5, 123, 15,name)
+        self.win.addFixedText("lblReportName", 2, 30, 50, 15, "Technical Name :")
+        self.win.addEdit("txtReportName", -5, 25, 123, 15,report_name)
+        self.win.addCheckBox("chkHeader", 51, 45, 70 ,15, "Corporate Header")
+        self.win.addFixedText("lblResourceType", 2 , 60, 50, 15, "Select Rpt. Type :")
+        self.win.addComboListBox("lstResourceType", -5, 58, 123, 15,True,itemListenerProc=self.lstbox_selected)
+        self.lstResourceType = self.win.getControl( "lstResourceType" )
+        self.txtReportName=self.win.getControl( "txtReportName" )
+        self.txtReportName.Enable=False
+        for kind in self.Kind.keys():
+            self.lstResourceType.addItem( kind, self.lstResourceType.getItemCount() )
+
+        self.win.addButton( "btnSend", -5, -5, 80, 15, "Send Report to Server", actionListenerProc = self.btnOk_clicked)
+        self.win.addButton( "btnCancel", -5 - 80 -5, -5, 40, 15, "Cancel", actionListenerProc = self.btnCancel_clicked)
+
+        self.win.doModalDialog("lstResourceType", self.Kind.keys()[0])
+
+    def lstbox_selected(self,oItemEvent):
+        pass
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
+    def btnOk_clicked(self, oActionEvent):
+        if self.win.getEditText("txtName") <> "" and self.win.getEditText("txtReportName") <> "":
+            desktop=getDesktop()
+            oDoc2 = desktop.getCurrentComponent()
+            docinfo=oDoc2.getDocumentInfo()
+            self.getInverseFieldsRecord(1)
+            fp_name = tempfile.mktemp('.'+"sxw")
+            if not oDoc2.hasLocation():
+                oDoc2.storeAsURL("file://"+fp_name,Array(makePropertyValue("MediaType","application/vnd.sun.xml.writer"),))
+
+            if docinfo.getUserFieldValue(2)=="":
+                name=self.win.getEditText("txtName"),
+                name_id={}
+                try:
+                    name_id = self.sock.execute(database, uid, self.password, 'ir.actions.report.xml' , 'search',[('name','=',name)])
+                    if not name_id:
+                        id=self.getID()
+                        docinfo.setUserFieldValue(2,id)
+                        rec = {
+                                'name': self.win.getEditText("txtReportName"),
+                                'key': 'action',
+                                'model': docinfo.getUserFieldValue(3),
+                                'value': 'ir.actions.report.xml,'+str(id),
+                                'key2': 'client_print_multi',
+                                'object': True
+                            }
+                        res = self.sock.execute(database, uid, self.password, 'ir.values' , 'create',rec )
+                    else :
+                        ErrorDialog(" Report Name is all ready given !!!\n\n\n Please specify other Name","","Report Name")
+                        self.logobj.log_write('SendToServer',LOG_WARNING, ':Report name all ready given DB %s' % (database))
+                        self.win.endExecute()
+                except Exception,e:
+                    import traceback,sys
+                    info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+                    self.logobj.log_write('ServerParameter', LOG_ERROR, info)
+            else:
+
+                id = docinfo.getUserFieldValue(2)
+                vId = self.sock.execute(database, uid, self.password, 'ir.values' ,  'search', [('value','=','ir.actions.report.xml,'+str(id))])
+                rec = { 'name': self.win.getEditText("txtReportName") }
+                res = self.sock.execute(database, uid, self.password, 'ir.values' , 'write',vId,rec)
+            oDoc2.store()
+            data = read_data_from_file( get_absolute_file_path( oDoc2.getURL()[7:] ) )
+            self.getInverseFieldsRecord(0)
+            #sock = xmlrpclib.ServerProxy(docinfo.getUserFieldValue(0) +'/xmlrpc/object')
+
+            file_type = oDoc2.getURL()[7:].split(".")[-1]
+            res = self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'upload_report', int(docinfo.getUserFieldValue(2)),base64.encodestring(data),file_type,{})
+            params = {
+                'name': self.win.getEditText("txtName"),
+                'model': docinfo.getUserFieldValue(3),
+                'report_name': self.win.getEditText("txtReportName"),
+                'header': (self.win.getCheckBoxState("chkHeader") <> 0),
+                'report_type': self.Kind[self.win.getListBoxSelectedItem("lstResourceType")],
+            }
+            if self.win.getListBoxSelectedItem("lstResourceType")=='OpenOffice':
+                params['report_type']=file_type
+            res = self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'write', int(docinfo.getUserFieldValue(2)), params)
+            self.logobj.log_write('SendToServer',LOG_INFO, ':Report %s successfully send using %s'%(params['name'],database))
+            self.win.endExecute()
+        else:
+            ErrorDialog("Either Report Name or Technical Name is blank !!!\nPlease specify appropriate Name","","Blank Field ERROR")
+            self.logobj.log_write('SendToServer',LOG_WARNING, ':Either Report Name or Technical Name is blank')
+            self.win.endExecute()
+
+    def getID(self):
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        params = {
+            'name': self.win.getEditText("txtName"),
+            'model': docinfo.getUserFieldValue(3),
+            'report_name': self.win.getEditText('txtReportName')
+        }
+
+
+        id=self.sock.execute(database, uid, self.password, 'ir.actions.report.xml' ,'create', params)
+        return id
+
+    def getInverseFieldsRecord(self,nVal):
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        count=0
+        oParEnum = doc.getTextFields().createEnumeration()
+        while oParEnum.hasMoreElements():
+            oPar = oParEnum.nextElement()
+            if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+                oPar.SelectedItem = oPar.Items[nVal]
+                if nVal==0:
+                    oPar.update()
+
+if __name__<>"package" and __name__=="__main__":
+    SendtoServer(None)
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( SendtoServer, "org.openoffice.openerp.report.sendtoserver", ("com.sun.star.task.Job",),)
+
+
+import uno
+from com.sun.star.task import XJobExecutor
+
+if __name__<>'package':
+    from lib.gui import *
+
+class About(unohelper.Base, XJobExecutor):
+    def __init__(self,ctx):
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+        self.win = DBModalDialog(60, 50, 175, 115, ".:: About OpenERP Report Designer ::.")
+
+        fdBigFont = createUnoStruct("com.sun.star.awt.FontDescriptor")
+        fdBigFont.Width = 20
+        fdBigFont.Height = 25
+        fdBigFont.Weight = 120
+        fdBigFont.Family= 3
+
+        oLabelTitle1 = self.win.addFixedText("lblTitle1", 1, 1, 35, 30)
+        oLabelTitle1.Model.TextColor = 16056320
+        oLabelTitle1.Model.FontDescriptor = fdBigFont
+        oLabelTitle1.Model.FontRelief = 1
+        oLabelTitle1.Text = "Open"
+
+        oLabelTitle2 = self.win.addFixedText("lblTitle2", 35, 1, 30, 30)
+        oLabelTitle2.Model.TextColor = 1
+        oLabelTitle2.Model.FontDescriptor = fdBigFont
+        oLabelTitle2.Model.FontRelief = 1
+        oLabelTitle2.Text = "ERP"
+
+        oLabelProdDesc = self.win.addFixedText("lblProdDesc", 1, 30, 173, 75)
+        oLabelProdDesc.Model.TextColor = 1
+        fdBigFont.Width = 10
+        fdBigFont.Height = 11
+        fdBigFont.Weight = 76
+        oLabelProdDesc.Model.FontDescriptor = fdBigFont
+        oLabelProdDesc.Model.Align = 1
+        oLabelProdDesc.Model.FontRelief = 1
+        oLabelProdDesc.Model.MultiLine = True
+        oLabelProdDesc.Text = "This  package  helps  you  to  create  or  modify\nreports  in  OpenERP.  Once  connected  to  the\nserver, you can design your template of reports\nusing fields  and expressions  and  browsing the\ncomplete structure of OpenERP object database."
+
+        oLabelFooter = self.win.addFixedText("lblFooter", -1, -1, 173, 25)
+        oLabelFooter.Model.TextColor = 255
+        #oLabelFooter.Model.BackgroundColor = 1
+        oLabelFooter.Model.Border = 2
+        oLabelFooter.Model.BorderColor = 255
+        fdBigFont.Width = 8
+        fdBigFont.Height = 9
+        fdBigFont.Weight = 100
+        oLabelFooter.Model.FontDescriptor = fdBigFont
+        oLabelFooter.Model.Align = 1
+        oLabelFooter.Model.FontRelief = 1
+        oLabelFooter.Model.MultiLine = True
+        sMessage = "OpenERP Report Designer v1.0 \nCopyright 2007-TODAY Tiny sprl \nThis product is free software, under the GPL licence."
+        oLabelFooter.Text = sMessage
+
+        self.win.doModalDialog("",None)
+
+if __name__<>"package" and __name__=="__main__":
+    About(None)
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( About, "org.openoffice.openerp.report.about", ("com.sun.star.task.Job",),)
+
+
+import uno
+import unohelper
+import string
+import re
+import base64
+
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from LoginTest import *
+    from lib.logreport import *
+    from lib.rpc import *
+    database="test"
+    uid = 1
+
+
+
+class ConvertBracesToField( unohelper.Base, XJobExecutor ):
+
+    def __init__(self,ctx):
+
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+        LoginTest()
+        self.logobj=Logger()
+        if not loginstatus and __name__=="package":
+            exit(1)
+
+        global passwd
+        self.password = passwd
+        global url
+        self.sock=RPCSession(url)
+        self.aReportSyntex=[]
+        self.getBraces(self.aReportSyntex)
+
+        self.setValue()
+
+
+    def setValue(self):
+
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        docinfo=  doc.getDocumentInfo()
+        count = 0
+        regexes = [
+            ['[a-zA-Z0-9_]+\.[a-zA-Z0-9_.]+',"Field"],
+            ['\\[\\[ *repeatIn\\( *([a-zA-Z0-9_\.]+), *\'([a-zA-Z0-9_]+)\' *\\) *\\]\\]', "RepeatIn"],
+            ['\\[\\[ *([a-zA-Z0-9_\.]+) *\\]\\]', "Field"]
+            # ['\\[\\[ ([a-zA-Z0-9_]+\.[a-zA-Z1-9]) \\]\\]',"Field"],
+            # ['\\[\\[ [a-zA-Z0-9_\.]+ and ([a-zA-Z0-9_\.]+) or .+? \\]\\]',"Field"],
+            # ['\\[\\[ ([a-zA-Z0-9_\.]+) or .+? \\]\\]',"Field"],
+            # ['\\[\\[ ([a-zA-Z0-9_\.]+) and .+? \\]\\]',"Field"],
+            # ['\\[\\[ .+? or ([a-zA-Z0-9_\.]+) \\]\\]',"Field"],
+            # ['\\[\\[ (.+?) and ([a-zA-Z0-9_\.]+) \\]\\]',"Field"],
+            # ['\\[\\[ .+? % ([a-zA-Z0-9_\.]+) \\]\\]',"Field"]
+        ]
+        oFieldObject = []
+        oRepeatInObjects = []
+        saRepeatInList = []
+        sHost = docinfo.getUserFieldValue(0)
+        nCount = 0
+        oParEnum = doc.getTextFields().createEnumeration()
+        while oParEnum.hasMoreElements():
+            oPar = oParEnum.nextElement()
+            nCount += 1
+        getList(oRepeatInObjects,sHost,nCount)
+        for ro in oRepeatInObjects:
+            if ro.find("(")<>-1:
+                saRepeatInList.append( [ ro[:ro.find("(")], ro[ro.find("(")+1:ro.find(")")] ])
+        try:
+            oParEnum = doc.getTextFields().createEnumeration()
+            while oParEnum.hasMoreElements():
+                oPar = oParEnum.nextElement()
+                if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+                    for reg in regexes:
+                        res=re.findall(reg[0],oPar.Items[1])
+                        if len(res) <> 0:
+                            if res[0][0] == "objects":
+                                sTemp = docinfo.getUserFieldValue(3)
+                                sTemp = "|-." + sTemp[sTemp.rfind(".")+1:] + ".-|"
+                                oPar.Items=(sTemp.encode("utf-8"),oPar.Items[1].replace(' ',""))
+                                oPar.update()
+                            elif type(res[0]) <> type(u''):
+
+                                sObject = self.getRes(self.sock, docinfo.getUserFieldValue(3), res[0][0][res[0][0].find(".")+1:].replace(".","/"))
+                                r = self.sock.execute(database, uid, self.password, docinfo.getUserFieldValue(3) , 'fields_get')
+                                sExpr="|-." + r[res[0][0][res[0][0].rfind(".")+1:]]["string"] + ".-|"
+                                oPar.Items=(sExpr.encode("utf-8"),oPar.Items[1].replace(' ',""))
+                                oPar.update()
+                            else:
+
+                                obj = None
+                                for rl in saRepeatInList:
+                                    if rl[0] == res[0][:res[0].find(".")]:
+                                        obj=rl[1]
+                                try:
+                                    sObject = self.getRes(self.sock, obj, res[0][res[0].find(".")+1:].replace(".","/"))
+                                    r = self.sock.execute(database, uid, self.password, sObject , 'read',[1])
+                                except Exception,e:
+                                    r = "TTT"
+                                    self.logobj.log_write('ConvertBracesToField', LOG_ERROR, str(e))
+                                if len(r) <> 0:
+                                    if r <> "TTT":
+                                        if len(res)>1:
+                                            sExpr=""
+                                            print res
+                                            if reg[1] == 'Field':
+                                                for ires in res:
+                                                    try:
+                                                        sExpr=r[0][ires[ires.rfind(".")+1:]]
+                                                        break
+                                                    except Exception,e:
+                                                        import traceback,sys
+                                                        info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+                                                        self.logobj.log_write('ConvertBracesToField', LOG_ERROR,info)
+                                                try:
+                                                    oPar.Items=(sExpr.encode("utf-8") ,oPar.Items[1])
+                                                    oPar.update()
+                                                except:
+                                                    oPar.Items=(str(sExpr) ,oPar.Items[1])
+                                                    oPar.update()
+                                                    import traceback,sys
+                                                    info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+                                                    self.logobj.log_write('ConvertBracesToField', LOG_ERROR, info)
+
+                                        else:
+                                            sExpr=r[0][res[0][res[0].rfind(".")+1:]]
+                                            try:
+
+                                                if sExpr:
+                                                    oPar.Items=(sExpr.encode("utf-8") ,oPar.Items[1])
+                                                    oPar.update()
+                                                else:
+                                                     oPar.Items=(u"/",oPar.Items[1])
+                                                     oPar.update()
+                                            except:
+                                                oPar.Items=(str(sExpr) ,oPar.Items[1])
+                                                oPar.update()
+                                                import traceback,sys
+                                                info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+                                                self.logobj.log_write('ConvertBracesToField', LOG_ERROR,info)
+
+                                    else:
+                                        oPar.Items=(u""+r,oPar.Items[1])
+                                        oPar.update()
+                                else:
+                                    oPar.Items=(u"TTT",oPar.Items[1])
+                                    oPar.update()
+        except:
+            import traceback,sys
+            info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+            self.logobj.log_write('ConvertBraceToField', LOG_ERROR, info)
+
+    def getRes(self,sock,sObject,sVar):
+        desktop=getDesktop()
+        doc =desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        res = sock.execute(database, uid, self.password, sObject , 'fields_get')
+        key = res.keys()
+        key.sort()
+        myval=None
+        if not sVar.find("/")==-1:
+            myval=sVar[:sVar.find("/")]
+        else:
+            myval=sVar
+        for k in key:
+            if (res[k]['type'] in ['many2one']) and k==myval:
+                sObject = self.getRes(sock,res[myval]['relation'], sVar[sVar.find("/")+1:])
+        return sObject
+
+    def getBraces(self,aReportSyntex=[]):
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        aSearchString=[]
+        aReplaceString=[]
+        aRes=[]
+
+        try:
+            regexes = [
+                ['\\[\\[ *repeatIn\\( *([a-zA-Z0-9_\.]+), *\'([a-zA-Z0-9_]+)\' *\\) *\\]\\]', "RepeatIn"],
+                ['\\[\\[ *([a-zA-Z0-9_\.]+) *\\]\\]', "Field"],
+                ['\\[\\[ *.+? *\\]\\]', "Expression"]
+            ]
+
+            search = doc.createSearchDescriptor()
+            search.SearchRegularExpression = True
+
+            for reg in regexes:
+                search.SearchString = reg[0]
+                found = doc.findFirst( search )
+                while found:
+                    res=re.findall(reg[0],found.String)
+                    print len(res)
+
+                    if found.String not in [r[0] for r in aReportSyntex] and len(res) == 1 :
+                        text=found.getText()
+                        oInputList = doc.createInstance("com.sun.star.text.TextField.DropDown")
+                        if reg[1]<>"Expression":
+                            oInputList.Items=(u""+found.String,u""+found.String)
+                        else:
+                            oInputList.Items=(u"?",u""+found.String)
+                        aReportSyntex.append([oInputList,reg[1]])
+                        text.insertTextContent(found,oInputList,False)
+                        found.String =""
+
+                    else:
+                        aRes.append([res,reg[1]])
+                        found = doc.findNext(found.End, search)
+            search = doc.createSearchDescriptor()
+            search.SearchRegularExpression = False
+
+            for res in aRes:
+                for r in res[0]:
+                    search.SearchString=r
+                    found=doc.findFirst(search)
+                    while found:
+
+                        text=found.getText()
+
+                        oInputList = doc.createInstance("com.sun.star.text.TextField.DropDown")
+                        if res[1]<>"Expression":
+                            oInputList.Items=(u""+found.String,u""+found.String)
+                        else:
+                            oInputList.Items=(u"?",u""+found.String)
+                        aReportSyntex.append([oInputList,res[1]])
+                        text.insertTextContent(found,oInputList,False)
+                        found.String =""
+                        found = doc.findNext(found.End, search)
+        except:
+            import traceback,sys
+            info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+            self.logobj.log_write('ConvertBraceToField', LOG_ERROR, info)
+
+if __name__<>"package":
+    ConvertBracesToField(None)
+else:
+    g_ImplementationHelper.addImplementation( ConvertBracesToField, "org.openoffice.openerp.report.convertBF", ("com.sun.star.task.Job",),)
+
+import uno
+import unohelper
+import string
+import re
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from LoginTest import *
+    database="test"
+    uid = 3
+
+class ConvertFieldsToBraces( unohelper.Base, XJobExecutor ):
+    def __init__(self,ctx):
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+        LoginTest()
+        if not loginstatus and __name__=="package":
+            exit(1)
+        self.aReportSyntex=[]
+        self.getFields()
+
+    def getFields(self):
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+
+        oParEnum = doc.getTextFields().createEnumeration()
+        while oParEnum.hasMoreElements():
+            oPar = oParEnum.nextElement()
+            if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+                oPar.getAnchor().Text.insertString(oPar.getAnchor(),oPar.Items[1],False)
+                oPar.dispose()
+
+if __name__<>"package":
+    ConvertFieldsToBraces(None)
+else:
+    g_ImplementationHelper.addImplementation( ConvertFieldsToBraces, "org.openoffice.openerp.report.convertFB", ("com.sun.star.task.Job",),) 
+
+import os
+import uno
+import unohelper
+import string
+import tempfile
+import base64
+import sys
+
+reload(sys)
+sys.setdefaultencoding("utf8")
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from LoginTest import *
+    from lib.error import *
+    from lib.tools import *
+    from lib.logreport import *
+    from lib.rpc import *
+    database="test"
+    uid = 3
+
+
+class ExportToRML( unohelper.Base, XJobExecutor ):
+    def __init__(self,ctx):
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+        LoginTest()
+        if not loginstatus and __name__=="package":
+            exit(1)
+
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        global url
+        self.sock=RPCSession(url)
+
+        # Read Data from sxw file
+        tmpsxw = tempfile.mktemp('.'+"sxw")
+
+        if not doc.hasLocation():
+            mytype = Array(makePropertyValue("MediaType","application/vnd.sun.xml.writer"),)
+            doc.storeAsURL("file://"+tmpsxw,mytype)
+        data = read_data_from_file( get_absolute_file_path( doc.getURL()[7:] ) )
+        file_type = doc.getURL()[7:].split(".")[-1]
+        if docinfo.getUserFieldValue(2) == "":
+            ErrorDialog("Please Save this file on server","Use Send To Server Option in OpenERP Report Menu","Error")
+            exit(1)
+    	filename = self.GetAFileName()
+    	if not filename:
+    	    exit(1)
+        global passwd
+        self.password = passwd
+        try:
+
+            res = self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'sxwtorml',base64.encodestring(data),file_type)
+            if res['report_rml_content']:
+                write_data_to_file( get_absolute_file_path( filename[7:] ), res['report_rml_content'] )
+        except Exception,e:
+            import traceback,sys
+            info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+            self.logobj.log_write('ExportToRML',LOG_ERROR, info)
+            ErrorDialog("Can't save the file to the hard drive.", "Exception: %s" % e, "Error" )
+
+    def GetAFileName(self):
+        sFilePickerArgs = Array(10)
+        oFileDialog = createUnoService("com.sun.star.ui.dialogs.FilePicker")
+        oFileDialog.initialize(sFilePickerArgs)
+        oFileDialog.appendFilter("OpenERP Report File Save To ....","*.rml")
+
+        f_path = "OpenERP-"+ os.path.basename( tempfile.mktemp("","") ) + ".rml"
+        initPath = tempfile.gettempdir()
+        oUcb = createUnoService("com.sun.star.ucb.SimpleFileAccess")
+        if oUcb.exists(initPath):
+	    oFileDialog.setDisplayDirectory('file://' + ( os.name == 'nt' and '/' or '' ) + initPath )
+
+        oFileDialog.setDefaultName(f_path )
+
+        sPath = oFileDialog.execute() == 1 and oFileDialog.Files[0] or None
+        oFileDialog.dispose()
+        return sPath
+
+if __name__<>"package" and __name__=="__main__":
+    ExportToRML(None)
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( ExportToRML, "org.openoffice.openerp.report.exporttorml", ("com.sun.star.task.Job",),)
+
+import uno
+import string
+import unohelper
+import xmlrpclib
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from lib.functions import *
+    from lib.error import ErrorDialog
+    from LoginTest import *
+    from lib.rpc import *
+    database="test_001"
+    uid = 3
+
+
+class AddLang(unohelper.Base, XJobExecutor ):
+    def __init__(self,sVariable="",sFields="",sDisplayName="",bFromModify=False):
+        LoginTest()
+        if not loginstatus and __name__=="package":
+            exit(1)
+        global passwd
+        self.password = passwd
+        self.win = DBModalDialog(60, 50, 180, 225, "Set Lang Builder")
+
+        self.win.addFixedText("lblVariable", 27, 12, 60, 15, "Variable :")
+        self.win.addComboBox("cmbVariable", 180-120-2, 10, 120, 15,True,
+                            itemListenerProc=self.cmbVariable_selected)
+        self.insVariable = self.win.getControl( "cmbVariable" )
+
+        self.win.addFixedText("lblFields", 10, 32, 60, 15, "Variable Fields :")
+        self.win.addComboListBox("lstFields", 180-120-2, 30, 120, 150, False,itemListenerProc=self.lstbox_selected)
+        self.insField = self.win.getControl( "lstFields" )
+        self.win.addFixedText("lblUName", 8, 187, 60, 15, "Displayed name :")
+        self.win.addEdit("txtUName", 180-120-2, 185, 120, 15,)
+
+        self.win.addButton('btnOK',-5 ,-5, 45, 15, 'Ok', actionListenerProc = self.btnOk_clicked )
+        self.win.addButton('btnCancel',-5 - 45 - 5 ,-5,45,15,'Cancel', actionListenerProc = self.btnCancel_clicked )
+        self.sValue=None
+        self.sObj=None
+        self.aSectionList=[]
+        self.sGDisplayName=sDisplayName
+        self.aItemList=[]
+        self.aComponentAdd=[]
+        self.aObjectList=[]
+        self.aListFields=[]
+        self.aVariableList=[]
+        EnumDocument(self.aItemList,self.aComponentAdd)
+        desktop=getDesktop()
+        doc =desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        self.sMyHost= ""
+        global url
+        self.sock=RPCSession(url)
+
+        if not docinfo.getUserFieldValue(3) == "" and not docinfo.getUserFieldValue(0)=="":
+            self.sMyHost= docinfo.getUserFieldValue(0)
+            self.count=0
+            oParEnum = doc.getTextFields().createEnumeration()
+            while oParEnum.hasMoreElements():
+                oPar = oParEnum.nextElement()
+                if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+                    self.count += 1
+            getList(self.aObjectList, self.sMyHost,self.count)
+            cursor = doc.getCurrentController().getViewCursor()
+            text=cursor.getText()
+            tcur=text.createTextCursorByRange(cursor)
+
+	    self.aVariableList.extend( filter( lambda obj: obj[:obj.find("(")] == "Objects", self.aObjectList ) )
+
+            for i in range(len(self.aItemList)):
+		anItem = self.aItemList[i][1]
+		component = self.aComponentAdd[i]
+
+                if component == "Document":
+		    sLVal = anItem[anItem.find(",'") + 2:anItem.find("')")]
+		    self.aVariableList.extend( filter( lambda obj: obj[:obj.find("(")] == sLVal, self.aObjectList ) )
+
+                if tcur.TextSection:
+                    getRecersiveSection(tcur.TextSection,self.aSectionList)
+                    if component in self.aSectionList:
+			sLVal = anItem[anItem.find(",'") + 2:anItem.find("')")]
+			self.aVariableList.extend( filter( lambda obj: obj[:obj.find("(")] == sLVal, self.aObjectList ) )
+
+                if tcur.TextTable:
+		    if not component == "Document" and component[component.rfind(".") + 1:] == tcur.TextTable.Name:
+                        VariableScope(tcur,self.insVariable,self.aObjectList,self.aComponentAdd,self.aItemList,component)
+
+            self.bModify=bFromModify
+            if self.bModify==True:
+                sItem=""
+		for anObject in self.aObjectList:
+		    if anObject[:anObject.find("(")] == sVariable:
+			sItem = anObject
+			self.insVariable.setText( sItem )
+		genTree(sItem[sItem.find("(")+1:sItem.find(")")],self.aListFields, self.insField,self.sMyHost,2,ending_excl=['one2many','many2one','many2many','reference'], recur=['many2one'])
+                self.sValue= self.win.getListBoxItem("lstFields",self.aListFields.index(sFields))
+
+            for var in self.aVariableList:
+
+		    self.model_ids = self.sock.execute(database, uid, self.password, 'ir.model' ,  'search', [('model','=',var[var.find("(")+1:var.find(")")])])
+                    fields=['name','model']
+                    self.model_res = self.sock.execute(database, uid, self.password, 'ir.model', 'read', self.model_ids,fields)
+                    if self.model_res <> []:
+			self.insVariable.addItem(var[:var.find("(")+1] + self.model_res[0]['name'] + ")" ,self.insVariable.getItemCount())
+                    else:
+                        self.insVariable.addItem(var ,self.insVariable.getItemCount())
+
+            self.win.doModalDialog("lstFields",self.sValue)
+        else:
+            ErrorDialog("Please insert user define field Field-1 or Field-4","Just go to File->Properties->User Define \nField-1 Eg. http://localhost:8069 \nOR \nField-4 Eg. account.invoice")
+            self.win.endExecute()
+
+    def lstbox_selected(self,oItemEvent):
+        try:
+
+            desktop=getDesktop()
+            doc =desktop.getCurrentComponent()
+            docinfo=doc.getDocumentInfo()
+            sItem= self.win.getComboBoxText("cmbVariable")
+            for var in self.aVariableList:
+		if var[:var.find("(")+1]==sItem[:sItem.find("(")+1]:
+                    sItem = var
+            sMain=self.aListFields[self.win.getListBoxSelectedItemPos("lstFields")]
+            t=sMain.rfind('/lang')
+            if t!=-1:
+		sObject=self.getRes(self.sock,sItem[sItem.find("(")+1:-1],sMain[1:])
+                ids = self.sock.execute(database, uid, self.password, sObject ,  'search', [])
+                res = self.sock.execute(database, uid, self.password, sObject , 'read',[ids[0]])
+		self.win.setEditText("txtUName",res[0][sMain[sMain.rfind("/")+1:]])
+            else:
+                 ErrorDialog("Please select the Language Field")
+
+        except:
+            import traceback;traceback.print_exc()
+            self.win.setEditText("txtUName","TTT")
+        if self.bModify:
+            self.win.setEditText("txtUName",self.sGDisplayName)
+
+    def getRes(self,sock ,sObject,sVar):
+        desktop=getDesktop()
+        doc =desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        res = sock.execute(database, uid, self.password, sObject , 'fields_get')
+        key = res.keys()
+        key.sort()
+        myval=None
+        if not sVar.find("/")==-1:
+	    myval=sVar[:sVar.find("/")]
+        else:
+            myval=sVar
+        if myval in key:
+            if (res[myval]['type'] in ['many2one']):
+                sObject = res[myval]['relation']
+		return self.getRes(sock,res[myval]['relation'], sVar[sVar.find("/")+1:])
+            else:
+                return sObject
+
+
+    def cmbVariable_selected(self,oItemEvent):
+        if self.count > 0 :
+            try:
+                desktop=getDesktop()
+                doc =desktop.getCurrentComponent()
+                docinfo=doc.getDocumentInfo()
+                self.win.removeListBoxItems("lstFields", 0, self.win.getListBoxItemCount("lstFields"))
+                self.aListFields=[]
+                tempItem = self.win.getComboBoxText("cmbVariable")
+                for var in self.aVariableList:
+		    if var[:var.find("(")] == tempItem[:tempItem.find("(")]:
+                        sItem=var
+
+		genTree(
+		    sItem[ sItem.find("(") + 1:sItem.find(")")],
+		    self.aListFields,
+		    self.insField,
+		    self.sMyHost,
+		    2,
+		    ending_excl=['one2many','many2one','many2many','reference'],
+		    recur=['many2one']
+		)
+
+            except:
+                import traceback;traceback.print_exc()
+
+    def btnOk_clicked( self, oActionEvent ):
+        self.bOkay = True
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        cursor = doc.getCurrentController().getViewCursor()
+
+        itemSelected = self.win.getListBoxSelectedItem( "lstFields" )
+        itemSelectedPos = self.win.getListBoxSelectedItemPos( "lstFields" )
+        txtUName = self.win.getEditText("txtUName")
+        sKey=u""+ txtUName
+
+        if itemSelected != "" and txtUName != "" and self.bModify==True :
+            oCurObj=cursor.TextField
+            sObjName=self.insVariable.getText()
+            sObjName=sObjName[:sObjName.find("(")]
+            sValue=u"[[ setLang" + sObjName + self.aListFields[itemSelectedPos].replace("/",".") + ")" " ]]"
+            oCurObj.Items = (sKey,sValue)
+            oCurObj.update()
+            self.win.endExecute()
+        elif itemSelected != "" and txtUName != "" :
+            oInputList = doc.createInstance("com.sun.star.text.TextField.DropDown")
+            sObjName=self.win.getComboBoxText("cmbVariable")
+            sObjName=sObjName[:sObjName.find("(")]
+
+            widget = ( cursor.TextTable and cursor.TextTable.getCellByName( cursor.Cell.CellName ) or doc.Text )
+
+            sValue = u"[[setLang" + "(" + sObjName + self.aListFields[itemSelectedPos].replace("/",".") +")" " ]]"
+            oInputList.Items = (sKey,sValue)
+            widget.insertTextContent(cursor,oInputList,False)
+
+            self.win.endExecute()
+        else:
+            ErrorDialog("Please Fill appropriate data in Name field \nor select perticular value from the list of fields")
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
+
+if __name__<>"package" and __name__=="__main__":
+    AddLang()
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( AddLang, "org.openoffice.openerp.report.langtag", ("com.sun.star.task.Job",),)
+
+import os
+import uno
+import unohelper
+import xmlrpclib
+import base64
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from lib.error import ErrorDialog
+    from lib.tools import *
+    from LoginTest import *
+    from lib.rpc import *
+    database="test"
+    uid = 3
+
+class AddAttachment(unohelper.Base, XJobExecutor ):
+    Kind = {
+        'PDF' : 'pdf',
+        'OpenOffice': 'sxw',
+    }
+    def __init__(self,ctx):
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+        LoginTest()
+        if not loginstatus and __name__=="package":
+            exit(1)
+
+        self.aSearchResult = []
+        desktop=getDesktop()
+        oDoc2 = desktop.getCurrentComponent()
+        docinfo=oDoc2.getDocumentInfo()
+
+        global passwd
+        self.password = passwd
+        global url
+        self.sock=RPCSession(url)
+        if docinfo.getUserFieldValue(2) <> "" and docinfo.getUserFieldValue(3) <> "":
+            self.win = DBModalDialog(60, 50, 180, 70, "Add Attachment to Server")
+            self.win.addFixedText("lblResourceType", 2 , 5, 100, 10, "Select Appropriate Resource Type:")
+            self.win.addComboListBox("lstResourceType", -2, 25, 176, 15,True)
+            self.win.addButton('btnOkWithoutInformation', -2 , -5, 25 , 15,'OK' ,actionListenerProc = self.btnOkWithoutInformation_clicked )
+        else:
+            self.win = DBModalDialog(60, 50, 180, 190, "Add Attachment to Server")
+            self.win.addFixedText("lblModuleName",2 , 9, 42, 20, "Select Module:")
+            self.win.addComboListBox("lstmodel", -2, 5, 134, 15,True)
+            self.lstModel = self.win.getControl( "lstmodel" )
+            self.dModel = {}
+
+            # Open a new connexion to the server
+
+            ids = self.sock.execute(database, uid, self.password, 'ir.module.module', 'search', [('name','=','base_report_model'),('state', '=', 'installed')])
+            if not len(ids):
+                # If the module 'base_report_model' is not installed, use the default model
+                self.dModel = {
+                    "Partner":'res.partner',
+                }
+            else:
+
+                ids =self.sock.execute(database, uid, self.password, 'base.report.model' , 'search', [])
+                res = self.sock.execute(database, uid, self.password, 'base.report.model' , 'read', ids, ['name','model_id'])
+                models = self.sock.execute(database, uid, self.password, 'ir.model' , 'read', map(lambda x:x['model_id'][0], res), ['model'])
+                models = dict(map(lambda x:(x['id'],x['model']), models))
+                self.dModel = dict(map(lambda x: (x['name'],models[x['model_id'][0]]), res))
+
+            for item in self.dModel.keys():
+                self.lstModel.addItem(item, self.lstModel.getItemCount())
+
+            self.win.addFixedText("lblSearchName",2 , 25, 60, 10, "Enter Search String:")
+            self.win.addEdit("txtSearchName", 2, 35, 149, 15,)
+            self.win.addButton('btnSearch', -2 , 35, 25 , 15,'Search' ,actionListenerProc = self.btnSearch_clicked )
+
+            self.win.addFixedText("lblSearchRecord", 2 , 55, 60, 10, "Search Result:")
+            self.win.addComboListBox("lstResource", -2, 65, 176, 70, False )
+            self.lstResource = self.win.getControl( "lstResource" )
+
+            self.win.addFixedText("lblResourceType", 2 , 137, 100, 20, "Select Appropriate Resource Type:")
+            self.win.addComboListBox("lstResourceType", -2, 147, 176, 15,True )
+
+            self.win.addButton('btnOkWithInformation', -2 , -5, 25 , 15,'OK' ,actionListenerProc = self.btnOkWithInformation_clicked )
+
+        self.lstResourceType = self.win.getControl( "lstResourceType" )
+        for kind in self.Kind.keys():
+            self.lstResourceType.addItem( kind, self.lstResourceType.getItemCount() )
+
+        self.win.addButton('btnCancel', -2 - 27 , -5 , 30 , 15, 'Cancel' ,actionListenerProc = self.btnCancel_clicked )
+        self.win.doModalDialog("lstResourceType", self.Kind.keys()[0])
+
+    def btnSearch_clicked( self, oActionEvent ):
+        modelSelectedItem = self.win.getListBoxSelectedItem("lstmodel")
+        if modelSelectedItem == "":
+            return
+
+        desktop=getDesktop()
+        oDoc2 = desktop.getCurrentComponent()
+        docinfo=oDoc2.getDocumentInfo()
+
+
+        self.aSearchResult =self.sock.execute( database, uid, self.password, self.dModel[modelSelectedItem], 'name_search', self.win.getEditText("txtSearchName"))
+        self.win.removeListBoxItems("lstResource", 0, self.win.getListBoxItemCount("lstResource"))
+        if self.aSearchResult == []:
+            ErrorDialog("No search result found !!!", "", "Search ERROR" )
+            return
+
+        for result in self.aSearchResult:
+            self.lstResource.addItem(result[1],result[0])
+
+    def _send_attachment( self, name, data, res_model, res_id ):
+        desktop = getDesktop()
+        oDoc2 = desktop.getCurrentComponent()
+        docinfo = oDoc2.getDocumentInfo()
+
+        params = {
+            'name': name,
+            'datas': base64.encodestring( data ),
+            'datas_fname': name,
+            'res_model' : res_model,
+            'res_id' : int(res_id),
+        }
+
+        return self.sock.execute( database, uid, self.password, 'ir.attachment', 'create', params )
+
+    def send_attachment( self, model, resource_id ):
+        desktop = getDesktop()
+        oDoc2 = desktop.getCurrentComponent()
+        docinfo = oDoc2.getDocumentInfo()
+
+        if oDoc2.getURL() == "":
+            ErrorDialog("Please save your file", "", "Saving ERROR" )
+            return None
+
+        url = oDoc2.getURL()
+        if self.Kind[self.win.getListBoxSelectedItem("lstResourceType")] == "pdf":
+            url = self.doc2pdf(url[7:])
+
+        if url == None:
+            ErrorDialog( "Ploblem in creating PDF", "", "PDF Error" )
+            return None
+
+        url = url[7:]
+        data = read_data_from_file( get_absolute_file_path( url ) )
+        return self._send_attachment( os.path.basename( url ), data, model, resource_id )
+
+    def btnOkWithoutInformation_clicked( self, oActionEvent ):
+        desktop = getDesktop()
+        oDoc2 = desktop.getCurrentComponent()
+        docinfo = oDoc2.getDocumentInfo()
+
+        if self.win.getListBoxSelectedItem("lstResourceType") == "":
+            ErrorDialog("Please select resource type", "", "Selection ERROR" )
+            return
+
+        res = self.send_attachment( docinfo.getUserFieldValue(3), docinfo.getUserFieldValue(2) )
+        self.win.endExecute()
+
+    def btnOkWithInformation_clicked(self,oActionEvent):
+        if self.win.getListBoxSelectedItem("lstResourceType") == "":
+            ErrorDialog( "Please select resource type", "", "Selection ERROR" )
+            return
+
+        if self.win.getListBoxSelectedItem("lstResource") == "" or self.win.getListBoxSelectedItem("lstmodel") == "":
+            ErrorDialog("Please select Model and Resource","","Selection ERROR")
+            return
+
+        resourceid = None
+        for s in self.aSearchResult:
+            if s[1] == self.win.getListBoxSelectedItem("lstResource"):
+                resourceid = s[0]
+                break
+
+        if resourceid == None:
+            ErrorDialog("No resource selected !!!", "", "Resource ERROR" )
+            return
+
+        res = self.send_attachment( self.dModel[self.win.getListBoxSelectedItem('lstmodel')], resourceid )
+        self.win.endExecute()
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
+    def doc2pdf(self, strFile):
+        oDoc = None
+        strFilterSubName = ''
+
+        strUrl = convertToURL( strFile )
+        desktop = getDesktop()
+        oDoc = desktop.loadComponentFromURL( strUrl, "_blank", 0, Array(self._MakePropertyValue("Hidden",True)))
+        if oDoc:
+            strFilterSubName = ""
+            # select appropriate filter
+            if oDoc.supportsService("com.sun.star.presentation.PresentationDocument"):
+                strFilterSubName = "impress_pdf_Export"
+            elif oDoc.supportsService("com.sun.star.sheet.SpreadsheetDocument"):
+                strFilterSubName = "calc_pdf_Export"
+            elif oDoc.supportsService("com.sun.star.text.WebDocument"):
+                strFilterSubName = "writer_web_pdf_Export"
+            elif oDoc.supportsService("com.sun.star.text.GlobalDocument"):
+                strFilterSubName = "writer_globaldocument_pdf_Export"
+            elif oDoc.supportsService("com.sun.star.text.TextDocument"):
+                strFilterSubName = "writer_pdf_Export"
+            elif oDoc.supportsService("com.sun.star.drawing.DrawingDocument"):
+                strFilterSubName = "draw_pdf_Export"
+            elif oDoc.supportsService("com.sun.star.formula.FormulaProperties"):
+                strFilterSubName = "math_pdf_Export"
+            elif oDoc.supportsService("com.sun.star.chart.ChartDocument"):
+                strFilterSubName = "chart_pdf_Export"
+            else:
+                pass
+
+            filename = len(strFilterSubName) > 0 and convertToURL( os.path.splitext( strFile )[0] + ".pdf" ) or None
+
+            if len(strFilterSubName) > 0:
+                oDoc.storeToURL( filename, Array(self._MakePropertyValue("FilterName", strFilterSubName ),self._MakePropertyValue("CompressMode", "1" )))
+
+            oDoc.close(True)
+            # Can be None if len(strFilterSubName) <= 0
+            return filename
+
+    def _MakePropertyValue(self, cName = "", uValue = u"" ):
+       oPropertyValue = createUnoStruct( "com.sun.star.beans.PropertyValue" )
+       if cName:
+          oPropertyValue.Name = cName
+       if uValue:
+          oPropertyValue.Value = uValue
+       return oPropertyValue
+
+
+if __name__<>"package" and __name__=="__main__":
+    AddAttachment(None)
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( AddAttachment, "org.openoffice.openerp.report.addattachment", ("com.sun.star.task.Job",),)
diff --git a/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/About.py b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/About.py
new file mode 100755
index 00000000000..504bfb06943
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/About.py
@@ -0,0 +1,66 @@
+
+
+import uno
+from com.sun.star.task import XJobExecutor
+
+if __name__<>'package':
+    from lib.gui import *
+
+class About(unohelper.Base, XJobExecutor):
+    def __init__(self,ctx):
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+        self.win = DBModalDialog(60, 50, 175, 115, ".:: About OpenERP Report Designer ::.")
+
+        fdBigFont = createUnoStruct("com.sun.star.awt.FontDescriptor")
+        fdBigFont.Width = 20
+        fdBigFont.Height = 25
+        fdBigFont.Weight = 120
+        fdBigFont.Family= 3
+
+        oLabelTitle1 = self.win.addFixedText("lblTitle1", 1, 1, 35, 30)
+        oLabelTitle1.Model.TextColor = 16056320
+        oLabelTitle1.Model.FontDescriptor = fdBigFont
+        oLabelTitle1.Model.FontRelief = 1
+        oLabelTitle1.Text = "Open"
+
+        oLabelTitle2 = self.win.addFixedText("lblTitle2", 35, 1, 30, 30)
+        oLabelTitle2.Model.TextColor = 1
+        oLabelTitle2.Model.FontDescriptor = fdBigFont
+        oLabelTitle2.Model.FontRelief = 1
+        oLabelTitle2.Text = "ERP"
+
+        oLabelProdDesc = self.win.addFixedText("lblProdDesc", 1, 30, 173, 75)
+        oLabelProdDesc.Model.TextColor = 1
+        fdBigFont.Width = 10
+        fdBigFont.Height = 11
+        fdBigFont.Weight = 76
+        oLabelProdDesc.Model.FontDescriptor = fdBigFont
+        oLabelProdDesc.Model.Align = 1
+        oLabelProdDesc.Model.FontRelief = 1
+        oLabelProdDesc.Model.MultiLine = True
+        oLabelProdDesc.Text = "This  package  helps  you  to  create  or  modify\nreports  in  OpenERP.  Once  connected  to  the\nserver, you can design your template of reports\nusing fields  and expressions  and  browsing the\ncomplete structure of OpenERP object database."
+
+        oLabelFooter = self.win.addFixedText("lblFooter", -1, -1, 173, 25)
+        oLabelFooter.Model.TextColor = 255
+        #oLabelFooter.Model.BackgroundColor = 1
+        oLabelFooter.Model.Border = 2
+        oLabelFooter.Model.BorderColor = 255
+        fdBigFont.Width = 8
+        fdBigFont.Height = 9
+        fdBigFont.Weight = 100
+        oLabelFooter.Model.FontDescriptor = fdBigFont
+        oLabelFooter.Model.Align = 1
+        oLabelFooter.Model.FontRelief = 1
+        oLabelFooter.Model.MultiLine = True
+        sMessage = "OpenERP Report Designer v1.0 \nCopyright 2007-TODAY Tiny sprl \nThis product is free software, under the GPL licence."
+        oLabelFooter.Text = sMessage
+
+        self.win.doModalDialog("",None)
+
+if __name__<>"package" and __name__=="__main__":
+    About(None)
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( About, "org.openoffice.openerp.report.about", ("com.sun.star.task.Job",),)
+
diff --git a/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/AddAttachment.py b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/AddAttachment.py
new file mode 100755
index 00000000000..e884f23570a
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/AddAttachment.py
@@ -0,0 +1,235 @@
+import os
+import uno
+import unohelper
+import xmlrpclib
+import base64
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from lib.error import ErrorDialog
+    from lib.tools import *
+    from LoginTest import *
+    from lib.rpc import *
+    database="test"
+    uid = 3
+
+class AddAttachment(unohelper.Base, XJobExecutor ):
+    Kind = {
+        'PDF' : 'pdf',
+        'OpenOffice': 'sxw',
+    }
+    def __init__(self,ctx):
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+        LoginTest()
+        if not loginstatus and __name__=="package":
+            exit(1)
+
+        self.aSearchResult = []
+        desktop=getDesktop()
+        oDoc2 = desktop.getCurrentComponent()
+        docinfo=oDoc2.getDocumentInfo()
+
+        global passwd
+        self.password = passwd
+        global url
+        
+        
+        docinfo=oDoc2.getDocumentInfo()        
+        print ":docinfodocinfo::::",docinfo.getUserFieldValue(0)
+        self.sock=RPCSession(url)
+        if docinfo.getUserFieldValue(2) <> "" and docinfo.getUserFieldValue(3) <> "":
+            self.win = DBModalDialog(60, 50, 180, 70, "Add Attachment to Server")
+            self.win.addFixedText("lblResourceType", 2 , 5, 100, 10, "Select Appropriate Resource Type:")
+            self.win.addComboListBox("lstResourceType", -2, 25, 176, 15,True)
+            self.win.addButton('btnOkWithoutInformation', -2 , -5, 25 , 15,'OK' ,actionListenerProc = self.btnOkWithoutInformation_clicked )
+        else:
+            self.win = DBModalDialog(60, 50, 180, 190, "Add Attachment to Server")
+            self.win.addFixedText("lblModuleName",2 , 9, 42, 20, "Select Module:")
+            self.win.addComboListBox("lstmodel", -2, 5, 134, 15,True)
+            self.lstModel = self.win.getControl( "lstmodel" )
+            self.dModel = {}
+
+            # Open a new connexion to the server
+
+            ids = self.sock.execute(database, uid, self.password, 'ir.module.module', 'search', [('name','=','base_report_model'),('state', '=', 'installed')])
+            if not len(ids):
+                # If the module 'base_report_model' is not installed, use the default model
+                self.dModel = {
+                    "Partner":'res.partner',
+                }
+            else:
+
+                ids =self.sock.execute(database, uid, self.password, 'base.report.model' , 'search', [])
+                res = self.sock.execute(database, uid, self.password, 'base.report.model' , 'read', ids, ['name','model_id'])
+                models = self.sock.execute(database, uid, self.password, 'ir.model' , 'read', map(lambda x:x['model_id'][0], res), ['model'])
+                models = dict(map(lambda x:(x['id'],x['model']), models))
+                self.dModel = dict(map(lambda x: (x['name'],models[x['model_id'][0]]), res))
+
+            for item in self.dModel.keys():
+                self.lstModel.addItem(item, self.lstModel.getItemCount())
+
+            self.win.addFixedText("lblSearchName",2 , 25, 60, 10, "Enter Search String:")
+            self.win.addEdit("txtSearchName", 2, 35, 149, 15,)
+            self.win.addButton('btnSearch', -2 , 35, 25 , 15,'Search' ,actionListenerProc = self.btnSearch_clicked )
+
+            self.win.addFixedText("lblSearchRecord", 2 , 55, 60, 10, "Search Result:")
+            self.win.addComboListBox("lstResource", -2, 65, 176, 70, False )
+            self.lstResource = self.win.getControl( "lstResource" )
+
+            self.win.addFixedText("lblResourceType", 2 , 137, 100, 20, "Select Appropriate Resource Type:")
+            self.win.addComboListBox("lstResourceType", -2, 147, 176, 15,True )
+
+            self.win.addButton('btnOkWithInformation', -2 , -5, 25 , 15,'OK' ,actionListenerProc = self.btnOkWithInformation_clicked )
+
+        self.lstResourceType = self.win.getControl( "lstResourceType" )
+        for kind in self.Kind.keys():
+            self.lstResourceType.addItem( kind, self.lstResourceType.getItemCount() )
+
+        self.win.addButton('btnCancel', -2 - 27 , -5 , 30 , 15, 'Cancel' ,actionListenerProc = self.btnCancel_clicked )
+        self.win.doModalDialog("lstResourceType", self.Kind.keys()[0])
+
+    def btnSearch_clicked( self, oActionEvent ):
+        modelSelectedItem = self.win.getListBoxSelectedItem("lstmodel")
+        if modelSelectedItem == "":
+            return
+
+        desktop=getDesktop()
+        oDoc2 = desktop.getCurrentComponent()
+        docinfo=oDoc2.getDocumentInfo()
+
+
+        self.aSearchResult =self.sock.execute( database, uid, self.password, self.dModel[modelSelectedItem], 'name_search', self.win.getEditText("txtSearchName"))
+        self.win.removeListBoxItems("lstResource", 0, self.win.getListBoxItemCount("lstResource"))
+        if self.aSearchResult == []:
+            ErrorDialog("No search result found !!!", "", "Search ERROR" )
+            return
+
+        for result in self.aSearchResult:
+            self.lstResource.addItem(result[1],result[0])
+
+    def _send_attachment( self, name, data, res_model, res_id ):
+        desktop = getDesktop()
+        oDoc2 = desktop.getCurrentComponent()
+        docinfo = oDoc2.getDocumentInfo()
+
+        params = {
+            'name': name,
+            'datas': base64.encodestring( data ),
+            'datas_fname': name,
+            'res_model' : res_model,
+            'res_id' : int(res_id),
+        }
+
+        return self.sock.execute( database, uid, self.password, 'ir.attachment', 'create', params )
+
+    def send_attachment( self, model, resource_id ):
+        desktop = getDesktop()
+        oDoc2 = desktop.getCurrentComponent()
+        docinfo = oDoc2.getDocumentInfo()
+
+        if oDoc2.getURL() == "":
+            ErrorDialog("Please save your file", "", "Saving ERROR" )
+            return None
+
+        url = oDoc2.getURL()
+        if self.Kind[self.win.getListBoxSelectedItem("lstResourceType")] == "pdf":
+            url = self.doc2pdf(url[7:])
+
+        if url == None:
+            ErrorDialog( "Ploblem in creating PDF", "", "PDF Error" )
+            return None
+
+        url = url[7:]
+        data = read_data_from_file( get_absolute_file_path( url ) )
+        return self._send_attachment( os.path.basename( url ), data, model, resource_id )
+
+    def btnOkWithoutInformation_clicked( self, oActionEvent ):
+        desktop = getDesktop()
+        oDoc2 = desktop.getCurrentComponent()
+        docinfo = oDoc2.getDocumentInfo()
+
+        if self.win.getListBoxSelectedItem("lstResourceType") == "":
+            ErrorDialog("Please select resource type", "", "Selection ERROR" )
+            return
+
+        res = self.send_attachment( docinfo.getUserFieldValue(3), docinfo.getUserFieldValue(2) )
+        self.win.endExecute()
+
+    def btnOkWithInformation_clicked(self,oActionEvent):
+        if self.win.getListBoxSelectedItem("lstResourceType") == "":
+            ErrorDialog( "Please select resource type", "", "Selection ERROR" )
+            return
+
+        if self.win.getListBoxSelectedItem("lstResource") == "" or self.win.getListBoxSelectedItem("lstmodel") == "":
+            ErrorDialog("Please select Model and Resource","","Selection ERROR")
+            return
+
+        resourceid = None
+        for s in self.aSearchResult:
+            if s[1] == self.win.getListBoxSelectedItem("lstResource"):
+                resourceid = s[0]
+                break
+
+        if resourceid == None:
+            ErrorDialog("No resource selected !!!", "", "Resource ERROR" )
+            return
+
+        res = self.send_attachment( self.dModel[self.win.getListBoxSelectedItem('lstmodel')], resourceid )
+        self.win.endExecute()
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
+    def doc2pdf(self, strFile):
+        oDoc = None
+        strFilterSubName = ''
+
+        strUrl = convertToURL( strFile )
+        desktop = getDesktop()
+        oDoc = desktop.loadComponentFromURL( strUrl, "_blank", 0, Array(self._MakePropertyValue("Hidden",True)))
+        if oDoc:
+            strFilterSubName = ""
+            # select appropriate filter
+            if oDoc.supportsService("com.sun.star.presentation.PresentationDocument"):
+                strFilterSubName = "impress_pdf_Export"
+            elif oDoc.supportsService("com.sun.star.sheet.SpreadsheetDocument"):
+                strFilterSubName = "calc_pdf_Export"
+            elif oDoc.supportsService("com.sun.star.text.WebDocument"):
+                strFilterSubName = "writer_web_pdf_Export"
+            elif oDoc.supportsService("com.sun.star.text.GlobalDocument"):
+                strFilterSubName = "writer_globaldocument_pdf_Export"
+            elif oDoc.supportsService("com.sun.star.text.TextDocument"):
+                strFilterSubName = "writer_pdf_Export"
+            elif oDoc.supportsService("com.sun.star.drawing.DrawingDocument"):
+                strFilterSubName = "draw_pdf_Export"
+            elif oDoc.supportsService("com.sun.star.formula.FormulaProperties"):
+                strFilterSubName = "math_pdf_Export"
+            elif oDoc.supportsService("com.sun.star.chart.ChartDocument"):
+                strFilterSubName = "chart_pdf_Export"
+            else:
+                pass
+
+            filename = len(strFilterSubName) > 0 and convertToURL( os.path.splitext( strFile )[0] + ".pdf" ) or None
+
+            if len(strFilterSubName) > 0:
+                oDoc.storeToURL( filename, Array(self._MakePropertyValue("FilterName", strFilterSubName ),self._MakePropertyValue("CompressMode", "1" )))
+
+            oDoc.close(True)
+            # Can be None if len(strFilterSubName) <= 0
+            return filename
+
+    def _MakePropertyValue(self, cName = "", uValue = u"" ):
+       oPropertyValue = createUnoStruct( "com.sun.star.beans.PropertyValue" )
+       if cName:
+          oPropertyValue.Name = cName
+       if uValue:
+          oPropertyValue.Value = uValue
+       return oPropertyValue
+
+
+if __name__<>"package" and __name__=="__main__":
+    AddAttachment(None)
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( AddAttachment, "org.openoffice.openerp.report.addattachment", ("com.sun.star.task.Job",),)
diff --git a/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/Change.py b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/Change.py
new file mode 100755
index 00000000000..aeecd4e522c
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/Change.py
@@ -0,0 +1,62 @@
+if __name__<>"package":
+    from lib.gui import *
+    from lib.functions import *
+    from lib.rpc import *
+
+class Change:
+    def __init__(self, aVal= None, sURL=""):
+        self.win=DBModalDialog(60, 50, 120, 90, "Connect to Open ERP Server")
+
+        self.win.addFixedText("lblVariable", 38, 12, 60, 15, "Server")
+
+        self.win.addEdit("txtHost",-2,9,60,15,sURL[sURL.find("/")+2:sURL.rfind(":")])
+
+        self.win.addFixedText("lblReportName",45 , 31, 60, 15, "Port")
+        self.win.addEdit("txtPort",-2,28,60,15,sURL[sURL.rfind(":")+1:])
+
+        self.win.addFixedText("lblLoginName", 2, 51, 60, 15, "Protocol Connection")
+
+        self.win.addComboListBox("lstProtocol", -2, 48, 60, 15, True)
+        self.lstProtocol = self.win.getControl( "lstProtocol" )
+
+#        self.lstProtocol.addItem( "XML-RPC", 0)
+        #self.lstProtocol.addItem( "XML-RPC secure", 1)
+        #self.lstProtocol.addItem( "NET-RPC (faster)", 2)
+
+        self.win.addButton( 'btnOK', -2, -5, 30, 15, 'Ok', actionListenerProc = self.btnOk_clicked )
+
+        self.win.addButton( 'btnCancel', -2 - 30 - 5 ,-5, 30, 15, 'Cancel', actionListenerProc = self.btnCancel_clicked )
+        self.aVal=aVal
+        self.protocol = {
+            'XML-RPC': 'http://',
+            'XML-RPC secure': 'https://',
+            'NET-RPC': 'socket://',
+        }
+        for i in self.protocol.keys():
+            self.lstProtocol.addItem(i,self.lstProtocol.getItemCount() )
+
+        sValue=self.protocol.keys()[0]
+        if sURL<>"":
+            sValue=self.protocol.keys()[self.protocol.values().index(sURL[:sURL.find("/")+2])]
+
+        self.win.doModalDialog( "lstProtocol", sValue)
+
+    def btnOk_clicked(self,oActionEvent):
+        global url
+        url = self.protocol[self.win.getListBoxSelectedItem("lstProtocol")]+self.win.getEditText("txtHost")+":"+self.win.getEditText("txtPort")
+        self.sock=RPCSession(url)
+        docinfo=doc.getDocumentInfo()        
+        docinfo.setUserFieldValue(0,url)
+        res=self.sock.listdb()
+        if res == -1:
+            self.aVal.append(url)
+        elif res == 0:
+            self.aVal.append("No Database found !!!")
+        else:
+            self.aVal.append(url)
+        self.aVal.append(res)
+        self.win.endExecute()
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
diff --git a/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/ConvertBracesToField.py b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/ConvertBracesToField.py
new file mode 100755
index 00000000000..fb40ec19a20
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/ConvertBracesToField.py
@@ -0,0 +1,240 @@
+
+import uno
+import unohelper
+import string
+import re
+import base64
+
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from LoginTest import *
+    from lib.logreport import *
+    from lib.rpc import *
+    database="test"
+    uid = 1
+
+
+
+class ConvertBracesToField( unohelper.Base, XJobExecutor ):
+
+    def __init__(self,ctx):
+
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+        LoginTest()
+        self.logobj=Logger()
+        if not loginstatus and __name__=="package":
+            exit(1)
+
+        global passwd
+        self.password = passwd
+        global url
+        self.sock=RPCSession(url)
+        self.aReportSyntex=[]
+        self.getBraces(self.aReportSyntex)
+
+        self.setValue()
+
+
+    def setValue(self):
+
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        docinfo=  doc.getDocumentInfo()
+        count = 0
+        regexes = [
+            ['[a-zA-Z0-9_]+\.[a-zA-Z0-9_.]+',"Field"],
+            ['\\[\\[ *repeatIn\\( *([a-zA-Z0-9_\.]+), *\'([a-zA-Z0-9_]+)\' *\\) *\\]\\]', "RepeatIn"],
+            ['\\[\\[ *([a-zA-Z0-9_\.]+) *\\]\\]', "Field"]
+            # ['\\[\\[ ([a-zA-Z0-9_]+\.[a-zA-Z1-9]) \\]\\]',"Field"],
+            # ['\\[\\[ [a-zA-Z0-9_\.]+ and ([a-zA-Z0-9_\.]+) or .+? \\]\\]',"Field"],
+            # ['\\[\\[ ([a-zA-Z0-9_\.]+) or .+? \\]\\]',"Field"],
+            # ['\\[\\[ ([a-zA-Z0-9_\.]+) and .+? \\]\\]',"Field"],
+            # ['\\[\\[ .+? or ([a-zA-Z0-9_\.]+) \\]\\]',"Field"],
+            # ['\\[\\[ (.+?) and ([a-zA-Z0-9_\.]+) \\]\\]',"Field"],
+            # ['\\[\\[ .+? % ([a-zA-Z0-9_\.]+) \\]\\]',"Field"]
+        ]
+        oFieldObject = []
+        oRepeatInObjects = []
+        saRepeatInList = []
+        sHost = docinfo.getUserFieldValue(0)
+        nCount = 0
+        oParEnum = doc.getTextFields().createEnumeration()
+        while oParEnum.hasMoreElements():
+            oPar = oParEnum.nextElement()
+            nCount += 1
+        getList(oRepeatInObjects,sHost,nCount)
+        for ro in oRepeatInObjects:
+            if ro.find("(")<>-1:
+                saRepeatInList.append( [ ro[:ro.find("(")], ro[ro.find("(")+1:ro.find(")")] ])
+        try:
+            oParEnum = doc.getTextFields().createEnumeration()
+            while oParEnum.hasMoreElements():
+                oPar = oParEnum.nextElement()
+                if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+                    for reg in regexes:
+                        res=re.findall(reg[0],oPar.Items[1])
+                        if len(res) <> 0:
+                            if res[0][0] == "objects":
+                                sTemp = docinfo.getUserFieldValue(3)
+                                sTemp = "|-." + sTemp[sTemp.rfind(".")+1:] + ".-|"
+                                oPar.Items=(sTemp.encode("utf-8"),oPar.Items[1].replace(' ',""))
+                                oPar.update()
+                            elif type(res[0]) <> type(u''):
+
+                                sObject = self.getRes(self.sock, docinfo.getUserFieldValue(3), res[0][0][res[0][0].find(".")+1:].replace(".","/"))
+                                r = self.sock.execute(database, uid, self.password, docinfo.getUserFieldValue(3) , 'fields_get')
+                                sExpr="|-." + r[res[0][0][res[0][0].rfind(".")+1:]]["string"] + ".-|"
+                                oPar.Items=(sExpr.encode("utf-8"),oPar.Items[1].replace(' ',""))
+                                oPar.update()
+                            else:
+
+                                obj = None
+                                for rl in saRepeatInList:
+                                    if rl[0] == res[0][:res[0].find(".")]:
+                                        obj=rl[1]
+                                try:
+                                    sObject = self.getRes(self.sock, obj, res[0][res[0].find(".")+1:].replace(".","/"))
+                                    r = self.sock.execute(database, uid, self.password, sObject , 'read',[1])
+                                except Exception,e:
+                                    r = "TTT"
+                                    self.logobj.log_write('ConvertBracesToField', LOG_ERROR, str(e))
+                                if len(r) <> 0:
+                                    if r <> "TTT":
+                                        if len(res)>1:
+                                            sExpr=""
+                                            print res
+                                            if reg[1] == 'Field':
+                                                for ires in res:
+                                                    try:
+                                                        sExpr=r[0][ires[ires.rfind(".")+1:]]
+                                                        break
+                                                    except Exception,e:
+                                                        import traceback,sys
+                                                        info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+                                                        self.logobj.log_write('ConvertBracesToField', LOG_ERROR,info)
+                                                try:
+                                                    oPar.Items=(sExpr.encode("utf-8") ,oPar.Items[1])
+                                                    oPar.update()
+                                                except:
+                                                    oPar.Items=(str(sExpr) ,oPar.Items[1])
+                                                    oPar.update()
+                                                    import traceback,sys
+                                                    info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+                                                    self.logobj.log_write('ConvertBracesToField', LOG_ERROR, info)
+
+                                        else:
+                                            sExpr=r[0][res[0][res[0].rfind(".")+1:]]
+                                            try:
+
+                                                if sExpr:
+                                                    oPar.Items=(sExpr.encode("utf-8") ,oPar.Items[1])
+                                                    oPar.update()
+                                                else:
+                                                     oPar.Items=(u"/",oPar.Items[1])
+                                                     oPar.update()
+                                            except:
+                                                oPar.Items=(str(sExpr) ,oPar.Items[1])
+                                                oPar.update()
+                                                import traceback,sys
+                                                info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+                                                self.logobj.log_write('ConvertBracesToField', LOG_ERROR,info)
+
+                                    else:
+                                        oPar.Items=(u""+r,oPar.Items[1])
+                                        oPar.update()
+                                else:
+                                    oPar.Items=(u"TTT",oPar.Items[1])
+                                    oPar.update()
+        except:
+            import traceback,sys
+            info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+            self.logobj.log_write('ConvertBraceToField', LOG_ERROR, info)
+
+    def getRes(self,sock,sObject,sVar):
+        desktop=getDesktop()
+        doc =desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        res = sock.execute(database, uid, self.password, sObject , 'fields_get')
+        key = res.keys()
+        key.sort()
+        myval=None
+        if not sVar.find("/")==-1:
+            myval=sVar[:sVar.find("/")]
+        else:
+            myval=sVar
+        for k in key:
+            if (res[k]['type'] in ['many2one']) and k==myval:
+                sObject = self.getRes(sock,res[myval]['relation'], sVar[sVar.find("/")+1:])
+        return sObject
+
+    def getBraces(self,aReportSyntex=[]):
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        aSearchString=[]
+        aReplaceString=[]
+        aRes=[]
+
+        try:
+            regexes = [
+                ['\\[\\[ *repeatIn\\( *([a-zA-Z0-9_\.]+), *\'([a-zA-Z0-9_]+)\' *\\) *\\]\\]', "RepeatIn"],
+                ['\\[\\[ *([a-zA-Z0-9_\.]+) *\\]\\]', "Field"],
+                ['\\[\\[ *.+? *\\]\\]', "Expression"]
+            ]
+
+            search = doc.createSearchDescriptor()
+            search.SearchRegularExpression = True
+
+            for reg in regexes:
+                search.SearchString = reg[0]
+                found = doc.findFirst( search )
+                while found:
+                    res=re.findall(reg[0],found.String)
+                    print len(res)
+
+                    if found.String not in [r[0] for r in aReportSyntex] and len(res) == 1 :
+                        text=found.getText()
+                        oInputList = doc.createInstance("com.sun.star.text.TextField.DropDown")
+                        if reg[1]<>"Expression":
+                            oInputList.Items=(u""+found.String,u""+found.String)
+                        else:
+                            oInputList.Items=(u"?",u""+found.String)
+                        aReportSyntex.append([oInputList,reg[1]])
+                        text.insertTextContent(found,oInputList,False)
+                        found.String =""
+
+                    else:
+                        aRes.append([res,reg[1]])
+                        found = doc.findNext(found.End, search)
+            search = doc.createSearchDescriptor()
+            search.SearchRegularExpression = False
+
+            for res in aRes:
+                for r in res[0]:
+                    search.SearchString=r
+                    found=doc.findFirst(search)
+                    while found:
+
+                        text=found.getText()
+
+                        oInputList = doc.createInstance("com.sun.star.text.TextField.DropDown")
+                        if res[1]<>"Expression":
+                            oInputList.Items=(u""+found.String,u""+found.String)
+                        else:
+                            oInputList.Items=(u"?",u""+found.String)
+                        aReportSyntex.append([oInputList,res[1]])
+                        text.insertTextContent(found,oInputList,False)
+                        found.String =""
+                        found = doc.findNext(found.End, search)
+        except:
+            import traceback,sys
+            info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+            self.logobj.log_write('ConvertBraceToField', LOG_ERROR, info)
+
+if __name__<>"package":
+    ConvertBracesToField(None)
+else:
+    g_ImplementationHelper.addImplementation( ConvertBracesToField, "org.openoffice.openerp.report.convertBF", ("com.sun.star.task.Job",),)
+
diff --git a/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/ConvertFieldsToBraces.py b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/ConvertFieldsToBraces.py
new file mode 100755
index 00000000000..a556c277049
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/ConvertFieldsToBraces.py
@@ -0,0 +1,38 @@
+import uno
+import unohelper
+import string
+import re
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from LoginTest import *
+    database="test"
+    uid = 3
+
+class ConvertFieldsToBraces( unohelper.Base, XJobExecutor ):
+    def __init__(self,ctx):
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+        LoginTest()
+        if not loginstatus and __name__=="package":
+            exit(1)
+        self.aReportSyntex=[]
+        self.getFields()
+
+    def getFields(self):
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+
+        oParEnum = doc.getTextFields().createEnumeration()
+        while oParEnum.hasMoreElements():
+            oPar = oParEnum.nextElement()
+            if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+                oPar.getAnchor().Text.insertString(oPar.getAnchor(),oPar.Items[1],False)
+                oPar.dispose()
+
+if __name__<>"package":
+    ConvertFieldsToBraces(None)
+else:
+    g_ImplementationHelper.addImplementation( ConvertFieldsToBraces, "org.openoffice.openerp.report.convertFB", ("com.sun.star.task.Job",),) 
+
diff --git a/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/ExportToRML.py b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/ExportToRML.py
new file mode 100755
index 00000000000..9178dbbf6de
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/ExportToRML.py
@@ -0,0 +1,86 @@
+import os
+import uno
+import unohelper
+import string
+import tempfile
+import base64
+import sys
+
+reload(sys)
+sys.setdefaultencoding("utf8")
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from LoginTest import *
+    from lib.error import *
+    from lib.tools import *
+    from lib.logreport import *
+    from lib.rpc import *
+    database="test"
+    uid = 3
+
+
+class ExportToRML( unohelper.Base, XJobExecutor ):
+    def __init__(self,ctx):
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+        LoginTest()
+        if not loginstatus and __name__=="package":
+            exit(1)
+
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        global url
+        self.sock=RPCSession(url)
+
+        # Read Data from sxw file
+        tmpsxw = tempfile.mktemp('.'+"sxw")
+
+        if not doc.hasLocation():
+            mytype = Array(makePropertyValue("MediaType","application/vnd.sun.xml.writer"),)
+            doc.storeAsURL("file://"+tmpsxw,mytype)
+        data = read_data_from_file( get_absolute_file_path( doc.getURL()[7:] ) )
+        file_type = doc.getURL()[7:].split(".")[-1]
+        if docinfo.getUserFieldValue(2) == "":
+            ErrorDialog("Please Save this file on server","Use Send To Server Option in OpenERP Report Menu","Error")
+            exit(1)
+    	filename = self.GetAFileName()
+    	if not filename:
+    	    exit(1)
+        global passwd
+        self.password = passwd
+        try:
+
+            res = self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'sxwtorml',base64.encodestring(data),file_type)
+            if res['report_rml_content']:
+                write_data_to_file( get_absolute_file_path( filename[7:] ), res['report_rml_content'] )
+        except Exception,e:
+            import traceback,sys
+            info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+            self.logobj.log_write('ExportToRML',LOG_ERROR, info)
+            ErrorDialog("Can't save the file to the hard drive.", "Exception: %s" % e, "Error" )
+
+    def GetAFileName(self):
+        sFilePickerArgs = Array(10)
+        oFileDialog = createUnoService("com.sun.star.ui.dialogs.FilePicker")
+        oFileDialog.initialize(sFilePickerArgs)
+        oFileDialog.appendFilter("OpenERP Report File Save To ....","*.rml")
+
+        f_path = "OpenERP-"+ os.path.basename( tempfile.mktemp("","") ) + ".rml"
+        initPath = tempfile.gettempdir()
+        oUcb = createUnoService("com.sun.star.ucb.SimpleFileAccess")
+        if oUcb.exists(initPath):
+	    oFileDialog.setDisplayDirectory('file://' + ( os.name == 'nt' and '/' or '' ) + initPath )
+
+        oFileDialog.setDefaultName(f_path )
+
+        sPath = oFileDialog.execute() == 1 and oFileDialog.Files[0] or None
+        oFileDialog.dispose()
+        return sPath
+
+if __name__<>"package" and __name__=="__main__":
+    ExportToRML(None)
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( ExportToRML, "org.openoffice.openerp.report.exporttorml", ("com.sun.star.task.Job",),)
diff --git a/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/Expression.py b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/Expression.py
new file mode 100755
index 00000000000..8da231cafb6
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/Expression.py
@@ -0,0 +1,69 @@
+import uno
+import string
+import unohelper
+import xmlrpclib
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from lib.error import ErrorDialog
+    from lib.functions import *
+    database="test"
+    uid = 3
+
+class Expression(unohelper.Base, XJobExecutor ):
+    def __init__(self,sExpression="",sName="", bFromModify=False):
+        LoginTest()
+        if not loginstatus and __name__=="package":
+            exit(1)
+        self.win = DBModalDialog(60, 50, 180, 65, "Expression Builder")
+        self.win.addFixedText("lblExpression",17 , 10, 35, 15, "Expression :")
+        self.win.addEdit("txtExpression", -5, 5, 123, 15)
+        self.win.addFixedText("lblName", 2, 30, 50, 15, "Displayed Name :")
+        self.win.addEdit("txtName", -5, 25, 123, 15)
+        self.win.addButton( "btnOK", -5, -5, 40, 15, "OK", actionListenerProc = self.btnOk_clicked )
+        self.win.addButton( "btnCancel", -5 - 40 -5, -5, 40, 15, "Cancel", actionListenerProc = self.btnCancel_clicked )
+        self.bModify=bFromModify
+        if self.bModify==True:
+            self.win.setEditText("txtExpression",sExpression)
+            self.win.setEditText("txtName",sName)
+        self.win.doModalDialog("",None)
+
+
+    def btnOk_clicked( self, oActionEvent ):
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        text = doc.Text
+        cursor = doc.getCurrentController().getViewCursor()
+        if self.bModify==True:
+            oCurObj=cursor.TextField
+            sKey=u""+self.win.getEditText("txtName")
+            sValue=u"[[ " + self.win.getEditText("txtExpression") + " ]]"
+            oCurObj.Items = (sKey,sValue)
+            oCurObj.update()
+            self.win.endExecute()
+        else:
+            oInputList = doc.createInstance("com.sun.star.text.TextField.DropDown")
+            if self.win.getEditText("txtName")!="" and self.win.getEditText("txtExpression")!="":
+                sKey=u""+self.win.getEditText("txtName")
+                sValue=u"[[ " + self.win.getEditText("txtExpression") + " ]]"
+                if cursor.TextTable==None:
+                    oInputList.Items = (sKey,sValue)
+                    text.insertTextContent(cursor,oInputList,False)
+                else:
+                    oTable = cursor.TextTable
+                    oCurCell = cursor.Cell
+                    tableText = oTable.getCellByName( oCurCell.CellName )
+                    oInputList.Items = (sKey,sValue)
+                    tableText.insertTextContent(cursor,oInputList,False)
+                self.win.endExecute()
+            else:
+                ErrorDialog("Please Fill appropriate data in Name field or \nExpression field")
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
+if __name__<>"package" and __name__=="__main__":
+    Expression()
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( Expression, "org.openoffice.openerp.report.expression", ("com.sun.star.task.Job",),)
+
diff --git a/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/Fields.py b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/Fields.py
new file mode 100755
index 00000000000..83295a9928c
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/Fields.py
@@ -0,0 +1,245 @@
+
+
+import uno
+import string
+import unohelper
+import xmlrpclib
+
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from lib.functions import *
+    from lib.error import ErrorDialog
+    from LoginTest import *
+    from lib.logreport import *
+    from lib.rpc import *
+    database="report"
+    uid = 3
+
+
+class Fields(unohelper.Base, XJobExecutor ):
+    def __init__(self,sVariable="",sFields="",sDisplayName="",bFromModify=False):
+        LoginTest()
+        if not loginstatus and __name__=="package":
+            exit(1)
+        self.logobj=Logger()
+        self.win = DBModalDialog(60, 50, 200, 225, "Field Builder")
+
+        self.win.addFixedText("lblVariable", 27, 12, 60, 15, "Variable :")
+        self.win.addComboBox("cmbVariable", 180-120-2, 10, 130, 15,True, itemListenerProc=self.cmbVariable_selected)
+        self.insVariable = self.win.getControl( "cmbVariable" )
+
+        self.win.addFixedText("lblFields", 10, 32, 60, 15, "Variable Fields :")
+        self.win.addComboListBox("lstFields", 180-120-2, 30, 130, 150, False,True,itemListenerProc=self.lstbox_selected)
+        self.insField = self.win.getControl( "lstFields" )
+
+        self.win.addFixedText("lblUName", 8, 187, 60, 15, "Displayed name :")
+        self.win.addEdit("txtUName", 180-120-2, 185, 130, 15,)
+
+        self.win.addButton('btnOK',-5 ,-5,45,15,'Ok' ,actionListenerProc = self.btnOk_clicked )
+        self.win.addButton('btnCancel',-5 - 45 - 5 ,-5,45,15,'Cancel' ,actionListenerProc = self.btnCancel_clicked )
+
+        global passwd
+        self.password = passwd
+        global url
+        self.sock=RPCSession(url)
+
+        self.sValue=None
+        self.sObj=None
+        self.aSectionList=[]
+        self.sGDisplayName=sDisplayName
+        self.aItemList=[]
+        self.aComponentAdd=[]
+        self.aObjectList=[]
+        self.aListFields=[]
+        self.aVariableList=[]
+        EnumDocument(self.aItemList,self.aComponentAdd)
+        desktop=getDesktop()
+        doc =desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        self.sMyHost= ""
+
+        if not docinfo.getUserFieldValue(3) == "" and not docinfo.getUserFieldValue(0)=="":
+            self.sMyHost = docinfo.getUserFieldValue(0)
+            self.count = 0
+            oParEnum = doc.getTextFields().createEnumeration()
+
+            while oParEnum.hasMoreElements():
+                oPar = oParEnum.nextElement()
+                if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+                    self.count += 1
+
+            getList(self.aObjectList, self.sMyHost,self.count)
+            cursor = doc.getCurrentController().getViewCursor()
+            text = cursor.getText()
+            tcur = text.createTextCursorByRange(cursor)
+
+            self.aVariableList.extend( filter( lambda obj: obj[:obj.find("(")] == "Objects", self.aObjectList ) )
+
+            for i in range(len(self.aItemList)):
+                try:
+                    anItem = self.aItemList[i][1]
+                    component = self.aComponentAdd[i]
+
+                    if component == "Document":
+                        sLVal = anItem[anItem.find(",'") + 2:anItem.find("')")]
+                        self.aVariableList.extend( filter( lambda obj: obj[:obj.find("(")] == sLVal, self.aObjectList ) )
+
+                    if tcur.TextSection:
+                        getRecersiveSection(tcur.TextSection,self.aSectionList)
+                        if component in self.aSectionList:
+                            sLVal = anItem[anItem.find(",'") + 2:anItem.find("')")]
+                            self.aVariableList.extend( filter( lambda obj: obj[:obj.find("(")] == sLVal, self.aObjectList ) )
+
+                    if tcur.TextTable:
+                        if not component == "Document" and component[component.rfind(".")+1:] == tcur.TextTable.Name:
+                            VariableScope(tcur, self.aVariableList, self.aObjectList, self.aComponentAdd, self.aItemList, component)
+                except:
+                    import traceback,sys
+                    info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+                    self.logobj.log_write('Fields', LOG_ERROR, info)
+
+            self.bModify=bFromModify
+            if self.bModify==True:
+                sItem=""
+                for anObject in self.aObjectList:
+                    if anObject[:anObject.find("(")] == sVariable:
+                        sItem = anObject
+                        self.insVariable.setText(sItem)
+                genTree(
+                    sItem[sItem.find("(")+1:sItem.find(")")],
+                    self.aListFields,
+                    self.insField,
+                    self.sMyHost,
+                    2,
+                    ending_excl=['one2many','many2one','many2many','reference'],
+                    recur=['many2one']
+                )
+                self.sValue= self.win.getListBoxItem("lstFields",self.aListFields.index(sFields))
+            for var in self.aVariableList:
+
+                    self.model_ids =self.sock.execute(database, uid, self.password, 'ir.model' ,  'search', [('model','=',var[var.find("(")+1:var.find(")")])])
+                    fields=['name','model']
+                    self.model_res = self.sock.execute(database, uid, self.password, 'ir.model', 'read', self.model_ids,fields)
+                    if self.model_res <> []:
+                        self.insVariable.addItem(var[:var.find("(")+1] + self.model_res[0]['name'] + ")" ,self.insVariable.getItemCount())
+                    else:
+                        self.insVariable.addItem(var ,self.insVariable.getItemCount())
+
+            self.win.doModalDialog("lstFields",self.sValue)
+        else:
+            ErrorDialog("Please insert user define field Field-1 or Field-4","Just go to File->Properties->User Define \nField-1 Eg. http://localhost:8069 \nOR \nField-4 Eg. account.invoice")
+            self.win.endExecute()
+
+    def lstbox_selected(self,oItemEvent):
+        try:
+
+            desktop=getDesktop()
+            doc =desktop.getCurrentComponent()
+            docinfo=doc.getDocumentInfo()
+            sItem= self.win.getComboBoxText("cmbVariable")
+            for var in self.aVariableList:
+                if var[:var.find("(")+1]==sItem[:sItem.find("(")+1]:
+                    sItem = var
+            sMain=self.aListFields[self.win.getListBoxSelectedItemPos("lstFields")]
+            sObject=self.getRes(self.sock,sItem[sItem.find("(")+1:-1],sMain[1:])
+            ids = self.sock.execute(database, uid, self.password, sObject ,  'search', [])
+            res = self.sock.execute(database, uid, self.password, sObject , 'read',[ids[0]])
+            self.win.setEditText("txtUName",res[0][sMain[sMain.rfind("/")+1:]])
+        except:
+            import traceback,sys
+            info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+            self.logobj.log_write('Fields', LOG_ERROR, info)
+            self.win.setEditText("txtUName","TTT")
+        if self.bModify:
+            self.win.setEditText("txtUName",self.sGDisplayName)
+
+    def getRes(self,sock ,sObject,sVar):
+        desktop=getDesktop()
+        doc =desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        res = sock.execute(database, uid, self.password, sObject , 'fields_get')
+        key = res.keys()
+        key.sort()
+        myval=None
+        if not sVar.find("/")==-1:
+	    myval=sVar[:sVar.find("/")]
+        else:
+            myval=sVar
+        if myval in key:
+            if (res[myval]['type'] in ['many2one']):
+                sObject = res[myval]['relation']
+		return self.getRes(sock,res[myval]['relation'], sVar[sVar.find("/")+1:])
+            else:
+                return sObject
+
+    def cmbVariable_selected(self,oItemEvent):
+        if self.count > 0 :
+            try:
+                desktop=getDesktop()
+                doc =desktop.getCurrentComponent()
+                docinfo=doc.getDocumentInfo()
+                self.win.removeListBoxItems("lstFields", 0, self.win.getListBoxItemCount("lstFields"))
+                self.aListFields=[]
+                tempItem = self.win.getComboBoxText("cmbVariable")
+                for var in self.aVariableList:
+                    if var[:var.find("(")] == tempItem[:tempItem.find("(")]:
+                        sItem=var
+
+                genTree(
+                    sItem[sItem.find("(")+1:sItem.find(")")],
+                    self.aListFields,
+                    self.insField,
+                    self.sMyHost,
+                    2,
+                    ending_excl=['one2many','many2one','many2many','reference'],
+                    recur=['many2one']
+                )
+            except:
+                import traceback,sys
+                info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+                self.logobj.log_write('Fields', LOG_ERROR, info)
+
+    def btnOk_clicked( self, oActionEvent ):
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        cursor = doc.getCurrentController().getViewCursor()
+        for i in self.win.getListBoxSelectedItemsPos("lstFields"):
+                itemSelected = self.aListFields[i]
+                itemSelectedPos = i
+                txtUName=self.win.getEditText("txtUName")
+                sKey=u""+txtUName
+                if itemSelected != "" and txtUName != "" and self.bModify==True :
+                    txtUName=self.sGDisplayName
+                    sKey=u""+txtUName
+                    txtUName=self.sGDisplayName
+                    oCurObj=cursor.TextField
+                    sObjName=self.insVariable.getText()
+                    sObjName=sObjName[:sObjName.find("(")]
+                    sValue=u"[[ " + sObjName + self.aListFields[itemSelectedPos].replace("/",".") + " ]]"
+                    oCurObj.Items = (sKey,sValue)
+                    oCurObj.update()
+                    self.win.endExecute()
+                elif itemSelected != "" and txtUName != "" :
+
+                    oInputList = doc.createInstance("com.sun.star.text.TextField.DropDown")
+                    sObjName=self.win.getComboBoxText("cmbVariable")
+                    sObjName=sObjName[:sObjName.find("(")]
+
+                    widget = ( cursor.TextTable and cursor.TextTable.getCellByName( cursor.Cell.CellName ) or doc.Text )
+
+                    sValue = u"[[ " + sObjName + self.aListFields[itemSelectedPos].replace("/",".") + " ]]"
+                    oInputList.Items = (sKey,sValue)
+                    widget.insertTextContent(cursor,oInputList,False)
+                    self.win.endExecute()
+                else:
+                    ErrorDialog("Please Fill appropriate data in Name field \nor select perticular value from the list of fields")
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
+if __name__<>"package" and __name__=="__main__":
+    Fields()
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( Fields, "org.openoffice.openerp.report.fields", ("com.sun.star.task.Job",),)
+
diff --git a/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/LoginTest.py b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/LoginTest.py
new file mode 100755
index 00000000000..daf81591c1a
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/LoginTest.py
@@ -0,0 +1,10 @@
+
+if __name__<>"package":
+    from ServerParameter import *
+    from lib.gui import *
+
+class LoginTest:
+    def __init__(self):
+        if not loginstatus:
+            ServerParameter(None)
+
diff --git a/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/ModifyExistingReport.py b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/ModifyExistingReport.py
new file mode 100755
index 00000000000..9781cbe5b6b
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/ModifyExistingReport.py
@@ -0,0 +1,168 @@
+
+
+import uno
+import string
+import unohelper
+import xmlrpclib
+import base64, tempfile
+
+
+from com.sun.star.task import XJobExecutor
+import os
+import sys
+if __name__<>'package':
+    from lib.gui import *
+    from lib.error import *
+    from LoginTest import *
+    from lib.logreport import *
+    from lib.rpc import *
+    database="test"
+    uid = 3
+
+#
+class ModifyExistingReport(unohelper.Base, XJobExecutor):
+    def __init__(self,ctx):
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+
+        LoginTest()
+        if not loginstatus and __name__=="package":
+            exit(1)
+
+        self.win = DBModalDialog(60, 50, 180, 120, "Modify Existing Report")
+        self.win.addFixedText("lblReport", 2, 3, 60, 15, "Report Selection")
+        self.win.addComboListBox("lstReport", -1,15,178,80 , False )
+        self.lstReport = self.win.getControl( "lstReport" )
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        self.logobj=Logger()
+        self.hostname = docinfo.getUserFieldValue(0)
+        global passwd
+        self.password = passwd
+        global url
+        self.sock=RPCSession(url)
+        # Open a new connexion to the server
+
+
+        ids = self.sock.execute(database, uid, self.password, 'ir.module.module', 'search', [('name','=','base_report_designer'),('state', '=', 'installed')])
+        if not len(ids):
+            ErrorDialog("Please Install base_report_designer module", "", "Module Uninstalled Error")
+            exit(1)
+
+        ids = self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'search', [('report_xsl', '=', False),('report_xml', '=', False)])
+
+        fields=['id', 'name','report_name','model']
+
+        self.reports = self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'read', ids, fields)
+        self.report_with_id = []
+
+        for report in self.reports:
+            if report['name']<>"":
+                model_ids = self.sock.execute(database, uid, self.password, 'ir.model' ,  'search', [('model','=', report['model'])])
+                model_res_other =self.sock.execute(database, uid, self.password, 'ir.model', 'read', model_ids, [ 'name', 'model' ] )
+                if model_res_other <> []:
+                    name = model_res_other[0]['name'] + " - " + report['name']
+                else:
+                    name = report['name'] + " - " + report['model']
+                self.report_with_id.append( (report['id'], name, report['model'] ) )
+
+        self.report_with_id.sort( lambda x, y: cmp( x[1], y[1] ) )
+
+        for id, report_name, model_name in self.report_with_id:
+            self.lstReport.addItem( report_name, self.lstReport.getItemCount() )
+
+        self.win.addButton('btnSave',10,-5,50,15,'Open Report' ,actionListenerProc = self.btnOk_clicked )
+        self.win.addButton('btnCancel',-10 ,-5,50,15,'Cancel' ,actionListenerProc = self.btnCancel_clicked )
+        self.win.addButton('btnDelete',15 -80 ,-5,50,15,'Delete Report',actionListenerProc = self.btnDelete_clicked)
+        self.win.doModalDialog("lstReport",self.report_with_id[0][1] )
+
+    def btnOk_clicked(self, oActionEvent):
+        try:
+            desktop=getDesktop()
+            doc = desktop.getCurrentComponent()
+            docinfo=doc.getDocumentInfo()
+
+            selectedItemPos = self.win.getListBoxSelectedItemPos( "lstReport" )
+            id = self.report_with_id[ selectedItemPos ][0]
+
+            res = self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'report_get', id)
+
+            if res['file_type'] in ['sxw','odt'] :
+               file_type = res['file_type']
+            else :
+               file_type = 'sxw'
+
+            fp_name = tempfile.mktemp('.'+file_type)
+            fp_name1="r"+fp_name
+            fp_path=os.path.join(fp_name1).replace("\\","/")
+            fp_win=fp_path[1:]
+
+            filename = ( os.name == 'nt' and fp_win or fp_name )
+            if res['report_sxw_content']:
+                write_data_to_file( filename, base64.decodestring(res['report_sxw_content']))
+            url = "file:///%s" % filename
+
+            arr=Array(makePropertyValue("MediaType","application/vnd.sun.xml.writer"),)
+            oDoc2 = desktop.loadComponentFromURL(url, "openerp", 55, arr)
+            docinfo2=oDoc2.getDocumentInfo()
+            docinfo2.setUserFieldValue(0, self.hostname)
+            docinfo2.setUserFieldValue(1,self.password)
+            docinfo2.setUserFieldValue(2,id)
+            docinfo2.setUserFieldValue(3,self.report_with_id[selectedItemPos][2])
+
+            oParEnum = oDoc2.getTextFields().createEnumeration()
+            while oParEnum.hasMoreElements():
+                oPar = oParEnum.nextElement()
+                if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+                    oPar.SelectedItem = oPar.Items[0]
+                    oPar.update()
+            if oDoc2.isModified():
+                if oDoc2.hasLocation() and not oDoc2.isReadonly():
+                    oDoc2.store()
+
+            ErrorDialog("Download is Completed","Your file has been placed here :\n"+ fp_name,"Download Message")
+            obj=Logger()
+            obj.log_write('Modify Existing Report',LOG_INFO, ':successful download report  %s  using database %s' % (self.report_with_id[selectedItemPos][2], database))
+        except Exception, e:
+            ErrorDialog("Report has not been downloaded", "Report: %s\nDetails: %s" % ( fp_name, str(e) ),"Download Message")
+            import traceback,sys
+            info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+            self.logobj.log_write('ModifyExistingReport', LOG_ERROR, info)
+
+        self.win.endExecute()
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
+    def btnDelete_clicked( self, oActionEvent ):
+         desktop=getDesktop()
+         doc = desktop.getCurrentComponent()
+         docinfo=doc.getDocumentInfo()
+
+         selectedItemPos = self.win.getListBoxSelectedItemPos( "lstReport" )
+         name=self.win.getListBoxSelectedItem ("lstReport")
+         id = self.report_with_id[ selectedItemPos ][0]
+         temp = self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'unlink', id,)
+         str_value='ir.actions.report.xml,'+str(id)
+         ids = self.sock.execute(database, uid, self.password, 'ir.values' ,  'search',[('value','=',str_value)])
+         if ids:
+              rec = self.sock.execute(database, uid, self.password, 'ir.values', 'unlink', ids,)
+         else :
+            pass
+         if temp:
+              ErrorDialog("Report","Report has been Delete:\n "+name,"Message")
+              self.logobj.log_write('Delete Report',LOG_INFO, ':successful delete report  %s  using database %s' % (name, database))
+
+         else:
+             ErrorDialog("Report","Report has not Delete:\n"+name," Message")
+         self.win.endExecute()
+
+
+
+if __name__<>"package" and __name__=="__main__":
+    ModifyExistingReport(None)
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( ModifyExistingReport, "org.openoffice.openerp.report.modifyreport", ("com.sun.star.task.Job",),)
+
diff --git a/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/NewReport.py b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/NewReport.py
new file mode 100755
index 00000000000..5bd571d45a4
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/NewReport.py
@@ -0,0 +1,74 @@
+
+import uno
+import string
+import unohelper
+import xmlrpclib
+
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from lib.error import ErrorDialog
+    from lib.functions import *
+    from lib.logreport import *
+    from LoginTest import *
+    from lib.rpc import *
+    database="test"
+    uid = 3
+#
+#
+#
+# Start OpenOffice.org, listen for connections and open testing document
+#
+#
+class NewReport(unohelper.Base, XJobExecutor):
+    def __init__(self,ctx):
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+        LoginTest()
+        self.logobj=Logger()
+        if not loginstatus and __name__=="package":
+            exit(1)
+        self.win=DBModalDialog(60, 50, 180, 115, "Open New Report")
+        self.win.addFixedText("lblModuleSelection", 2, 2, 60, 15, "Module Selection")
+        self.win.addComboListBox("lstModule", -2,13,176,80 , False)
+        self.lstModule = self.win.getControl( "lstModule" )
+        self.aModuleName=[]
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+
+        global passwd
+        self.password = passwd
+        global url
+        self.sock=RPCSession(url)
+        ids = self.sock.execute(database, uid, self.password, 'ir.model' , 'search',[])
+        fields = [ 'model','name']
+        res = self.sock.execute(database, uid, self.password, 'ir.model' , 'read', ids, fields)
+        res.sort(lambda x, y: cmp(x['name'],y['name']))
+
+        for i in range(len(res)):
+            self.lstModule.addItem(res[i]['name'],self.lstModule.getItemCount())
+            self.aModuleName.append(res[i]['model'])
+        self.win.addButton('btnOK',-2 ,-5, 70,15,'Use Module in Report' ,actionListenerProc = self.btnOk_clicked )
+        self.win.addButton('btnCancel',-2 - 70 - 5 ,-5, 35,15,'Cancel' ,actionListenerProc = self.btnCancel_clicked )
+        self.win.doModalDialog("",None)
+
+    def btnOk_clicked(self,oActionEvent):
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        docinfo.setUserFieldValue(3,self.aModuleName[self.lstModule.getSelectedItemPos()])
+        self.logobj.log_write('Module Name',LOG_INFO, ':Module use in creating a report %s  using database %s' % (self.aModuleName[self.lstModule.getSelectedItemPos()], database))
+        self.win.endExecute()
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
+if __name__<>"package" and __name__=="__main__":
+    NewReport(None)
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( \
+            NewReport,
+            "org.openoffice.openerp.report.opennewreport",
+            ("com.sun.star.task.Job",),)
diff --git a/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/Repeatln.py b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/Repeatln.py
new file mode 100755
index 00000000000..4c161fc17c5
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/Repeatln.py
@@ -0,0 +1,254 @@
+import uno
+import string
+import unohelper
+import xmlrpclib
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from lib.error import ErrorDialog
+    from lib.functions import *
+    from ServerParameter import *
+    from lib.logreport import *
+    from lib.rpc import *
+    from LoginTest import *
+
+    database="test_db1"
+    uid = 3
+
+
+#class RepeatIn:
+class RepeatIn( unohelper.Base, XJobExecutor ):
+    def __init__(self,sObject="",sVariable="",sFields="",sDisplayName="",bFromModify=False):
+        # Interface Design
+        LoginTest()
+        self.logobj=Logger()
+        if not loginstatus and __name__=="package":
+            exit(1)
+
+        self.win = DBModalDialog(60, 50, 180, 250, "RepeatIn Builder")
+        self.win.addFixedText("lblVariable", 2, 12, 60, 15, "Objects to loop on :")
+        self.win.addComboBox("cmbVariable", 180-120-2, 10, 120, 15,True, itemListenerProc=self.cmbVariable_selected)
+        self.insVariable = self.win.getControl( "cmbVariable" )
+
+        self.win.addFixedText("lblFields", 10, 32, 60, 15, "Field to loop on :")
+        self.win.addComboListBox("lstFields", 180-120-2, 30, 120, 150, False,itemListenerProc=self.lstbox_selected)
+        self.insField = self.win.getControl( "lstFields" )
+
+        self.win.addFixedText("lblName", 12, 187, 60, 15, "Variable name :")
+        self.win.addEdit("txtName", 180-120-2, 185, 120, 15,)
+
+        self.win.addFixedText("lblUName", 8, 207, 60, 15, "Displayed name :")
+        self.win.addEdit("txtUName", 180-120-2, 205, 120, 15,)
+
+        self.win.addButton('btnOK',-2 ,-10,45,15,'Ok', actionListenerProc = self.btnOk_clicked )
+
+        self.win.addButton('btnCancel',-2 - 45 - 5 ,-10,45,15,'Cancel', actionListenerProc = self.btnCancel_clicked )
+
+        global passwd
+        self.password = passwd
+        global url
+        self.sock=RPCSession(url)
+        # Variable Declaration
+        self.sValue=None
+        self.sObj=None
+        self.aSectionList=[]
+        self.sGVariable=sVariable
+        self.sGDisplayName=sDisplayName
+        self.aItemList=[]
+        self.aComponentAdd=[]
+        self.aObjectList=[]
+        self.aListRepeatIn=[]
+        self.aVariableList=[]
+        # Call method to perform Enumration on Report Document
+        EnumDocument(self.aItemList,self.aComponentAdd)
+        # Perform checking that Field-1 and Field - 4 is available or not alos get Combobox
+        # filled if condition is true
+        desktop = getDesktop()
+        doc = desktop.getCurrentComponent()
+        docinfo = doc.getDocumentInfo()
+        # Check weather Field-1 is available if not then exit from application
+        self.sMyHost= ""
+
+        if not docinfo.getUserFieldValue(3) == "" and not docinfo.getUserFieldValue(0)=="":
+            self.sMyHost= docinfo.getUserFieldValue(0)
+            self.count=0
+            oParEnum = doc.getTextFields().createEnumeration()
+
+            while oParEnum.hasMoreElements():
+                oPar = oParEnum.nextElement()
+                if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+                    self.count += 1
+
+            getList(self.aObjectList, self.sMyHost,self.count)
+            cursor = doc.getCurrentController().getViewCursor()
+            text = cursor.getText()
+            tcur = text.createTextCursorByRange(cursor)
+
+            self.aVariableList.extend( filter( lambda obj: obj[:obj.find(" ")] == "List", self.aObjectList ) )
+
+            for i in range(len(self.aItemList)):
+                try:
+                    anItem = self.aItemList[i][1]
+                    component = self.aComponentAdd[i]
+
+                    if component == "Document":
+                        sLVal = anItem[anItem.find(",'") + 2:anItem.find("')")]
+                        self.aVariableList.extend( filter( lambda obj: obj[:obj.find("(")] == sLVal, self.aObjectList ) )
+
+                    if tcur.TextSection:
+                        getRecersiveSection(tcur.TextSection,self.aSectionList)
+                        if component in self.aSectionList:
+                            sLVal = anItem[anItem.find(",'") + 2:anItem.find("')")]
+                            self.aVariableList.extend( filter( lambda obj: obj[:obj.find("(")] == sLVal, self.aObjectList ) )
+
+                    if tcur.TextTable:
+                        if not component == "Document" and component[component.rfind(".") + 1:] == tcur.TextTable.Name:
+                            VariableScope( tcur, self.aVariableList, self.aObjectList, self.aComponentAdd, self.aItemList, component )
+                except :
+                    import traceback,sys
+                    info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+                    self.logobj.log_write('RepeatIn', LOG_ERROR, info)
+            self.bModify=bFromModify
+
+            if self.bModify==True:
+
+                if sObject=="":
+                    self.insVariable.setText("List of "+docinfo.getUserFieldValue(3))
+                    self.insField.addItem("objects",self.win.getListBoxItemCount("lstFields"))
+                    self.win.setEditText("txtName", sVariable)
+                    self.win.setEditText("txtUName",sDisplayName)
+                    self.sValue= "objects"
+                else:
+                    sItem=""
+		    for anObject in self.aObjectList:
+			if anObject[:anObject.find("(")] == sObject:
+			    sItem = anObject
+			    self.insVariable.setText( sItem )
+
+		    genTree(
+			sItem[sItem.find("(")+1:sItem.find(")")],
+			self.aListRepeatIn,
+			self.insField,
+			self.sMyHost,
+			2,
+			ending=['one2many','many2many'],
+			recur=['one2many','many2many']
+		    )
+
+                    self.sValue= self.win.getListBoxItem("lstFields",self.aListRepeatIn.index(sFields))
+
+            for var in self.aVariableList:
+
+		if var[:8] <> 'List of ':
+		    self.model_ids = self.sock.execute(database, uid, self.password, 'ir.model' ,  'search', [('model','=',var[var.find("(")+1:var.find(")")])])
+                else:
+		    self.model_ids = self.sock.execute(database, uid, self.password, 'ir.model' ,  'search', [('model','=',var[8:])])
+                fields=['name','model']
+                self.model_res = self.sock.execute(database, uid, self.password, 'ir.model', 'read', self.model_ids,fields)
+                if self.model_res <> []:
+		    if var[:8]<>'List of ':
+                        self.insVariable.addItem(var[:var.find("(")+1] + self.model_res[0]['name'] + ")" ,self.insVariable.getItemCount())
+                    else:
+                        self.insVariable.addItem('List of ' + self.model_res[0]['name'] ,self.insVariable.getItemCount())
+                else:
+                    self.insVariable.addItem(var ,self.insVariable.getItemCount())
+
+            self.win.doModalDialog("lstFields",self.sValue)
+        else:
+            ErrorDialog("Please Select Appropriate module" ,"Create new report from: \nOpenERP -> Open a New Report")
+            self.win.endExecute()
+
+    def lstbox_selected(self,oItemEvent):
+        sItem=self.win.getListBoxSelectedItem("lstFields")
+        sMain=self.aListRepeatIn[self.win.getListBoxSelectedItemPos("lstFields")]
+
+        if self.bModify==True:
+            self.win.setEditText("txtName", self.sGVariable)
+            self.win.setEditText("txtUName",self.sGDisplayName)
+        else:
+	    self.win.setEditText("txtName",sMain[sMain.rfind("/")+1:])
+	    self.win.setEditText("txtUName","|-."+sItem[sItem.rfind("/")+1:]+".-|")
+
+    def cmbVariable_selected(self,oItemEvent):
+
+        if self.count > 0 :
+
+            desktop=getDesktop()
+            doc =desktop.getCurrentComponent()
+            docinfo=doc.getDocumentInfo()
+            self.win.removeListBoxItems("lstFields", 0, self.win.getListBoxItemCount("lstFields"))
+            sItem=self.win.getComboBoxText("cmbVariable")
+            for var in self.aVariableList:
+		if var[:8]=='List of ':
+		    if var[:8]==sItem[:8]:
+                        sItem = var
+		elif var[:var.find("(")+1] == sItem[:sItem.find("(")+1]:
+                    sItem = var
+            self.aListRepeatIn=[]
+
+	    data = ( sItem[sItem.rfind(" ") + 1:] == docinfo.getUserFieldValue(3) ) and docinfo.getUserFieldValue(3) or sItem[sItem.find("(")+1:sItem.find(")")]
+	    genTree( data, self.aListRepeatIn, self.insField, self.sMyHost, 2, ending=['one2many','many2many'], recur=['one2many','many2many'] )
+
+            self.win.selectListBoxItemPos("lstFields", 0, True )
+
+        else:
+            sItem=self.win.getComboBoxText("cmbVariable")
+            for var in self.aVariableList:
+                if var[:8]=='List of ' and var[:8] == sItem[:8]:
+                    sItem = var
+            if sItem.find(".")==-1:
+                temp=sItem[sItem.rfind("x_"):]
+            else:
+                temp=sItem[sItem.rfind(".")+1:]
+            self.win.setEditText("txtName",temp)
+            self.win.setEditText("txtUName","|-."+temp+".-|")
+            self.insField.addItem("objects",self.win.getListBoxItemCount("lstFields"))
+            self.win.selectListBoxItemPos("lstFields", 0, True )
+
+    def btnOk_clicked(self, oActionEvent):
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        cursor = doc.getCurrentController().getViewCursor()
+        selectedItem = self.win.getListBoxSelectedItem( "lstFields" )
+        selectedItemPos = self.win.getListBoxSelectedItemPos( "lstFields" )
+        txtName = self.win.getEditText( "txtName" )
+        txtUName = self.win.getEditText( "txtUName" )
+        if selectedItem != "" and txtName != "" and txtUName != "":
+            sKey=u""+ txtUName
+            if selectedItem == "objects":
+                sValue=u"[[ repeatIn(" + selectedItem + ",'" + txtName + "') ]]"
+            else:
+                sObjName=self.win.getComboBoxText("cmbVariable")
+                sObjName=sObjName[:sObjName.find("(")]
+                sValue=u"[[ repeatIn(" + sObjName + self.aListRepeatIn[selectedItemPos].replace("/",".") + ",'" + txtName +"') ]]"
+
+            if self.bModify == True:
+                oCurObj = cursor.TextField
+                oCurObj.Items = (sKey,sValue)
+                oCurObj.update()
+            else:
+                oInputList = doc.createInstance("com.sun.star.text.TextField.DropDown")
+                if self.win.getListBoxSelectedItem("lstFields") == "objects":
+                    oInputList.Items = (sKey,sValue)
+                    doc.Text.insertTextContent(cursor,oInputList,False)
+                else:
+                    sValue=u"[[ repeatIn(" + sObjName + self.aListRepeatIn[selectedItemPos].replace("/",".") + ",'" + txtName +"') ]]"
+                    if cursor.TextTable==None:
+                        oInputList.Items = (sKey,sValue)
+                        doc.Text.insertTextContent(cursor,oInputList,False)
+                    else:
+                        oInputList.Items = (sKey,sValue)
+                        widget = ( cursor.TextTable or selectedItem <> 'objects' ) and cursor.TextTable.getCellByName( cursor.Cell.CellName ) or doc.Text
+                        widget.insertTextContent(cursor,oInputList,False)
+                self.win.endExecute()
+        else:
+            ErrorDialog("Please Fill appropriate data in Object Field or Name field \nor select perticular value from the list of fields")
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
+if __name__<>"package" and __name__=="__main__":
+    RepeatIn()
+elif __name__=="package":
+    g_ImplementationHelper = unohelper.ImplementationHelper()
+    g_ImplementationHelper.addImplementation( RepeatIn, "org.openoffice.openerp.report.repeatln", ("com.sun.star.task.Job",),)
diff --git a/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/SendToServer.py b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/SendToServer.py
new file mode 100755
index 00000000000..61a926de218
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/SendToServer.py
@@ -0,0 +1,195 @@
+
+import uno
+import string
+import unohelper
+import random
+import xmlrpclib
+import base64, tempfile
+from com.sun.star.task import XJobExecutor
+import os
+import sys
+if __name__<>'package':
+    from lib.gui import *
+    from lib.error import *
+    from lib.functions import *
+    from lib.logreport import *
+    from lib.tools import *
+    from LoginTest import *
+    from lib.rpc import *
+    database="report"
+    uid = 3
+
+#
+#
+class SendtoServer(unohelper.Base, XJobExecutor):
+    Kind = {
+        'PDF' : 'pdf',
+        'OpenOffice': 'sxw',
+        'HTML' : 'html'
+    }
+
+    def __init__(self,ctx):
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+        LoginTest()
+        self.logobj=Logger()
+        if not loginstatus and __name__=="package":
+            exit(1)
+
+        global passwd
+        self.password = passwd
+        global url
+        self.sock=RPCSession(url)
+        desktop=getDesktop()
+        oDoc2 = desktop.getCurrentComponent()
+        docinfo=oDoc2.getDocumentInfo()
+
+        self.ids = self.sock.execute(database, uid, self.password, 'ir.module.module', 'search', [('name','=','base_report_designer'),('state', '=', 'installed')])
+        if not len(self.ids):
+            ErrorDialog("Please Install base_report_designer module", "", "Module Uninstalled Error")
+            exit(1)
+
+        report_name = ""
+        name=""
+        if docinfo.getUserFieldValue(2)<>"" :
+            try:
+                fields=['name','report_name']
+                self.res_other = self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'read', [int(docinfo.getUserFieldValue(2))],fields)
+                name = self.res_other[0]['name']
+                report_name = self.res_other[0]['report_name']
+            except:
+                import traceback,sys
+                info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+                self.logob.log_write('ServerParameter', LOG_ERROR, info)
+        elif docinfo.getUserFieldValue(3) <> "":
+            name = ""
+            result =  "rnd"
+            for i in range(5):
+                result =result + random.choice('abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890')
+
+            report_name = docinfo.getUserFieldValue(3) + "." + result
+        else:
+            ErrorDialog("Please select appropriate module...","Note: use OpenERP Report -> Open a new Report", "Module selection ERROR");
+            exit(1)
+
+        self.win = DBModalDialog(60, 50, 180, 100, "Send To Server")
+        self.win.addFixedText("lblName",10 , 9, 40, 15, "Report Name :")
+        self.win.addEdit("txtName", -5, 5, 123, 15,name)
+        self.win.addFixedText("lblReportName", 2, 30, 50, 15, "Technical Name :")
+        self.win.addEdit("txtReportName", -5, 25, 123, 15,report_name)
+        self.win.addCheckBox("chkHeader", 51, 45, 70 ,15, "Corporate Header")
+        self.win.addFixedText("lblResourceType", 2 , 60, 50, 15, "Select Rpt. Type :")
+        self.win.addComboListBox("lstResourceType", -5, 58, 123, 15,True,itemListenerProc=self.lstbox_selected)
+        self.lstResourceType = self.win.getControl( "lstResourceType" )
+        self.txtReportName=self.win.getControl( "txtReportName" )
+        self.txtReportName.Enable=False
+        for kind in self.Kind.keys():
+            self.lstResourceType.addItem( kind, self.lstResourceType.getItemCount() )
+
+        self.win.addButton( "btnSend", -5, -5, 80, 15, "Send Report to Server", actionListenerProc = self.btnOk_clicked)
+        self.win.addButton( "btnCancel", -5 - 80 -5, -5, 40, 15, "Cancel", actionListenerProc = self.btnCancel_clicked)
+
+        self.win.doModalDialog("lstResourceType", self.Kind.keys()[0])
+
+    def lstbox_selected(self,oItemEvent):
+        pass
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
+    def btnOk_clicked(self, oActionEvent):
+        if self.win.getEditText("txtName") <> "" and self.win.getEditText("txtReportName") <> "":
+            desktop=getDesktop()
+            oDoc2 = desktop.getCurrentComponent()
+            docinfo=oDoc2.getDocumentInfo()
+            self.getInverseFieldsRecord(1)
+            fp_name = tempfile.mktemp('.'+"sxw")
+            if not oDoc2.hasLocation():
+                oDoc2.storeAsURL("file://"+fp_name,Array(makePropertyValue("MediaType","application/vnd.sun.xml.writer"),))
+
+            if docinfo.getUserFieldValue(2)=="":
+                name=self.win.getEditText("txtName"),
+                name_id={}
+                try:
+                    name_id = self.sock.execute(database, uid, self.password, 'ir.actions.report.xml' , 'search',[('name','=',name)])
+                    if not name_id:
+                        id=self.getID()
+                        docinfo.setUserFieldValue(2,id)
+                        rec = {
+                                'name': self.win.getEditText("txtReportName"),
+                                'key': 'action',
+                                'model': docinfo.getUserFieldValue(3),
+                                'value': 'ir.actions.report.xml,'+str(id),
+                                'key2': 'client_print_multi',
+                                'object': True
+                            }
+                        res = self.sock.execute(database, uid, self.password, 'ir.values' , 'create',rec )
+                    else :
+                        ErrorDialog(" Report Name is all ready given !!!\n\n\n Please specify other Name","","Report Name")
+                        self.logobj.log_write('SendToServer',LOG_WARNING, ':Report name all ready given DB %s' % (database))
+                        self.win.endExecute()
+                except Exception,e:
+                    import traceback,sys
+                    info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+                    self.logobj.log_write('ServerParameter', LOG_ERROR, info)
+            else:
+
+                id = docinfo.getUserFieldValue(2)
+                vId = self.sock.execute(database, uid, self.password, 'ir.values' ,  'search', [('value','=','ir.actions.report.xml,'+str(id))])
+                rec = { 'name': self.win.getEditText("txtReportName") }
+                res = self.sock.execute(database, uid, self.password, 'ir.values' , 'write',vId,rec)
+            oDoc2.store()
+            data = read_data_from_file( get_absolute_file_path( oDoc2.getURL()[7:] ) )
+            self.getInverseFieldsRecord(0)
+            #sock = xmlrpclib.ServerProxy(docinfo.getUserFieldValue(0) +'/xmlrpc/object')
+
+            file_type = oDoc2.getURL()[7:].split(".")[-1]
+            res = self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'upload_report', int(docinfo.getUserFieldValue(2)),base64.encodestring(data),file_type,{})
+            params = {
+                'name': self.win.getEditText("txtName"),
+                'model': docinfo.getUserFieldValue(3),
+                'report_name': self.win.getEditText("txtReportName"),
+                'header': (self.win.getCheckBoxState("chkHeader") <> 0),
+                'report_type': self.Kind[self.win.getListBoxSelectedItem("lstResourceType")],
+            }
+            if self.win.getListBoxSelectedItem("lstResourceType")=='OpenOffice':
+                params['report_type']=file_type
+            res = self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'write', int(docinfo.getUserFieldValue(2)), params)
+            self.logobj.log_write('SendToServer',LOG_INFO, ':Report %s successfully send using %s'%(params['name'],database))
+            self.win.endExecute()
+        else:
+            ErrorDialog("Either Report Name or Technical Name is blank !!!\nPlease specify appropriate Name","","Blank Field ERROR")
+            self.logobj.log_write('SendToServer',LOG_WARNING, ':Either Report Name or Technical Name is blank')
+            self.win.endExecute()
+
+    def getID(self):
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        params = {
+            'name': self.win.getEditText("txtName"),
+            'model': docinfo.getUserFieldValue(3),
+            'report_name': self.win.getEditText('txtReportName')
+        }
+
+
+        id=self.sock.execute(database, uid, self.password, 'ir.actions.report.xml' ,'create', params)
+        return id
+
+    def getInverseFieldsRecord(self,nVal):
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        count=0
+        oParEnum = doc.getTextFields().createEnumeration()
+        while oParEnum.hasMoreElements():
+            oPar = oParEnum.nextElement()
+            if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+                oPar.SelectedItem = oPar.Items[nVal]
+                if nVal==0:
+                    oPar.update()
+
+if __name__<>"package" and __name__=="__main__":
+    SendtoServer(None)
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( SendtoServer, "org.openoffice.openerp.report.sendtoserver", ("com.sun.star.task.Job",),)
diff --git a/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/ServerParameter.py b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/ServerParameter.py
new file mode 100755
index 00000000000..ec871231794
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/ServerParameter.py
@@ -0,0 +1,162 @@
+import uno
+import string
+import unohelper
+import xmlrpclib
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from lib.error import ErrorDialog
+    from lib.functions import *
+    from lib.logreport import *
+    from lib.rpc import *
+    from Change import *
+    database="test"
+
+class ServerParameter( unohelper.Base, XJobExecutor ):
+    def __init__(self,ctx):
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+        desktop=getDesktop()
+        log_detail(self)
+        self.logobj=Logger()
+        doc = desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        self.win=DBModalDialog(60, 50, 160, 108, "Server Connection Parameter")
+
+        self.win.addFixedText("lblVariable", 2, 12, 35, 15, "Server URL")
+        if docinfo.getUserFieldValue(0)=="":
+            docinfo.setUserFieldValue(0,"http://localhost:8069")
+        self.win.addEdit("txtHost",-34,9,91,15,docinfo.getUserFieldValue(0))
+        self.win.addButton('btnChange',-2 ,9,30,15,'Change', actionListenerProc = self.btnChange_clicked )
+
+        self.win.addFixedText("lblDatabaseName", 6, 31, 31, 15, "Database")
+        #self.win.addFixedText("lblMsg", -2,28,123,15)
+#        self.win.addComboListBox("lstDatabase", -2,28,123,15, True)
+#        self.lstDatabase = self.win.getControl( "lstDatabase" )
+        #self.win.selectListBoxItem( "lstDatabase", docinfo.getUserFieldValue(2), True )
+        #self.win.setEnabled("lblMsg",False)
+
+        self.win.addFixedText("lblLoginName", 17, 51, 20, 15, "Login")
+        self.win.addEdit("txtLoginName",-2,48,123,15,docinfo.getUserFieldValue(1))
+
+        self.win.addFixedText("lblPassword", 6, 70, 31, 15, "Password")
+        self.win.addEdit("txtPassword",-2,67,123,15,)
+        self.win.setEchoChar("txtPassword",42)
+
+
+        self.win.addButton('btnOK',-2 ,-5, 60,15,'Connect' ,actionListenerProc = self.btnOk_clicked )
+
+        self.win.addButton('btnCancel',-2 - 60 - 5 ,-5, 35,15,'Cancel' ,actionListenerProc = self.btnCancel_clicked )
+        sValue=""
+        if docinfo.getUserFieldValue(0)<>"":
+            global url
+            global result
+            url=docinfo.getUserFieldValue(0)
+            self.sock=RPCSession(url)
+            res=self.sock.listdb()
+            result=res
+            if res == -1:
+                self.win.addEdit("lstDatabase",-2,28,123,15)
+#                sValue="Could not connect to the server!"
+#                self.lstDatabase.addItem("Could not connect to the server!",0)
+            elif res == 0:
+                sValue="No Database found !!!"
+                self.lstDatabase.addItem("No Database found !!!",0)
+            else:
+                self.win.addComboListBox("lstDatabase", -2,28,123,15, True)
+                self.lstDatabase = self.win.getControl( "lstDatabase" )
+                self.win.removeListBoxItems("lstDatabase", 0, self.win.getListBoxItemCount("lstDatabase"))
+                for i in range(len(res)):
+                    self.lstDatabase.addItem(res[i],i)
+                sValue = database
+        if sValue:
+            self.win.doModalDialog("lstDatabase",sValue)
+        else:
+            self.win.doModalDialog("lstDatabase",None)
+
+        #self.win.doModalDialog("lstDatabase",docinfo.getUserFieldValue(2))
+
+    def btnOk_clicked(self,oActionEvent):
+
+
+        sLogin=self.win.getEditText("txtLoginName")
+        sPassword=self.win.getEditText("txtPassword")
+        global url
+        global result
+        if result==-1:
+            sDatabase=self.win.getEditText("lstDatabase")
+        else:
+            sDatabase=self.win.getListBoxSelectedItem("lstDatabase")
+        self.sock=RPCSession(url)
+        UID = self.sock.login(sDatabase,sLogin,sPassword)
+        if not UID :
+            ErrorDialog("Connection Refuse...","Please enter valid Login/Password")
+            self.win.endExecute()
+        try:
+
+            ids  = self.sock.execute(sDatabase,UID,sPassword, 'res.groups' ,  'search', [('name','=','OpenOfficeReportDesigner')])
+            ids_module =self.sock.execute(sDatabase, UID, sPassword, 'ir.module.module', 'search', [('name','=','base_report_designer'),('state', '=', 'installed')])
+            dict_groups =self.sock.execute(sDatabase, UID,sPassword, 'res.groups' , 'read',ids,['users'])
+        except :
+            import traceback,sys
+            info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+            self.logobj.log_write('ServerParameter', LOG_ERROR, info)
+
+        if not len(ids) :
+            ErrorDialog("Group Not Found!!!  Create a group  named  \n\n"'"OpenOfficeReportDesigner"'"  \n\n  ","","Group Name Error")
+            self.logobj.log_write('Group Error',LOG_WARNING, ':Create a  group OpenOfficeReportDesigner   using database %s' % (sDatabase))
+            self.win.endExecute()
+        if not len(ids_module):
+            ErrorDialog("Please Install base_report_designer module", "", "Module Uninstalled Error")
+            self.logobj.log_write('Module Not Found',LOG_WARNING, ':base_report_designer not install in  database %s' % (sDatabase))
+            self.win.endExecute()
+
+        if UID not in dict_groups[0]['users']:
+            ErrorDialog("Connection Refuse...","You have not access these Report Designer")
+            self.logobj.log_write('Connection Refuse',LOG_WARNING, " Not Access Report Designer ")
+            self.win.endExecute()
+        else:
+            desktop=getDesktop()
+            doc = desktop.getCurrentComponent()
+            docinfo=doc.getDocumentInfo()
+            docinfo.setUserFieldValue(0,self.win.getEditText("txtHost"))
+            docinfo.setUserFieldValue(1,self.win.getEditText("txtLoginName"))
+            global passwd
+            passwd=self.win.getEditText("txtPassword")
+            global loginstatus
+            loginstatus=True
+            global database
+            database=sDatabase
+            global uid
+            uid=UID
+            #docinfo.setUserFieldValue(2,self.win.getListBoxSelectedItem("lstDatabase"))
+            #docinfo.setUserFieldValue(3,"")
+
+            ErrorDialog(" You can start creating your report in \n  \t the current document.","After Creating  sending to the server.","Message")
+            self.logobj.log_write('successful login',LOG_INFO, ':successful login from %s  using database %s' % (sLogin, sDatabase))
+            self.win.endExecute()
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
+    def btnChange_clicked(self,oActionEvent):
+        aVal=[]
+        url= self.win.getEditText("txtHost")
+        Change(aVal,url)
+        if aVal[1]== -1:
+           self.win.getEditText("lstDatabase")
+        elif aVal[1]==0:
+            ErrorDialog(aVal[0],"")
+        else:
+            self.win.setEditText("txtHost",aVal[0])
+            self.win.removeListBoxItems("lstDatabase", 0, self.win.getListBoxItemCount("lstDatabase"))
+            for i in range(len(aVal[1])):
+                self.lstDatabase.addItem(aVal[1][i],i)
+
+
+if __name__<>"package" and __name__=="__main__":
+    ServerParameter(None)
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( ServerParameter, "org.openoffice.openerp.report.serverparam", ("com.sun.star.task.Job",),)
+
diff --git a/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/Translation.py b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/Translation.py
new file mode 100755
index 00000000000..8de7560a04c
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/Translation.py
@@ -0,0 +1,228 @@
+
+import uno
+import string
+import unohelper
+import xmlrpclib
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from lib.functions import *
+    from lib.error import ErrorDialog
+    from LoginTest import *
+    from lib.rpc import *
+    database="test_001"
+    uid = 3
+
+
+class AddLang(unohelper.Base, XJobExecutor ):
+    def __init__(self,sVariable="",sFields="",sDisplayName="",bFromModify=False):
+        LoginTest()
+        if not loginstatus and __name__=="package":
+            exit(1)
+        global passwd
+        self.password = passwd
+        self.win = DBModalDialog(60, 50, 180, 225, "Set Lang Builder")
+
+        self.win.addFixedText("lblVariable", 27, 12, 60, 15, "Variable :")
+        self.win.addComboBox("cmbVariable", 180-120-2, 10, 120, 15,True,
+                            itemListenerProc=self.cmbVariable_selected)
+        self.insVariable = self.win.getControl( "cmbVariable" )
+
+        self.win.addFixedText("lblFields", 10, 32, 60, 15, "Variable Fields :")
+        self.win.addComboListBox("lstFields", 180-120-2, 30, 120, 150, False,itemListenerProc=self.lstbox_selected)
+        self.insField = self.win.getControl( "lstFields" )
+        self.win.addFixedText("lblUName", 8, 187, 60, 15, "Displayed name :")
+        self.win.addEdit("txtUName", 180-120-2, 185, 120, 15,)
+
+        self.win.addButton('btnOK',-5 ,-5, 45, 15, 'Ok', actionListenerProc = self.btnOk_clicked )
+        self.win.addButton('btnCancel',-5 - 45 - 5 ,-5,45,15,'Cancel', actionListenerProc = self.btnCancel_clicked )
+        self.sValue=None
+        self.sObj=None
+        self.aSectionList=[]
+        self.sGDisplayName=sDisplayName
+        self.aItemList=[]
+        self.aComponentAdd=[]
+        self.aObjectList=[]
+        self.aListFields=[]
+        self.aVariableList=[]
+        EnumDocument(self.aItemList,self.aComponentAdd)
+        desktop=getDesktop()
+        doc =desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        self.sMyHost= ""
+        global url
+        self.sock=RPCSession(url)
+
+        if not docinfo.getUserFieldValue(3) == "" and not docinfo.getUserFieldValue(0)=="":
+            self.sMyHost= docinfo.getUserFieldValue(0)
+            self.count=0
+            oParEnum = doc.getTextFields().createEnumeration()
+            while oParEnum.hasMoreElements():
+                oPar = oParEnum.nextElement()
+                if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+                    self.count += 1
+            getList(self.aObjectList, self.sMyHost,self.count)
+            cursor = doc.getCurrentController().getViewCursor()
+            text=cursor.getText()
+            tcur=text.createTextCursorByRange(cursor)
+
+	    self.aVariableList.extend( filter( lambda obj: obj[:obj.find("(")] == "Objects", self.aObjectList ) )
+
+            for i in range(len(self.aItemList)):
+		anItem = self.aItemList[i][1]
+		component = self.aComponentAdd[i]
+
+                if component == "Document":
+		    sLVal = anItem[anItem.find(",'") + 2:anItem.find("')")]
+		    self.aVariableList.extend( filter( lambda obj: obj[:obj.find("(")] == sLVal, self.aObjectList ) )
+
+                if tcur.TextSection:
+                    getRecersiveSection(tcur.TextSection,self.aSectionList)
+                    if component in self.aSectionList:
+			sLVal = anItem[anItem.find(",'") + 2:anItem.find("')")]
+			self.aVariableList.extend( filter( lambda obj: obj[:obj.find("(")] == sLVal, self.aObjectList ) )
+
+                if tcur.TextTable:
+		    if not component == "Document" and component[component.rfind(".") + 1:] == tcur.TextTable.Name:
+                        VariableScope(tcur,self.insVariable,self.aObjectList,self.aComponentAdd,self.aItemList,component)
+
+            self.bModify=bFromModify
+            if self.bModify==True:
+                sItem=""
+		for anObject in self.aObjectList:
+		    if anObject[:anObject.find("(")] == sVariable:
+			sItem = anObject
+			self.insVariable.setText( sItem )
+		genTree(sItem[sItem.find("(")+1:sItem.find(")")],self.aListFields, self.insField,self.sMyHost,2,ending_excl=['one2many','many2one','many2many','reference'], recur=['many2one'])
+                self.sValue= self.win.getListBoxItem("lstFields",self.aListFields.index(sFields))
+
+            for var in self.aVariableList:
+
+		    self.model_ids = self.sock.execute(database, uid, self.password, 'ir.model' ,  'search', [('model','=',var[var.find("(")+1:var.find(")")])])
+                    fields=['name','model']
+                    self.model_res = self.sock.execute(database, uid, self.password, 'ir.model', 'read', self.model_ids,fields)
+                    if self.model_res <> []:
+			self.insVariable.addItem(var[:var.find("(")+1] + self.model_res[0]['name'] + ")" ,self.insVariable.getItemCount())
+                    else:
+                        self.insVariable.addItem(var ,self.insVariable.getItemCount())
+
+            self.win.doModalDialog("lstFields",self.sValue)
+        else:
+            ErrorDialog("Please insert user define field Field-1 or Field-4","Just go to File->Properties->User Define \nField-1 Eg. http://localhost:8069 \nOR \nField-4 Eg. account.invoice")
+            self.win.endExecute()
+
+    def lstbox_selected(self,oItemEvent):
+        try:
+
+            desktop=getDesktop()
+            doc =desktop.getCurrentComponent()
+            docinfo=doc.getDocumentInfo()
+            sItem= self.win.getComboBoxText("cmbVariable")
+            for var in self.aVariableList:
+		if var[:var.find("(")+1]==sItem[:sItem.find("(")+1]:
+                    sItem = var
+            sMain=self.aListFields[self.win.getListBoxSelectedItemPos("lstFields")]
+            t=sMain.rfind('/lang')
+            if t!=-1:
+		sObject=self.getRes(self.sock,sItem[sItem.find("(")+1:-1],sMain[1:])
+                ids = self.sock.execute(database, uid, self.password, sObject ,  'search', [])
+                res = self.sock.execute(database, uid, self.password, sObject , 'read',[ids[0]])
+		self.win.setEditText("txtUName",res[0][sMain[sMain.rfind("/")+1:]])
+            else:
+                 ErrorDialog("Please select the Language Field")
+
+        except:
+            import traceback;traceback.print_exc()
+            self.win.setEditText("txtUName","TTT")
+        if self.bModify:
+            self.win.setEditText("txtUName",self.sGDisplayName)
+
+    def getRes(self,sock ,sObject,sVar):
+        desktop=getDesktop()
+        doc =desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        res = sock.execute(database, uid, self.password, sObject , 'fields_get')
+        key = res.keys()
+        key.sort()
+        myval=None
+        if not sVar.find("/")==-1:
+	    myval=sVar[:sVar.find("/")]
+        else:
+            myval=sVar
+        if myval in key:
+            if (res[myval]['type'] in ['many2one']):
+                sObject = res[myval]['relation']
+		return self.getRes(sock,res[myval]['relation'], sVar[sVar.find("/")+1:])
+            else:
+                return sObject
+
+
+    def cmbVariable_selected(self,oItemEvent):
+        if self.count > 0 :
+            try:
+                desktop=getDesktop()
+                doc =desktop.getCurrentComponent()
+                docinfo=doc.getDocumentInfo()
+                self.win.removeListBoxItems("lstFields", 0, self.win.getListBoxItemCount("lstFields"))
+                self.aListFields=[]
+                tempItem = self.win.getComboBoxText("cmbVariable")
+                for var in self.aVariableList:
+		    if var[:var.find("(")] == tempItem[:tempItem.find("(")]:
+                        sItem=var
+
+		genTree(
+		    sItem[ sItem.find("(") + 1:sItem.find(")")],
+		    self.aListFields,
+		    self.insField,
+		    self.sMyHost,
+		    2,
+		    ending_excl=['one2many','many2one','many2many','reference'],
+		    recur=['many2one']
+		)
+
+            except:
+                import traceback;traceback.print_exc()
+
+    def btnOk_clicked( self, oActionEvent ):
+        self.bOkay = True
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        cursor = doc.getCurrentController().getViewCursor()
+
+        itemSelected = self.win.getListBoxSelectedItem( "lstFields" )
+        itemSelectedPos = self.win.getListBoxSelectedItemPos( "lstFields" )
+        txtUName = self.win.getEditText("txtUName")
+        sKey=u""+ txtUName
+
+        if itemSelected != "" and txtUName != "" and self.bModify==True :
+            oCurObj=cursor.TextField
+            sObjName=self.insVariable.getText()
+            sObjName=sObjName[:sObjName.find("(")]
+            sValue=u"[[ setLang" + sObjName + self.aListFields[itemSelectedPos].replace("/",".") + ")" " ]]"
+            oCurObj.Items = (sKey,sValue)
+            oCurObj.update()
+            self.win.endExecute()
+        elif itemSelected != "" and txtUName != "" :
+            oInputList = doc.createInstance("com.sun.star.text.TextField.DropDown")
+            sObjName=self.win.getComboBoxText("cmbVariable")
+            sObjName=sObjName[:sObjName.find("(")]
+
+            widget = ( cursor.TextTable and cursor.TextTable.getCellByName( cursor.Cell.CellName ) or doc.Text )
+
+            sValue = u"[[setLang" + "(" + sObjName + self.aListFields[itemSelectedPos].replace("/",".") +")" " ]]"
+            oInputList.Items = (sKey,sValue)
+            widget.insertTextContent(cursor,oInputList,False)
+
+            self.win.endExecute()
+        else:
+            ErrorDialog("Please Fill appropriate data in Name field \nor select perticular value from the list of fields")
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
+
+if __name__<>"package" and __name__=="__main__":
+    AddLang()
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( AddLang, "org.openoffice.openerp.report.langtag", ("com.sun.star.task.Job",),)
+
diff --git a/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/__init__.py b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/__init__.py
new file mode 100755
index 00000000000..d519fb1d00b
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/__init__.py
@@ -0,0 +1,15 @@
+import Expression
+import lib
+import Fields
+import modify
+import Repeatln
+import ServerParameter
+import NewReport
+import LoginTest
+import Change
+import About
+import AddAttachment
+import ConvertBracesToField
+import ConvertFieldsToBraces
+import ExportToRML
+import SendtoServer
\ No newline at end of file
diff --git a/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/compile_all.py b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/compile_all.py
new file mode 100755
index 00000000000..42c53e72940
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/compile_all.py
@@ -0,0 +1,3 @@
+import compileall
+
+compileall.compile_dir('package')
\ No newline at end of file
diff --git a/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/import b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/import
new file mode 100755
index 00000000000..e14c925b619
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/import
@@ -0,0 +1,2 @@
+__name__="package"
+
diff --git a/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/lib/__init__.py b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/lib/__init__.py
new file mode 100755
index 00000000000..c135ea31616
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/lib/__init__.py
@@ -0,0 +1,7 @@
+import actions
+import error
+import functions
+import gui
+import logreport
+import rpc
+import tiny_socket
\ No newline at end of file
diff --git a/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/lib/actions.py b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/lib/actions.py
new file mode 100755
index 00000000000..4f553346c45
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/lib/actions.py
@@ -0,0 +1,64 @@
+import uno
+import unohelper
+import os
+#--------------------------------------------------
+# An ActionListener adapter.
+# This object implements com.sun.star.awt.XActionListener.
+# When actionPerformed is called, this will call an arbitrary
+#  python procedure, passing it...
+#   1. the oActionEvent
+#   2. any other parameters you specified to this object's constructor (as a tuple).
+if __name__<>"package":
+    os.system( "ooffice '-accept=socket,host=localhost,port=2002;urp;'" )
+passwd=""
+database=""
+uid=""
+loginstatus=False
+from com.sun.star.awt import XActionListener
+class ActionListenerProcAdapter( unohelper.Base, XActionListener ):
+    def __init__( self, oProcToCall, tParams=() ):
+        self.oProcToCall = oProcToCall # a python procedure
+        self.tParams = tParams # a tuple
+
+    # oActionEvent is a com.sun.star.awt.ActionEvent struct.
+    def actionPerformed( self, oActionEvent ):
+        if callable( self.oProcToCall ):
+            apply( self.oProcToCall, (oActionEvent,) + self.tParams )
+
+#--------------------------------------------------
+# An ItemListener adapter.
+# This object implements com.sun.star.awt.XItemListener.
+# When itemStateChanged is called, this will call an arbitrary
+#  python procedure, passing it...
+#   1. the oItemEvent
+#   2. any other parameters you specified to this object's constructor (as a tuple).
+from com.sun.star.awt import XItemListener
+class ItemListenerProcAdapter( unohelper.Base, XItemListener ):
+    def __init__( self, oProcToCall, tParams=() ):
+        self.oProcToCall = oProcToCall # a python procedure
+        self.tParams = tParams # a tuple
+
+    # oItemEvent is a com.sun.star.awt.ItemEvent struct.
+    def itemStateChanged( self, oItemEvent ):
+        if callable( self.oProcToCall ):
+            apply( self.oProcToCall, (oItemEvent,) + self.tParams )
+
+#--------------------------------------------------
+# An TextListener adapter.
+# This object implements com.sun.star.awt.XTextistener.
+# When textChanged is called, this will call an arbitrary
+#  python procedure, passing it...
+#   1. the oTextEvent
+#   2. any other parameters you specified to this object's constructor (as a tuple).
+from com.sun.star.awt import XTextListener
+class TextListenerProcAdapter( unohelper.Base, XTextListener ):
+    def __init__( self, oProcToCall, tParams=() ):
+        self.oProcToCall = oProcToCall # a python procedure
+        self.tParams = tParams # a tuple
+
+    # oTextEvent is a com.sun.star.awt.TextEvent struct.
+    def textChanged( self, oTextEvent ):
+        if callable( self.oProcToCall ):
+            apply( self.oProcToCall, (oTextEvent,) + self.tParams )
+
+
diff --git a/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/lib/error.py b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/lib/error.py
new file mode 100755
index 00000000000..2dd692723f9
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/lib/error.py
@@ -0,0 +1,13 @@
+if __name__<>"package":
+    from gui import *
+class ErrorDialog:
+    def __init__(self,sErrorMsg, sErrorHelpMsg="",sTitle="Error Message"):
+        self.win = DBModalDialog(50, 50, 150, 90, sTitle)
+        self.win.addFixedText("lblErrMsg", 5, 5, 190, 25, sErrorMsg)
+        self.win.addFixedText("lblErrHelpMsg", 5, 30, 190, 25, sErrorHelpMsg)
+        self.win.addButton('btnOK', 55,-5,40,15,'Ok'
+                     ,actionListenerProc = self.btnOkOrCancel_clicked )
+        self.win.doModalDialog("",None)
+    def btnOkOrCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
diff --git a/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/lib/functions.py b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/lib/functions.py
new file mode 100755
index 00000000000..cd1db284867
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/lib/functions.py
@@ -0,0 +1,217 @@
+import uno
+import xmlrpclib
+import re
+import socket
+import cPickle
+import marshal
+import tempfile
+if __name__<>"package":
+    from gui import *
+    from logreport import *
+    from rpc import *
+    database="test"
+    uid = 1
+
+def genTree(object,aList,insField,host,level=3, ending=[], ending_excl=[], recur=[], root='', actualroot=""):
+    try:
+        global url
+        sock=RPCSession(url)
+        global passwd
+        res = sock.execute(database, uid, passwd, object , 'fields_get')
+        key = res.keys()
+        key.sort()
+        for k in key:
+            if (not ending or res[k]['type'] in ending) and ((not ending_excl) or not (res[k]['type'] in ending_excl)):
+                insField.addItem(root+'/'+res[k]["string"],len(aList))
+                aList.append(actualroot+'/'+k)
+            if (res[k]['type'] in recur) and (level>0):
+                genTree(res[k]['relation'],aList,insField,host ,level-1, ending, ending_excl, recur,root+'/'+res[k]["string"],actualroot+'/'+k)
+    except:
+        obj=Logger()
+        import traceback,sys
+        info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+        obj.log_write('Function', LOG_ERROR, info)
+
+def VariableScope(oTcur,insVariable,aObjectList,aComponentAdd,aItemList,sTableName=""):
+    if sTableName.find(".") != -1:
+	for i in range(len(aItemList)):
+            if aComponentAdd[i]==sTableName:
+		sLVal=aItemList[i][1][aItemList[i][1].find(",'")+2:aItemList[i][1].find("')")]
+                for j in range(len(aObjectList)):
+		    if aObjectList[j][:aObjectList[j].find("(")] == sLVal:
+                        insVariable.append(aObjectList[j])
+	VariableScope(oTcur,insVariable,aObjectList,aComponentAdd,aItemList, sTableName[:sTableName.rfind(".")])
+    else:
+	for i in range(len(aItemList)):
+            if aComponentAdd[i]==sTableName:
+		sLVal=aItemList[i][1][aItemList[i][1].find(",'")+2:aItemList[i][1].find("')")]
+                for j in range(len(aObjectList)):
+		    if aObjectList[j][:aObjectList[j].find("(")] == sLVal and sLVal!="":
+                        insVariable.append(aObjectList[j])
+
+def getList(aObjectList,host,count):
+    desktop=getDesktop()
+    doc =desktop.getCurrentComponent()
+    docinfo=doc.getDocumentInfo()
+    sMain=""
+    if not count == 0:
+        if count >= 1:
+            oParEnum = doc.getTextFields().createEnumeration()
+            while oParEnum.hasMoreElements():
+                oPar = oParEnum.nextElement()
+                if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+                    sItem=oPar.Items[1]
+                    if sItem[sItem.find("(")+1:sItem.find(",")]=="objects":
+                        sMain = sItem[sItem.find(",'")+2:sItem.find("')")]
+                        oParEnum = doc.getTextFields().createEnumeration()
+                        while oParEnum.hasMoreElements():
+                            oPar = oParEnum.nextElement()
+                            if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+                                sItem=oPar.Items[1]
+                                if sItem[sItem.find("[[ ")+3:sItem.find("(")]=="repeatIn":
+                                    if sItem[sItem.find("(")+1:sItem.find(",")]=="objects":
+                                        aObjectList.append(sItem[sItem.rfind(",'")+2:sItem.rfind("')")] + "(" + docinfo.getUserFieldValue(3) + ")")
+                                    else:
+                                        sTemp=sItem[sItem.find("(")+1:sItem.find(",")]
+                                        if sMain == sTemp[:sTemp.find(".")]:
+                                            getRelation(docinfo.getUserFieldValue(3), sItem[sItem.find(".")+1:sItem.find(",")], sItem[sItem.find(",'")+2:sItem.find("')")],aObjectList,host)
+                                        else:
+                                            sPath=getPath(sItem[sItem.find("(")+1:sItem.find(",")], sMain)
+                                            getRelation(docinfo.getUserFieldValue(3), sPath, sItem[sItem.find(",'")+2:sItem.find("')")],aObjectList,host)
+    else:
+        aObjectList.append("List of " + docinfo.getUserFieldValue(3))
+
+def getRelation(sRelName, sItem, sObjName, aObjectList, host ):
+        global url
+        sock=RPCSession(url)
+        global passwd
+        res = sock.execute(database, uid, passwd, sRelName , 'fields_get')
+        key = res.keys()
+        for k in key:
+            if sItem.find(".") == -1:
+                if k == sItem:
+                    aObjectList.append(sObjName + "(" + res[k]['relation'] + ")")
+                    return 0
+	    if k == sItem[:sItem.find(".")]:
+		getRelation(res[k]['relation'], sItem[sItem.find(".")+1:], sObjName,aObjectList,host)
+
+
+def getPath(sPath,sMain):
+    desktop=getDesktop()
+    doc =desktop.getCurrentComponent()
+    oParEnum = doc.getTextFields().createEnumeration()
+    while oParEnum.hasMoreElements():
+        oPar = oParEnum.nextElement()
+        if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+            sItem=oPar.Items[1]
+	    if sPath[:sPath.find(".")] == sMain:
+                break;
+            else:
+                res = re.findall('\\[\\[ *([a-zA-Z0-9_\.]+) *\\]\\]',sPath)
+                if len(res) <> 0:
+		    if sItem[sItem.find(",'")+2:sItem.find("')")] == sPath[:sPath.find(".")]:
+			sPath =  sItem[sItem.find("(")+1:sItem.find(",")] + sPath[sPath.find("."):]
+                        getPath(sPath, sMain)
+    return sPath
+
+def EnumDocument(aItemList,aComponentAdd):
+    desktop = getDesktop()
+    parent=""
+    bFlag = False
+    Doc =desktop.getCurrentComponent()
+    #oVC = Doc.CurrentController.getViewCursor()
+    oParEnum = Doc.getTextFields().createEnumeration()
+    while oParEnum.hasMoreElements():
+        oPar = oParEnum.nextElement()
+        if oPar.Anchor.TextTable:
+            #parent = oPar.Anchor.TextTable.Name
+            getChildTable(oPar.Anchor.TextTable,aItemList,aComponentAdd)
+        elif oPar.Anchor.TextSection:
+            parent = oPar.Anchor.TextSection.Name
+        elif oPar.Anchor.Text:
+            parent = "Document"
+        sItem=oPar.Items[1].replace(' ',"")
+        if sItem[sItem.find("[[ ")+3:sItem.find("(")]=="repeatIn" and not oPar.Items in aItemList:
+            templist=oPar.Items[0],sItem
+            aItemList.append( templist )
+        aComponentAdd.append( parent )
+
+def getChildTable(oPar,aItemList,aComponentAdd,sTableName=""):
+    sNames = oPar.getCellNames()
+    bEmptyTableFlag=True
+    for val in sNames:
+        oCell = oPar.getCellByName(val)
+        oCurEnum = oCell.createEnumeration()
+        while oCurEnum.hasMoreElements():
+            try:
+                oCur = oCurEnum.nextElement()
+
+                if oCur.supportsService("com.sun.star.text.TextTable"):
+                    if sTableName=="":
+                        getChildTable(oCur,aItemList,aComponentAdd,oPar.Name)
+                    else:
+                        getChildTable(oCur,aItemList,aComponentAdd,sTableName+"."+oPar.Name)
+                else:
+                    oSecEnum = oCur.createEnumeration()
+                    while oSecEnum.hasMoreElements():
+                        oSubSection = oSecEnum.nextElement()
+                        if oSubSection.supportsService("com.sun.star.text.TextField"):
+                            bEmptyTableFlag=False
+                            sItem=oSubSection.TextField.Items[1]
+                            if sItem[sItem.find("[[ ")+3:sItem.find("(")]=="repeatIn":
+                                if aItemList.__contains__(oSubSection.TextField.Items)==False:
+                                    aItemList.append(oSubSection.TextField.Items)
+                                if sTableName=="":
+                                    if  aComponentAdd.__contains__(oPar.Name)==False:
+                                        aComponentAdd.append(oPar.Name)
+                                else:
+                                    if aComponentAdd.__contains__(sTableName+"."+oPar.Name)==False:
+                                        aComponentAdd.append(sTableName+"."+oPar.Name)
+            except:
+                obj=Logger()
+                import traceback,sys
+                info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+                obj.log_write('Function', LOG_ERROR, info)
+    if bEmptyTableFlag==True:
+        aItemList.append((u'',u''))
+        if sTableName=="":
+            if  aComponentAdd.__contains__(oPar.Name)==False:
+                aComponentAdd.append(oPar.Name)
+        else:
+            if aComponentAdd.__contains__(sTableName+"."+oPar.Name)==False:
+                aComponentAdd.append(sTableName+"."+oPar.Name)
+    return 0
+
+def getRecersiveSection(oCurrentSection,aSectionList):
+        desktop=getDesktop()
+        doc =desktop.getCurrentComponent()
+        oParEnum=doc.getText().createEnumeration()
+        aSectionList.append(oCurrentSection.Name)
+        if oCurrentSection.ParentSection:
+            getRecersiveSection(oCurrentSection.ParentSection,aSectionList)
+        else:
+            return
+
+def GetAFileName():
+    oFileDialog=None
+    iAccept=None
+    sPath=""
+    InitPath=""
+    oUcb=None
+    oFileDialog = createUnoService("com.sun.star.ui.dialogs.FilePicker")
+    oUcb = createUnoService("com.sun.star.ucb.SimpleFileAccess")
+    oFileDialog.appendFilter("OpenERP Report File","*.sxw")
+    oFileDialog.setCurrentFilter("OpenERP Report File")
+    if InitPath == "":
+        InitPath =tempfile.gettempdir()
+    #End If
+    if oUcb.exists(InitPath):
+        oFileDialog.setDisplayDirectory(InitPath)
+    #End If
+    iAccept = oFileDialog.execute()
+    if iAccept == 1:
+        sPath = oFileDialog.Files[0]
+    oFileDialog.dispose()
+    return sPath
+
+
diff --git a/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/lib/gui.py b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/lib/gui.py
new file mode 100755
index 00000000000..1583d45437b
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/lib/gui.py
@@ -0,0 +1,775 @@
+import uno
+import unohelper
+import pythonloader
+if __name__<>"package":
+    from actions import *
+
+
+#------------------------------------------------------------
+#   Uno ServiceManager access
+#   A different version of this routine and global variable
+#    is needed for code running inside a component.
+#------------------------------------------------------------
+
+
+# The ServiceManager of the running OOo.
+# It is cached in a global variable.
+goServiceManager = False
+pythonloader.DEBUG = 0
+def getServiceManager( cHost="localhost", cPort="2002" ):
+    """Get the ServiceManager from the running OpenOffice.org.
+        Then retain it in the global variable goServiceManager for future use.
+        This is similar to the GetProcessServiceManager() in OOo Basic.
+    """
+    global goServiceManager
+    global pythonloader
+    if not goServiceManager:
+        # Get the uno component context from the PyUNO runtime
+        oLocalContext = uno.getComponentContext()
+        # Create the UnoUrlResolver on the Python side.
+
+        # Connect to the running OpenOffice.org and get its context.
+        if __name__<>"package":
+            oLocalResolver = oLocalContext.ServiceManager.createInstanceWithContext(
+                                    "com.sun.star.bridge.UnoUrlResolver", oLocalContext )
+            oContext = oLocalResolver.resolve( "uno:socket,host=" + cHost + ",port=" + cPort + ";urp;StarOffice.ComponentContext" )
+        # Get the ServiceManager object
+            goServiceManager = oContext.ServiceManager
+        else:
+            goServiceManager=oLocalContext.ServiceManager
+
+    return goServiceManager
+
+
+#------------------------------------------------------------
+#   Uno convenience functions
+#   The stuff in this section is just to make
+#    python progrmaming of OOo more like using OOo Basic.
+#------------------------------------------------------------
+
+
+# This is the same as ServiceManager.createInstance( ... )
+def createUnoService( cClass ):
+    """A handy way to create a global objects within the running OOo.
+    Similar to the function of the same name in OOo Basic.
+    """
+    oServiceManager = getServiceManager()
+    oObj = oServiceManager.createInstance( cClass )
+    return oObj
+
+
+# The StarDesktop object.  (global like in OOo Basic)
+# It is cached in a global variable.
+StarDesktop = None
+def getDesktop():
+    """An easy way to obtain the Desktop object from a running OOo.
+    """
+    global StarDesktop
+    if StarDesktop == None:
+        StarDesktop = createUnoService( "com.sun.star.frame.Desktop" )
+    return StarDesktop
+# preload the StarDesktop variable.
+#getDesktop()
+
+
+# The CoreReflection object.
+# It is cached in a global variable.
+goCoreReflection = False
+def getCoreReflection():
+    global goCoreReflection
+    if not goCoreReflection:
+        goCoreReflection = createUnoService( "com.sun.star.reflection.CoreReflection" )
+    return goCoreReflection
+
+
+def createUnoStruct( cTypeName ):
+    """Create a UNO struct and return it.
+    Similar to the function of the same name in OOo Basic.
+    """
+    oCoreReflection = getCoreReflection()
+    # Get the IDL class for the type name
+    oXIdlClass = oCoreReflection.forName( cTypeName )
+    # Create the struct.
+    oReturnValue, oStruct = oXIdlClass.createObject( None )
+    return oStruct
+
+#------------------------------------------------------------
+#   API helpers
+#------------------------------------------------------------
+
+def hasUnoInterface( oObject, cInterfaceName ):
+    """Similar to Basic's HasUnoInterfaces() function, but singular not plural."""
+
+    # Get the Introspection service.
+    oIntrospection = createUnoService( "com.sun.star.beans.Introspection" )
+
+    # Now inspect the object to learn about it.
+    oObjInfo = oIntrospection.inspect( oObject )
+
+    # Obtain an array describing all methods of the object.
+    oMethods = oObjInfo.getMethods( uno.getConstantByName( "com.sun.star.beans.MethodConcept.ALL" ) )
+    # Now look at every method.
+    for oMethod in oMethods:
+        # Check the method's interface to see if
+        #  these aren't the droids you're looking for.
+        cMethodInterfaceName = oMethod.getDeclaringClass().getName()
+        if cMethodInterfaceName == cInterfaceName:
+            return True
+    return False
+
+def hasUnoInterfaces( oObject, *cInterfaces ):
+    """Similar to the function of the same name in OOo Basic."""
+    for cInterface in cInterfaces:
+        if not hasUnoInterface( oObject, cInterface ):
+            return False
+    return True
+
+#------------------------------------------------------------
+#   High level general purpose functions
+#------------------------------------------------------------
+
+
+def makePropertyValue( cName=None, uValue=None, nHandle=None, nState=None ):
+    """Create a com.sun.star.beans.PropertyValue struct and return it.
+    """
+    oPropertyValue = createUnoStruct( "com.sun.star.beans.PropertyValue" )
+
+    if cName != None:
+        oPropertyValue.Name = cName
+    if uValue != None:
+        oPropertyValue.Value = uValue
+    if nHandle != None:
+        oPropertyValue.Handle = nHandle
+    if nState != None:
+        oPropertyValue.State = nState
+
+    return oPropertyValue
+
+
+def makePoint( nX, nY ):
+    """Create a com.sun.star.awt.Point struct."""
+    oPoint = createUnoStruct( "com.sun.star.awt.Point" )
+    oPoint.X = nX
+    oPoint.Y = nY
+    return oPoint
+
+
+def makeSize( nWidth, nHeight ):
+    """Create a com.sun.star.awt.Size struct."""
+    oSize = createUnoStruct( "com.sun.star.awt.Size" )
+    oSize.Width = nWidth
+    oSize.Height = nHeight
+    return oSize
+
+
+def makeRectangle( nX, nY, nWidth, nHeight ):
+    """Create a com.sun.star.awt.Rectangle struct."""
+    oRect = createUnoStruct( "com.sun.star.awt.Rectangle" )
+    oRect.X = nX
+    oRect.Y = nY
+    oRect.Width = nWidth
+    oRect.Height = nHeight
+    return oRect
+
+
+def Array( *args ):
+    """This is just sugar coating so that code from OOoBasic which
+    contains the Array() function can work perfectly in python."""
+    tArray = ()
+    for arg in args:
+        tArray += (arg,)
+    return tArray
+
+
+def loadComponentFromURL( cUrl, tProperties=() ):
+    """Open or Create a document from it's URL.
+    New documents are created from URL's such as:
+        private:factory/sdraw
+        private:factory/swriter
+        private:factory/scalc
+        private:factory/simpress
+    """
+    StarDesktop = getDesktop()
+    oDocument = StarDesktop.loadComponentFromURL( cUrl, "_blank", 0, tProperties )
+    return oDocument
+
+
+#------------------------------------------------------------
+#   Styles
+#------------------------------------------------------------
+
+
+def defineStyle( oDrawDoc, cStyleFamily, cStyleName, cParentStyleName=None ):
+    """Add a new style to the style catalog if it is not already present.
+    This returns the style object so that you can alter its properties.
+    """
+
+    oStyleFamily = oDrawDoc.getStyleFamilies().getByName( cStyleFamily )
+
+    # Does the style already exist?
+    if oStyleFamily.hasByName( cStyleName ):
+        # then get it so we can return it.
+        oStyle = oStyleFamily.getByName( cStyleName )
+    else:
+        # Create new style object.
+        oStyle = oDrawDoc.createInstance( "com.sun.star.style.Style" )
+
+        # Set its parent style
+        if cParentStyleName != None:
+            oStyle.setParentStyle( cParentStyleName )
+
+        # Add the new style to the style family.
+        oStyleFamily.insertByName( cStyleName, oStyle )
+
+    return oStyle
+
+
+def getStyle( oDrawDoc, cStyleFamily, cStyleName ):
+    """Lookup and return a style from the document.
+    """
+    return oDrawDoc.getStyleFamilies().getByName( cStyleFamily ).getByName( cStyleName )
+
+#------------------------------------------------------------
+#   General Utility functions
+#------------------------------------------------------------
+
+
+def convertToURL( cPathname ):
+    """Convert a Windows or Linux pathname into an OOo URL."""
+    if len( cPathname ) > 1:
+        if cPathname[1:2] == ":":
+            cPathname = "/" + cPathname[0] + "|" + cPathname[2:]
+    cPathname = cPathname.replace( "\\", "/" )
+    cPathname = "file://" + cPathname
+    return cPathname
+
+# The global Awt Toolkit.
+# This is initialized the first time it is needed.
+#goAwtToolkit = createUnoService( "com.sun.star.awt.Toolkit" )
+goAwtToolkit = None
+
+def getAwtToolkit():
+    global goAwtToolkit
+    if goAwtToolkit == None:
+        goAwtToolkit = createUnoService( "com.sun.star.awt.Toolkit" )
+    return goAwtToolkit
+
+# This class builds dialog boxes.
+# This can be used in two different ways...
+# 1. by subclassing it (elegant)
+# 2. without subclassing it (less elegant)
+class DBModalDialog:
+    """Class to build a dialog box from the com.sun.star.awt.* services.
+    This doesn't do anything you couldn't already do using OOo's UNO API,
+     this just makes it much easier.
+    You can change the dialog box size, position, title, etc.
+    You can add controls, and listeners for those controls to the dialog box.
+    This class can be used by subclassing it, or without subclassing it.
+    """
+    def __init__( self, nPositionX=None, nPositionY=None, nWidth=None, nHeight=None, cTitle=None ):
+        self.oDialogModel = createUnoService( "com.sun.star.awt.UnoControlDialogModel" )
+        if nPositionX != None:  self.oDialogModel.PositionX = nPositionX
+        if nPositionY != None:  self.oDialogModel.PositionY = nPositionY
+        if nWidth     != None:  self.oDialogModel.Width     = nWidth
+        if nHeight    != None:  self.oDialogModel.Height    = nHeight
+        if cTitle     != None:  self.oDialogModel.Title     = cTitle
+        self.oDialogControl = createUnoService( "com.sun.star.awt.UnoControlDialog" )
+        self.oDialogControl.setModel( self.oDialogModel )
+
+    def release( self ):
+        """Release resources.
+        After calling this, you can no longer use this object.
+        """
+        self.oDialogControl.dispose()
+
+    #--------------------------------------------------
+    #   Dialog box adjustments
+    #--------------------------------------------------
+
+    def setDialogPosition( self, nX, nY ):
+        self.oDialogModel.PositionX = nX
+        self.oDialogModel.PositionY = nY
+
+    def setDialogSize( self, nWidth, nHeight ):
+        self.oDialogModel.Width = nWidth
+        self.oDialogModel.Height = nHeight
+
+    def setDialogTitle( self, cCaption ):
+        self.oDialogModel.Title = cCaption
+
+    def setVisible( self, bVisible ):
+        self.oDialogControl.setVisible( bVisible )
+
+
+    #--------------------------------------------------
+    #   com.sun.star.awt.UnoControlButton
+    #--------------------------------------------------
+
+    # After you add a Button control, you can call self.setControlModelProperty()
+    #  passing any of the properties for a...
+    #       com.sun.star.awt.UnoControlButtonModel
+    #       com.sun.star.awt.UnoControlDialogElement
+    #       com.sun.star.awt.UnoControlModel
+    def addButton( self, cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                       cLabel=None,
+                       actionListenerProc=None,
+                       nTabIndex=None ):
+        self.addControl( "com.sun.star.awt.UnoControlButtonModel",
+                         cCtrlName, nPositionX, nPositionY, nWidth, nHeight, bDropdown=None, bMultiSelection=None,
+                         cLabel=cLabel,
+                         nTabIndex=nTabIndex )
+        if actionListenerProc != None:
+            self.addActionListenerProc( cCtrlName, actionListenerProc )
+
+    def setButtonLabel( self, cCtrlName, cLabel ):
+        """Set the label of the control."""
+        oControl = self.getControl( cCtrlName )
+        oControl.setLabel( cLabel )
+
+    #--------------------------------------------------
+    #   com.sun.star.awt.UnoControlEditModel
+    #--------------------------------------------------
+    def addEdit( self, cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                        cText=None,
+                        textListenerProc=None ):
+        """Add a Edit control to the window."""
+        self.addControl( "com.sun.star.awt.UnoControlEditModel",
+            cCtrlName, nPositionX, nPositionY, nWidth, nHeight, bDropdown=None)
+
+        if cText != None:
+            self.setEditText( cCtrlName, cText )
+        if textListenerProc != None:
+            self.addTextListenerProc( cCtrlName, textListenerProc )
+
+    #--------------------------------------------------
+    #   com.sun.star.awt.UnoControlCheckBox
+    #--------------------------------------------------
+
+    # After you add a CheckBox control, you can call self.setControlModelProperty()
+    #  passing any of the properties for a...
+    #       com.sun.star.awt.UnoControlCheckBoxModel
+    #       com.sun.star.awt.UnoControlDialogElement
+    #       com.sun.star.awt.UnoControlModel
+    def addCheckBox( self, cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                       cLabel=None,
+                       itemListenerProc=None,
+                       nTabIndex=None ):
+        self.addControl( "com.sun.star.awt.UnoControlCheckBoxModel",
+                         cCtrlName, nPositionX, nPositionY, nWidth, nHeight, bDropdown=None,  bMultiSelection=None,
+                         cLabel=cLabel,
+                         nTabIndex=nTabIndex )
+        if itemListenerProc != None:
+            self.addItemListenerProc( cCtrlName, itemListenerProc )
+
+    def setEditText( self, cCtrlName, cText ):
+        """Set the text of the edit box."""
+        oControl = self.getControl( cCtrlName )
+        oControl.setText( cText )
+
+    def getEditText( self, cCtrlName):
+        """Set the text of the edit box."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.getText()
+
+    def setCheckBoxLabel( self, cCtrlName, cLabel ):
+        """Set the label of the control."""
+        oControl = self.getControl( cCtrlName )
+        oControl.setLabel( cLabel )
+
+    def getCheckBoxState( self, cCtrlName ):
+        """Get the state of the control."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.getState();
+
+    def setCheckBoxState( self, cCtrlName, nState ):
+        """Set the state of the control."""
+        oControl = self.getControl( cCtrlName )
+        oControl.setState( nState )
+
+    def enableCheckBoxTriState( self, cCtrlName, bTriStateEnable ):
+        """Enable or disable the tri state mode of the control."""
+        oControl = self.getControl( cCtrlName )
+        oControl.enableTriState( bTriStateEnable )
+
+
+    #--------------------------------------------------
+    #   com.sun.star.awt.UnoControlFixedText
+    #--------------------------------------------------
+
+    def addFixedText( self, cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                        cLabel=None ):
+        self.addControl( "com.sun.star.awt.UnoControlFixedTextModel",
+                         cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                         bDropdown=None, bMultiSelection=None,
+                         cLabel=cLabel )
+
+        return self.getControl( cCtrlName )
+
+    #--------------------------------------------------
+    #   Add Controls to dialog
+    #--------------------------------------------------
+
+    def addControl( self, cCtrlServiceName,
+                        cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                        bDropdown=None,
+                        bMultiSelection=None,
+                        cLabel=None,
+                        nTabIndex=None,
+                        sImagePath=None,
+                         ):
+        oControlModel = self.oDialogModel.createInstance( cCtrlServiceName )
+        self.oDialogModel.insertByName( cCtrlName, oControlModel )
+        # if negative coordinates are given for X or Y position,
+        #  then make that coordinate be relative to the right/bottom
+        #  edge of the dialog box instead of to the left/top.
+        if nPositionX < 0: nPositionX = self.oDialogModel.Width  + nPositionX - nWidth
+        if nPositionY < 0: nPositionY = self.oDialogModel.Height + nPositionY - nHeight
+        oControlModel.PositionX = nPositionX
+        oControlModel.PositionY = nPositionY
+        oControlModel.Width = nWidth
+        oControlModel.Height = nHeight
+        oControlModel.Name = cCtrlName
+
+        if bDropdown != None:
+            oControlModel.Dropdown = bDropdown
+
+        if bMultiSelection!=None:
+            oControlModel.MultiSelection=bMultiSelection
+
+        if cLabel != None:
+            oControlModel.Label = cLabel
+
+        if nTabIndex != None:
+            oControlModel.TabIndex = nTabIndex
+
+        if sImagePath != None:
+            oControlModel.ImageURL = sImagePath
+    #--------------------------------------------------
+    #   Access controls and control models
+    #--------------------------------------------------
+
+    #--------------------------------------------------
+    #   com.sun.star.awt.UnoContorlListBoxModel
+    #--------------------------------------------------
+
+
+    def addComboListBox( self, cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                        bDropdown=True,
+                        bMultiSelection=False,
+                        itemListenerProc=None,
+                        actionListenerProc=None,
+                        ):
+
+        mod = self.addControl( "com.sun.star.awt.UnoControlListBoxModel",
+                         cCtrlName, nPositionX, nPositionY, nWidth, nHeight,bDropdown,bMultiSelection )
+
+        if itemListenerProc != None:
+            self.addItemListenerProc( cCtrlName, itemListenerProc )
+
+    def addListBoxItems( self, cCtrlName, tcItemTexts, nPosition=0 ):
+        """Add a tupple of items to the ListBox at specified position."""
+        oControl = self.getControl( cCtrlName )
+        oControl.addItems( tcItemTexts, nPosition )
+
+    def selectListBoxItem( self, cCtrlName, cItemText, bSelect=True ):
+        """Selects/Deselects the ispecified item."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.selectItem( cItemText, bSelect )
+
+    def selectListBoxItemPos( self, cCtrlName, nItemPos, bSelect=True ):
+        """Select/Deselect the item at the specified position."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.selectItemPos( nItemPos, bSelect )
+
+    def removeListBoxItems( self, cCtrlName, nPosition, nCount=1 ):
+        """Remove items from a ListBox."""
+        oControl = self.getControl( cCtrlName )
+        oControl.removeItems( nPosition, nCount )
+
+    def getListBoxItemCount( self, cCtrlName ):
+        """Get the number of items in a ListBox."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.getItemCount()
+
+    def getListBoxSelectedItem( self, cCtrlName ):
+        """Returns the currently selected item."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.getSelectedItem()
+
+    def getListBoxItem( self, cCtrlName, nPosition ):
+        """Return the item at specified position within the ListBox."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.getItem( nPosition )
+
+    def getListBoxSelectedItemPos(self,cCtrlName):
+
+        oControl = self.getControl( cCtrlName )
+        return oControl.getSelectedItemPos()
+
+    def getListBoxSelectedItems(self,cCtrlName):
+        oControl = self.getControl( cCtrlName )
+        return oControl.getSelectedItems()
+
+    def getListBoxSelectedItemsPos(self,cCtrlName):
+
+        oControl = self.getControl( cCtrlName )
+        return oControl.getSelectedItemsPos()
+
+    #--------------------------------------------------
+    #   com.sun.star.awt.UnoControlComboBoxModel
+    #--------------------------------------------------
+    def addComboBox( self, cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                        bDropdown=True,
+                        itemListenerProc=None,
+                        actionListenerProc=None ):
+
+        mod = self.addControl( "com.sun.star.awt.UnoControlComboBoxModel",
+                         cCtrlName, nPositionX, nPositionY, nWidth, nHeight,bDropdown)
+        if itemListenerProc != None:
+            self.addItemListenerProc( cCtrlName, itemListenerProc )
+        if actionListenerProc != None:
+            self.addActionListenerProc( cCtrlName, actionListenerProc )
+
+
+    def setComboBoxText( self, cCtrlName, cText ):
+        """Set the text of the ComboBox."""
+        oControl = self.getControl( cCtrlName )
+        oControl.setText( cText )
+
+    def getComboBoxText( self, cCtrlName):
+        """Set the text of the ComboBox."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.getText()
+
+    def getComboBoxSelectedText( self, cCtrlName ):
+        """Get the selected text of the ComboBox."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.getSelectedText();
+
+    def getControl( self, cCtrlName ):
+        """Get the control (not its model) for a particular control name.
+        The control returned includes the service com.sun.star.awt.UnoControl,
+         and another control-specific service which inherits from it.
+        """
+        oControl = self.oDialogControl.getControl( cCtrlName )
+        return oControl
+
+    def getControlModel( self, cCtrlName ):
+        """Get the control model (not the control) for a particular control name.
+        The model returned includes the service UnoControlModel,
+         and another control-specific service which inherits from it.
+        """
+        oControl = self.getControl( cCtrlName )
+        oControlModel = oControl.getModel()
+        return oControlModel
+    #---------------------------------------------------
+    #    com.sun.star.awt.UnoControlImageControlModel
+    #---------------------------------------------------
+    def addImageControl( self, cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                        sImagePath="",
+                        itemListenerProc=None,
+                        actionListenerProc=None ):
+
+        mod = self.addControl( "com.sun.star.awt.UnoControlImageControlModel",
+                         cCtrlName, nPositionX, nPositionY, nWidth, nHeight, sImagePath=sImagePath)
+
+        if itemListenerProc != None:
+            self.addItemListenerProc( cCtrlName, itemListenerProc )
+        if actionListenerProc != None:
+            self.addActionListenerProc( cCtrlName, actionListenerProc )
+
+
+    #--------------------------------------------------
+    #   Adjust properties of control models
+    #--------------------------------------------------
+
+    def setControlModelProperty( self, cCtrlName, cPropertyName, uValue ):
+        """Set the value of a property of a control's model.
+        This affects the control model, not the control.
+        """
+        oControlModel = self.getControlModel( cCtrlName )
+        oControlModel.setPropertyValue( cPropertyName, uValue )
+
+    def getControlModelProperty( self, cCtrlName, cPropertyName ):
+        """Get the value of a property of a control's model.
+        This affects the control model, not the control.
+        """
+        oControlModel = self.getControlModel( cCtrlName )
+        return oControlModel.getPropertyValue( cPropertyName )
+
+    #--------------------------------------------------
+    #   Sugar coated property adjustments to control models.
+    #--------------------------------------------------
+
+    def setEnabled( self, cCtrlName, bEnabled=True ):
+        """Supported controls...
+            UnoControlButtonModel
+            UnoControlCheckBoxModel
+        """
+        self.setControlModelProperty( cCtrlName, "Enabled", bEnabled )
+
+    def getEnabled( self, cCtrlName ):
+        """Supported controls...
+            UnoControlButtonModel
+            UnoControlCheckBoxModel
+        """
+
+        return self.getControlModelProperty( cCtrlName, "Enabled" )
+
+    def setState( self, cCtrlName, nState ):
+        """Supported controls...
+            UnoControlButtonModel
+            UnoControlCheckBoxModel
+        """
+        self.setControlModelProperty( cCtrlName, "State", nState )
+
+    def getState( self, cCtrlName ):
+        """Supported controls...
+            UnoControlButtonModel
+            UnoControlCheckBoxModel
+        """
+        return self.getControlModelProperty( cCtrlName, "State" )
+
+    def setLabel( self, cCtrlName, cLabel ):
+        """Supported controls...
+            UnoControlButtonModel
+            UnoControlCheckBoxModel
+        """
+        self.setControlModelProperty( cCtrlName, "Label", cLabel )
+
+    def getLabel( self, cCtrlName ):
+        """Supported controls...
+            UnoControlButtonModel
+            UnoControlCheckBoxModel
+        """
+        return self.getControlModelProperty( cCtrlName, "Label" )
+
+    def setHelpText( self, cCtrlName, cHelpText ):
+        """Supported controls...
+            UnoControlButtonModel
+            UnoControlCheckBoxModel
+        """
+        self.setControlModelProperty( cCtrlName, "HelpText", cHelpText )
+
+    def getHelpText( self, cCtrlName ):
+        """Supported controls...
+            UnoControlButtonModel
+            UnoControlCheckBoxModel
+        """
+        return self.getControlModelProperty( cCtrlName, "HelpText" )
+
+
+    #--------------------------------------------------
+    #   Adjust controls (not models)
+    #--------------------------------------------------
+
+    # The following apply to all controls which are a
+    #   com.sun.star.awt.UnoControl
+
+    def setDesignMode( self, cCtrlName, bDesignMode=True ):
+        oControl = self.getControl( cCtrlName )
+        oControl.setDesignMode( bDesignMode )
+
+    def isDesignMode( self, cCtrlName, bDesignMode=True ):
+        oControl = self.getControl( cCtrlName )
+        return oControl.isDesignMode()
+
+    def isTransparent( self, cCtrlName, bDesignMode=True ):
+        oControl = self.getControl( cCtrlName )
+        return oControl.isTransparent()
+
+
+    # The following apply to all controls which are a
+    #   com.sun.star.awt.UnoControlDialogElement
+
+    def setPosition( self, cCtrlName, nPositionX, nPositionY ):
+        self.setControlModelProperty( cCtrlName, "PositionX", nPositionX )
+        self.setControlModelProperty( cCtrlName, "PositionY", nPositionY )
+    def setPositionX( self, cCtrlName, nPositionX ):
+        self.setControlModelProperty( cCtrlName, "PositionX", nPositionX )
+    def setPositionY( self, cCtrlName, nPositionY ):
+        self.setControlModelProperty( cCtrlName, "PositionY", nPositionY )
+    def getPositionX( self, cCtrlName ):
+        return self.getControlModelProperty( cCtrlName, "PositionX" )
+    def getPositionY( self, cCtrlName ):
+        return self.getControlModelProperty( cCtrlName, "PositionY" )
+
+    def setSize( self, cCtrlName, nWidth, nHeight ):
+        self.setControlModelProperty( cCtrlName, "Width", nWidth )
+        self.setControlModelProperty( cCtrlName, "Height", nHeight )
+    def setWidth( self, cCtrlName, nWidth ):
+        self.setControlModelProperty( cCtrlName, "Width", nWidth )
+    def setHeight( self, cCtrlName, nHeight ):
+        self.setControlModelProperty( cCtrlName, "Height", nHeight )
+    def getWidth( self, cCtrlName ):
+        return self.getControlModelProperty( cCtrlName, "Width" )
+    def getHeight( self, cCtrlName ):
+        return self.getControlModelProperty( cCtrlName, "Height" )
+
+    def setTabIndex( self, cCtrlName, nWidth, nTabIndex ):
+        self.setControlModelProperty( cCtrlName, "TabIndex", nTabIndex )
+    def getTabIndex( self, cCtrlName ):
+        return self.getControlModelProperty( cCtrlName, "TabIndex" )
+
+    def setStep( self, cCtrlName, nWidth, nStep ):
+        self.setControlModelProperty( cCtrlName, "Step", nStep )
+    def getStep( self, cCtrlName ):
+        return self.getControlModelProperty( cCtrlName, "Step" )
+
+    def setTag( self, cCtrlName, nWidth, cTag ):
+        self.setControlModelProperty( cCtrlName, "Tag", cTag )
+    def getTag( self, cCtrlName ):
+        return self.getControlModelProperty( cCtrlName, "Tag" )
+
+    def setEchoChar(self, cCtrlName , cVal):
+        self.setControlModelProperty(cCtrlName, "EchoChar", cVal)
+    def getEchoChar(self, cCtrlName):
+        return self.setControlModelProperty(cCtrlName, "EchoChar")
+
+    #--------------------------------------------------
+    #   Add listeners to controls.
+    #--------------------------------------------------
+
+    # This applies to...
+    #   UnoControlButton
+    def addActionListenerProc( self, cCtrlName, actionListenerProc ):
+        """Create an com.sun.star.awt.XActionListener object and add it to a control.
+        A listener object is created which will call the python procedure actionListenerProc.
+        The actionListenerProc can be either a method or a global procedure.
+        The following controls support XActionListener:
+            UnoControlButton
+        """
+        oControl = self.getControl( cCtrlName )
+        oActionListener = ActionListenerProcAdapter( actionListenerProc )
+        oControl.addActionListener( oActionListener )
+
+    # This applies to...
+    #   UnoControlCheckBox
+    def addItemListenerProc( self, cCtrlName, itemListenerProc ):
+        """Create an com.sun.star.awt.XItemListener object and add it to a control.
+        A listener object is created which will call the python procedure itemListenerProc.
+        The itemListenerProc can be either a method or a global procedure.
+        The following controls support XActionListener:
+            UnoControlCheckBox
+        """
+        oControl = self.getControl( cCtrlName )
+        oActionListener = ItemListenerProcAdapter( itemListenerProc )
+        oControl.addItemListener( oActionListener )
+
+    #--------------------------------------------------
+    #   Display the modal dialog.
+    #--------------------------------------------------
+
+    def doModalDialog( self, sObjName,sValue):
+        """Display the dialog as a modal dialog."""
+        self.oDialogControl.setVisible( True )
+        if not sValue==None:
+            self.selectListBoxItem( sObjName, sValue, True )
+        self.oDialogControl.execute()
+
+    def endExecute( self ):
+        """Call this from within one of the listeners to end the modal dialog.
+        For instance, the listener on your OK or Cancel button would call this to end the dialog.
+        """
+        self.oDialogControl.endExecute()
+
diff --git a/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/lib/logreport.py b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/lib/logreport.py
new file mode 100755
index 00000000000..1cd6a16bd32
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/lib/logreport.py
@@ -0,0 +1,26 @@
+import logging
+import tempfile
+LOG_DEBUG='debug'
+LOG_INFO='info'
+LOG_WARNING='warn'
+LOG_ERROR='error'
+LOG_CRITICAL='critical'
+
+def log_detail(self):
+    import os
+    logger = logging.getLogger()
+    logfile_name = os.path.join(tempfile.gettempdir(), "report_designer.log")
+    hdlr = logging.FileHandler(logfile_name)
+    formatter = logging.Formatter('%(asctime)s %(levelname)s %(message)s')
+    hdlr.setFormatter(formatter)
+    logger.addHandler(hdlr)
+    logger.setLevel(logging.INFO)
+
+class Logger(object):
+    def log_write(self,name,level,msg):
+        log = logging.getLogger(name)
+        getattr(log,level)(msg)
+
+    def shutdown(self):
+        logging.shutdown()
+
diff --git a/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/lib/rpc.py b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/lib/rpc.py
new file mode 100755
index 00000000000..ca741858e09
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/lib/rpc.py
@@ -0,0 +1,183 @@
+import time
+import socket
+import xmlrpclib
+#import tiny_socket
+import re
+
+class RPCGateway(object):
+    def __init__(self, host, port, protocol):
+
+        self.protocol = protocol
+        self.host = host
+        self.port = port
+
+    def get_url(self):
+
+        """Get the url
+        """
+        return "%s://%s:%s/"%(self.protocol, self.host, self.port)
+
+    def listdb(self):
+        """Get the list of databases.
+        """
+        pass
+
+    def login(self, db, user, password):
+        pass
+
+    def execute(self, obj, method, *args):
+        pass
+
+
+
+class RPCSession(object):
+    def __init__(self,url):
+
+        m = re.match('^(http[s]?://|socket://)([\w.\-]+):(\d{1,5})$', url or '')
+
+        host = m.group(2)
+        port = m.group(3)
+        protocol = m.group(1)
+        if not m:
+            return -1
+        if protocol == 'http://' or protocol == 'http://':
+            self.gateway = XMLRPCGateway(host, port, 'http')
+        elif protocol == 'socket://':
+
+            self.gateway = NETRPCGateway(host, port)
+
+    def listdb(self):
+        return self.gateway.listdb()
+
+    def login(self, db, user, password):
+
+        if password is None:
+            return -1
+
+        uid = self.gateway.login(db, user or '', password or '')
+
+        if uid <= 0:
+            return -1
+
+        self.uid = uid
+        self.db = db
+        self.password = password
+        self.open = True
+        return uid
+
+
+    def execute(self, obj, method, *args):
+        try:
+            result = self.gateway.execute(obj, method, *args)
+            return self.__convert(result)
+        except Exception,e:
+          import traceback,sys
+          info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+
+    def __convert(self, result):
+
+        if isinstance(result, basestring):
+            # try to convert into unicode string
+            try:
+                return ustr(result)
+            except Exception, e:
+                return result
+
+        elif isinstance(result, list):
+            return [self.__convert(val) for val in result]
+
+        elif isinstance(result, tuple):
+            return tuple([self.__convert(val) for val in result])
+
+        elif isinstance(result, dict):
+            newres = {}
+            for key, val in result.items():
+                newres[key] = self.__convert(val)
+
+            return newres
+
+        else:
+            return result
+
+class XMLRPCGateway(RPCGateway):
+    """XML-RPC implementation.
+    """
+    def __init__(self, host, port, protocol='http'):
+
+        super(XMLRPCGateway, self).__init__(host, port, protocol)
+        global rpc_url
+        rpc_url =  self.get_url() + 'xmlrpc/'
+
+    def listdb(self):
+        global rpc_url
+        sock = xmlrpclib.ServerProxy(rpc_url + 'db')
+        try:
+            return sock.list()
+        except Exception, e:
+            return -1
+
+    def login(self, db, user, password):
+
+        global rpc_url
+
+        sock = xmlrpclib.ServerProxy(rpc_url + 'common')
+
+        try:
+            res = sock.login(db, user, password)
+        except Exception, e:
+            import traceback,sys
+            info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+            return -1
+
+        return res
+
+    def execute(self, sDatabase,UID,sPassword,obj, method, *args):
+        global rpc_url
+
+        sock = xmlrpclib.ServerProxy(rpc_url + 'object')
+
+        return sock.execute(sDatabase,UID,sPassword, obj ,method,*args)
+
+
+
+class NETRPCGateway(RPCGateway):
+    def __init__(self, host, port):
+
+        super(NETRPCGateway, self).__init__(host, port, 'socket')
+
+    def listdb(self):
+        sock = mysocket()
+        try:
+            sock.connect(self.host, self.port)
+            sock.mysend(('db', 'list'))
+            res = sock.myreceive()
+            sock.disconnect()
+            return res
+        except Exception, e:
+            return -1
+
+    def login(self, db, user, password):
+        sock =  mysocket()
+        try:
+            sock.connect(self.host, self.port)
+            sock.mysend(('common', 'login', db, user, password))
+            res = sock.myreceive()
+            sock.disconnect()
+        except Exception, e:
+            return -1
+        return res
+    def execute(self,obj, method, *args):
+        sock = mysocket()
+        try:
+            sock.connect(self.host, self.port)
+            data=(('object', 'execute',obj,method,)+args)
+            sock.mysend(data)
+            res=sock.myreceive()
+            sock.disconnect()
+            return res
+
+        except Exception,e:
+            import traceback,sys
+            info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+
+
diff --git a/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/lib/tiny_socket.py b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/lib/tiny_socket.py
new file mode 100755
index 00000000000..35754a04ded
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/lib/tiny_socket.py
@@ -0,0 +1,93 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import socket
+import cPickle
+import cStringIO
+import marshal
+
+class Myexception(Exception):
+    def __init__(self, faultCode, faultString):
+        self.faultCode = faultCode
+        self.faultString = faultString
+        self.args = (faultCode, faultString)
+
+class mysocket:
+    def __init__(self, sock=None):
+        if sock is None:
+            self.sock = socket.socket(
+            socket.AF_INET, socket.SOCK_STREAM)
+        else:
+            self.sock = sock
+        self.sock.settimeout(120)
+    def connect(self, host, port=False):
+        if not port:
+            protocol, buf = host.split('//')
+            host, port = buf.split(':')
+        self.sock.connect((host, int(port)))
+    def disconnect(self):
+        self.sock.shutdown(socket.SHUT_RDWR)
+        self.sock.close()
+    def mysend(self, msg, exception=False, traceback=None):
+
+        msg = cPickle.dumps([msg,traceback])
+        size = len(msg)
+        self.sock.send('%8d' % size)
+        self.sock.send(exception and "1" or "0")
+        totalsent = 0
+        while totalsent < size:
+            sent = self.sock.send(msg[totalsent:])
+            if sent == 0:
+                raise RuntimeError, "socket connection broken"
+            totalsent = totalsent + sent
+    def myreceive(self):
+        buf=''
+        while len(buf) < 8:
+            chunk = self.sock.recv(8 - len(buf))
+            if chunk == '':
+                raise RuntimeError, "socket connection broken"
+            buf += chunk
+        size = int(buf)
+        buf = self.sock.recv(1)
+        if buf != "0":
+            exception = buf
+        else:
+            exception = False
+        msg = ''
+        while len(msg) < size:
+            chunk = self.sock.recv(size-len(msg))
+            if chunk == '':
+                raise RuntimeError, "socket connection broken"
+            msg = msg + chunk
+        msgio = cStringIO.StringIO(msg)
+        unpickler = cPickle.Unpickler(msgio)
+        unpickler.find_global = None
+        res = unpickler.load()
+
+        if isinstance(res[0],Exception):
+            if exception:
+                raise Myexception(str(res[0]), str(res[1]))
+            raise res[0]
+        else:
+            return res[0]
+
+
+
diff --git a/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/lib/tools.py b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/lib/tools.py
new file mode 100755
index 00000000000..09e7f96c46e
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/lib/tools.py
@@ -0,0 +1,19 @@
+import urllib
+
+def get_absolute_file_path( url ):
+	url_unquoted = urllib.unquote(url)
+	return os.name == 'nt' and url_unquoted[1:] or url_unquoted 
+
+# This function reads the content of a file and return it to the caller
+def read_data_from_file( filename ):
+	fp = file( filename, "rb" )
+	data = fp.read()
+	fp.close()
+	return data
+
+# This function writes the content to a file
+def write_data_to_file( filename, data ):
+	fp = file( filename, 'wb' )
+	fp.write( data )
+	fp.close()
+
diff --git a/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/modify.py b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/modify.py
new file mode 100755
index 00000000000..8a710a6e959
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report_designer/bin/script/modify.py
@@ -0,0 +1,91 @@
+import re
+import uno
+import string
+import unohelper
+import xmlrpclib
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from Expression import Expression
+    from Fields import Fields
+    from Repeatln import RepeatIn
+    from lib.error import *
+    database="test"
+    uid = 3
+
+class modify(unohelper.Base, XJobExecutor ):
+    def __init__( self, ctx ):
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+
+        # Variable Declaration
+        desktop = getDesktop()
+        doc = desktop.getCurrentComponent()
+        docinfo = doc.getDocumentInfo()
+        self.oVC = doc.CurrentController.getViewCursor()
+        if not docinfo.getUserFieldValue(0)=="":
+            self.sMyHost= docinfo.getUserFieldValue(0)
+        else:
+            ErrorDialog(
+		"Please insert user define field Field-1",
+		"Just go to File->Properties->User Define \n"
+		"Field-1 Eg. http://localhost:8069"
+	    )
+            exit(1)
+
+        # Check weather Field-4 is available or not otherwise exit from application
+        if not docinfo.getUserFieldValue(3) == "" and not docinfo.getUserFieldValue(0)=="":
+            if self.oVC.TextField:
+                self.oCurObj=self.oVC.TextField
+		item = self.oCurObj.Items[0]
+
+		kind, group1, group2 = self.getOperation(self.oCurObj.Items[1] )
+
+		start_group1 = group1[:group1.find(".")]
+		stop_group1 = group1[group1.find("."):].replace(".", "/")
+
+                if kind == "field":
+		    Fields( start_group1, stop_group1, item, True )
+                elif kind == "expression":
+                    Expression( group1, item, True )
+                elif kind == "repeatIn":
+		    RepeatIn( start_group1, group2, stop_group1, item, True )
+            else:
+                ErrorDialog(
+		    "Please place your cursor at begaining of field \n"
+		    "which you want to modify",""
+		)
+
+        else:
+            ErrorDialog(
+		"Please insert user define field Field-1 or Field-4",
+		"Just go to File->Properties->User Define \n"
+		"Field-1 Eg. http://localhost:8069 \n"
+		"OR \n"
+		"Field-4 Eg. account.invoice"
+	    )
+            exit(1)
+
+    def getOperation(self, str):
+        #str = "[[ RepeatIn(objects, 'variable') ]]" #repeatIn
+        #str = "[[ saleorder.partner_id.name ]]" # field
+        #str = "[[ some thing complex ]]" # expression
+        method1 = lambda x: (u'repeatIn', x.group(1), x.group(2))
+        method2 = lambda x: (u'field', x.group(1), None)
+        method3 = lambda x: (u'expression', x.group(1), None)
+        regexes = [
+	    ('\\[\\[ *repeatIn\\( *(.+)*, *\'([a-zA-Z0-9_]+)\' *\\) *\\]\\]', method1),
+	    ('\\[\\[ *([a-zA-Z0-9_\.]+) *\\]\\]', method2),
+	    ('\\[\\[ *(.+) *\\]\\]', method3)
+        ]
+        for (rule,method) in regexes:
+	    res = re.match(rule, str)
+	    if res:
+		return method(res)
+
+if __name__<>"package":
+    modify(None)
+else:
+    g_ImplementationHelper.addImplementation( modify, "org.openoffice.openerp.report.modify", ("com.sun.star.task.Job",),)
+
diff --git a/addons/base_report_designer/report_desinger/openoffice_report_designer/doc/Readme.txt b/addons/base_report_designer/report_desinger/openoffice_report_designer/doc/Readme.txt
new file mode 100755
index 00000000000..dc67455d1f7
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report_designer/doc/Readme.txt
@@ -0,0 +1,48 @@
+Steps to Install package in Openoffice
+
+	- In Openoffice writer select Tools Menu
+
+	- Inside of Tools menu you will get option like "Package Manager"
+
+	- Select Package Manager you will get one dialog box
+
+	- In Dialog box you will get one listbox below "Browse Packages". 
+	  You will find different options like 'My Packages,
+	  Openoffice Packages'.
+
+	- You have select 'My Packages' and then click on button named 'Add...' 
+	  then select your path where the package is located that is 
+	  ZIP archive file.
+
+	- On the completion of adding package you will get your package
+	  under 'My Packages' and the status of your package become 'Enabled'
+	  then close openoffice writer
+
+	- Now you have start tiny server
+
+	- then in unother terminal u have to write command 
+
+		ooffice "-accept=socket,host=localhost,port=2002;urp;"
+
+	- Above command will open openoffice writer with socket connection
+	  if you use different host then localhost then chang it accordingly
+
+	- Now in openoffice writer u will find one new menu named "Tiny Report"
+
+Steps to execute scripts 
+
+	- You can directly us scripts for perticular operation.
+
+	- If you want to execute script then u have to use terminal.
+
+	- Now you have start tiny server
+
+	- then in unother terminal u have to write command 
+
+		ooffice "-accept=socket,host=localhost,port=2002;urp;"
+
+	- Go to the perticular directory of scripts and then use below command
+		
+		python scriptname.py
+
+	- you will get execute yor script
diff --git a/addons/base_report_designer/report_desinger/openoffice_report_designer/doc/test_fields.py b/addons/base_report_designer/report_desinger/openoffice_report_designer/doc/test_fields.py
new file mode 100755
index 00000000000..8afd773b3fb
--- /dev/null
+++ b/addons/base_report_designer/report_desinger/openoffice_report_designer/doc/test_fields.py
@@ -0,0 +1,32 @@
+#
+# Use this module to retrive the fields you need according to the type
+# of the OpenOffice operation:
+#  * Insert a Field
+#  * Insert a RepeatIn
+#
+
+import xmlrpclib
+import time
+
+sock = xmlrpclib.ServerProxy('http://localhost:8069/xmlrpc/object')
+
+def get(object, level=3, ending=[], ending_excl=[], recur=[], root=''):
+	res = sock.execute('terp', 3, 'admin', 'account.invoice', 'fields_get')
+	key = res.keys()
+	key.sort()
+	for k in key:
+		if (not ending or res[k]['type'] in ending) and ((not ending_excl) or not (res[k]['type'] in ending_excl)):
+			print root+'/'+k
+
+		if res[k]['type'] in recur:
+			print root+'/'+k
+		if (res[k]['type'] in recur) and (level>0):
+			get(res[k]['relation'], level-1, ending, ending_excl, recur, root+'/'+k)
+
+print 'Field selection for a rields', '='*40
+get('account.invoice', level=0, ending_excl=['one2many','many2one','many2many','reference'], recur=['many2one'])
+
+print
+print 'Field selection for a repeatIn', '='*40
+get('account.invoice', level=0, ending=['one2many','many2many'], recur=['many2one'])
+
diff --git a/addons/base_report_designer/report_desinger/openoffice_report_designer/openerp_report_designer.zip b/addons/base_report_designer/report_desinger/openoffice_report_designer/openerp_report_designer.zip
new file mode 100755
index 0000000000000000000000000000000000000000..27f7fd48236ed97315e1c6da2e8fd7d15d9c71f6
GIT binary patch
literal 151447
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
PZ~Qm!jF2G;zrN64r0{k9

literal 0
HcmV?d00001

diff --git a/addons/base_report_designer/wizard/__init__.py b/addons/base_report_designer/wizard/__init__.py
old mode 100644
new mode 100755
index f80f87da1d5..034031fa187
--- a/addons/base_report_designer/wizard/__init__.py
+++ b/addons/base_report_designer/wizard/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,10 +15,11 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 import base_report_designer_modify
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/base_report_designer/wizard/base_report_designer_modify.py b/addons/base_report_designer/wizard/base_report_designer_modify.py
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/wizard/tiny_sxw2rml/__init__.py b/addons/base_report_designer/wizard/tiny_sxw2rml/__init__.py
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/wizard/tiny_sxw2rml/normalized_odt2rml.xsl b/addons/base_report_designer/wizard/tiny_sxw2rml/normalized_odt2rml.xsl
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/wizard/tiny_sxw2rml/normalized_oo2rml.xsl b/addons/base_report_designer/wizard/tiny_sxw2rml/normalized_oo2rml.xsl
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/wizard/tiny_sxw2rml/office.dtd b/addons/base_report_designer/wizard/tiny_sxw2rml/office.dtd
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py b/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py
old mode 100644
new mode 100755
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 272dad32683..4ea1b7131a2 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -127,7 +127,7 @@
                     <group col="8" colspan="4">
                         <field name="name" select="1" colspan="6"/>
                         <button name="open_wiki_page" type="object"
-                        string="Basic Wiki Editing" icon="gtk-ok" />
+                        string="Basic Wiki Editing" icon="gtk-ok"/>
                     </group>
                     <group col="8" colspan="4">
                         <field name="group_id" select="1" on_change="onchange_group_id(group_id, text_area)"/>
diff --git a/addons/wiki_sale_faq/wiki_sale_faq_data.xml b/addons/wiki_sale_faq/wiki_sale_faq_data.xml
index 4a8eea1cb38..e2e21342d78 100644
--- a/addons/wiki_sale_faq/wiki_sale_faq_data.xml
+++ b/addons/wiki_sale_faq/wiki_sale_faq_data.xml
@@ -21,6 +21,47 @@
             </field>
         </record>
 
-    
+         <record id="wiki_wiki_bugs" model="wiki.wiki">
+            <field name="name">Sales Management ?</field>
+            <field name="tags">crm, bugs</field>
+            <field name="group_id" ref="wiki_groups_sale_faq"/>
+            <field name="minor_edit">0</field>
+            <field name="toc">0</field>
+            <field name="review">1</field>
+            <field name="section">2</field>
+            <field name="summary">Initial Page</field>
+            <field name="text_area">== Question ==
+
+What's Sales Management ?
+
+== Answer ==
+
+Sales modules allow you to manage and classify your sales orders on a structural and hierarchical system. It gives you
+the ability to create new orders and to review the existing orders in their various states. Confirmation of an order can
+triggers delivery of the goods, and invoicing timing is defined by a setting in each individual order.
+
+Key Points:
+
+* Get all information needed by the salesman to do his quote in one screen
+* Complete follow-up and control of sales orders, deliveries and invoicing
+* Traceability of all customers operations
+
+
+Integration Benefits:
+
+* Automatic accounting (financial and analytic) entries creation,
+* Integrated with contracts, projects, master production shedule,
+* Integrated with different eCommerce platforms for online selling.
+* Design templates of re-useable offers with the report designer
+
+
+== External Links ==
+
+* The Open ERP Website: [http://openerp.com]
+* The Sale Documentation: [http://openerp.com]
+
+   </field>
+  </record>
+
    </data>
 </openerp>

From 2907ce2862b8813859605229d5c5bbe733de75ed Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Tue, 8 Jun 2010 17:13:05 +0530
Subject: [PATCH 038/121] [ADD]: membership: add yaml for membership module.

bzr revid: atp@tinyerp.co.in-20100608114305-efpjhmkcg13iklem
---
 addons/membership/__openerp__.py           |   4 +-
 addons/membership/membership_view.xml      |   3 +-
 addons/membership/test/test_membership.yml | 115 +++++++++++++++++++++
 3 files changed, 119 insertions(+), 3 deletions(-)
 create mode 100644 addons/membership/test/test_membership.yml

diff --git a/addons/membership/__openerp__.py b/addons/membership/__openerp__.py
index 709a09807ac..1de648ff8e8 100755
--- a/addons/membership/__openerp__.py
+++ b/addons/membership/__openerp__.py
@@ -47,8 +47,8 @@ invoice and send propositions for membership renewal.
         'wizard/membership_unpaid_invoice_view.xml',
         'process/membership_process.xml'
     ],
-    'demo_xml': ['membership_demo.xml'
-                 ],
+    'demo_xml': ['membership_demo.xml'],
+    'test': ['test/test_membership.yml'],             
     'installable': True,
     'active': False,
     'certificate': '0042907796381',
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 9dd4b56b40e..3b1009963cb 100755
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -39,7 +39,8 @@
                     <field name="membership" colspan="1"/>
                     <field name="active" colspan="1"/>
                     <newline/>
-                    <field name="taxes_id" colspan="4"/>
+                    <separator colspan="4" string="Customer Taxes:"/>
+                    <field name="taxes_id" colspan="4" nolabel="1"/> 
                 </form>
             </field>
         </record>
diff --git a/addons/membership/test/test_membership.yml b/addons/membership/test/test_membership.yml
new file mode 100644
index 00000000000..5a67ea7f476
--- /dev/null
+++ b/addons/membership/test/test_membership.yml
@@ -0,0 +1,115 @@
+- |  
+  In Order to test the Membership in OpenERP, which allows us to manage all operations for managing memberships.
+- |
+  We have to create "Membership Products" to make it available for partner or customer to make membership with it.
+  select product type   to "service" type and membership field is ticked to visible this product while creating membership for the partner.
+- 
+  !record {model: product.product, id: product_product_membershipproduct0}:
+    categ_id: product.cat1
+    membership: 1
+    membership_date_from: '2009-06-01'
+    membership_date_to: '2010-06-01'
+    name: Membership Products
+    type: service
+    list_price: 80.00
+    
+- |
+  I create new member "Mark Johnson" and I provide an address to this
+  new customer, as well as an email "info@mycustomer.com".
+- 
+  !record {model: res.partner, id: res_partner_markjohnson0}:
+    address:
+      - city: paris
+        country_id: base.fr
+        name: Arthur Grosbonnet
+        street: 1 rue Rockfeller
+        title: M.
+        type: default
+        zip: '75016'
+    credit_limit: 0.0
+    membership_amount: 0.0
+    name: Mark Johnson
+    property_account_payable: account.a_pay
+    property_account_receivable: account.a_recv
+
+- |
+  I check that "Current membership state" is set to "Non Member". 
+- 
+  !assert {model: res.partner, id: res_partner_markjohnson0}:
+      - membership_state == 'none'
+- |  
+  I can make it a Free member by selecting the "Free member" check box.
+- 
+  !record {model: res.partner, id: membership.res_partner_markjohnson0}:
+    free_member: 1
+- |
+  Now, I create Membership Invoices using wizard available on partner and  Select Membership Product.
+- 
+  !record {model: membership.invoice, id: membership_invoice_0}:
+    product_id: membership.product_product_membershipproduct0
+- |
+  I check that address is  defined or not  for this Member.   
+- 
+  !python {model: membership.invoice}: |
+      partner_ids = [ref('res_partner_markjohnson0')]
+      addre_obj = self.pool.get('res.partner.address')
+      ids = addre_obj.search(cr, uid, [('partner_id', '=', partner_ids)])
+         
+      addre_id = addre_obj.browse(cr, uid, ids)[0]
+      assert addre_id.partner_id
+      assert addre_id.id
+      assert addre_id.type    
+    
+- |
+  I click on "Confirm" button of this wizard. 
+- 
+  !python {model: membership.invoice}: |
+    self.membership_invoice(cr, uid, [ref("membership_invoice_0")], {"active_ids": [ref("membership.res_partner_markjohnson0")]})
+
+- |
+  I check that Invoice is created for this members.
+-
+  !python {model: res.partner}: |
+        invoice_obj = self.pool.get('account.invoice')
+        partner_obj = self.pool.get('res.partner')
+        product_obj = self.pool.get('product.product')
+        invoice_line_obj = self.pool.get(('account.invoice.line'))
+        
+        partner_id = self.browse(cr, uid, [ref('res_partner_markjohnson0')])[0]
+        ids = invoice_obj.search(cr, uid, [('partner_id', '=', partner_id.id), ('account_id', '=', partner_id.property_account_receivable.id)])
+        invoice_id = invoice_obj.browse(cr, uid, ids)[0]
+        
+        product = product_obj.browse(cr, uid, [ref('product_product_membershipproduct0')], context=context)[0]        
+        line_ids = invoice_line_obj.search(cr, uid, [('product_id', '=', product.id), ('invoice_id', '=', invoice_id.id)])
+        line_id = invoice_line_obj.browse(cr, uid, line_ids)[0]
+         
+        assert line_id.product_id.id == product.id
+        assert  invoice_id.partner_id.id == partner_id.id
+         
+- |
+  I check that the "Current membership state" will remain same untill opening the invoice.
+-
+  !assert {model: res.partner, id: res_partner_markjohnson0}:
+     - membership_state == 'free'  
+  
+- |
+  "Current membership state" of any member depends on the state of invoice.
+  So, I check that  invoice is in draft state then the "membership state" of a member is "Waiting member".
+-
+  !python {model: membership.membership_line}: |
+        partner_id = self.pool.get('res.partner').browse(cr, uid, [ref('res_partner_markjohnson0')])[0]
+        ids = self.search(cr, uid, [('partner', '=', partner_id.id)])
+        current_id = self.browse(cr, uid, ids)[0]
+              
+        partner_obj = self.pool.get('res.partner')
+        inv_obj = self.pool.get('account.invoice')
+        
+        ids = inv_obj.search(cr, uid, [('partner_id', '=', partner_id.id), ('account_id', '=', partner_id.property_account_receivable.id)])
+        inv_id = inv_obj.browse(cr, uid, ids)[0]
+        if inv_id.state == 'draft':
+            assert current_id == 'waiting'
+- |
+  When the invoice is in open state it become Invoiced Member, When the invoice is in paid state the same "Current membership state" changed to Paid Member. 
+  Now, If we cancel the invoice "Current membership state" changed to Cancel Member.           
+            
+            
\ No newline at end of file

From 0a9c028757641b98499457958e626a2c016e2dcd Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Tue, 8 Jun 2010 17:21:59 +0530
Subject: [PATCH 039/121] [IMP]: sale_crm: resolve conflict for wizard.

bzr revid: atp@tinyerp.co.in-20100608115159-7k2y2hfw5ol3fvxv
---
 addons/sale_crm/wizard/crm_make_sale.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index 6d688698db5..f53ce3d24d5 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -23,7 +23,6 @@ from osv import fields, osv
 from tools.translate import _
 from mx.DateTime import now
 
-<<<<<<< TREE
 
 class crm_make_sale(osv.osv_memory):
     """ Make sale  order for crm """

From 9d200d1c85d7dc28d2c060354cc210ccb0f93309 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Tue, 8 Jun 2010 18:29:04 +0530
Subject: [PATCH 040/121] [ADD] task-907 Add new group in wiki and demo data in
 wiki_sale_faq

bzr revid: ksa@tinyerp.co.in-20100608125904-s7rq2jeg0jnqk2xp
---
 addons/wiki/__openerp__.py             | 1 +
 addons/wiki/security/wiki_security.xml | 8 ++++++++
 addons/wiki/wiki_view.xml              | 3 ++-
 3 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 addons/wiki/security/wiki_security.xml

diff --git a/addons/wiki/__openerp__.py b/addons/wiki/__openerp__.py
index 8dd7779a290..d6414ca6a26 100644
--- a/addons/wiki/__openerp__.py
+++ b/addons/wiki/__openerp__.py
@@ -33,6 +33,7 @@
     'depends': ['base'],
     'init_xml': [],
     'update_xml': [
+        'security/wiki_security.xml',
         'wizard/wiki_wiki_page_open_view.xml',
         'wizard/wiki_create_menu_view.xml',
         'wizard/wiki_make_index_view.xml',
diff --git a/addons/wiki/security/wiki_security.xml b/addons/wiki/security/wiki_security.xml
new file mode 100644
index 00000000000..ae68d019a42
--- /dev/null
+++ b/addons/wiki/security/wiki_security.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="1">
+    <record id="wiki_basic_group" model="res.groups">
+        <field name="name">wiki / Basic wiki editing</field>
+    </record>
+</data>
+</openerp>
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 4ea1b7131a2..00bec980c23 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -127,13 +127,14 @@
                     <group col="8" colspan="4">
                         <field name="name" select="1" colspan="6"/>
                         <button name="open_wiki_page" type="object"
-                        string="Basic Wiki Editing" icon="gtk-ok"/>
+                        string="Basic Wiki Editing" icon="gtk-ok" groups="wiki.wiki_basic_group"/>
                     </group>
                     <group col="8" colspan="4">
                         <field name="group_id" select="1" on_change="onchange_group_id(group_id, text_area)"/>
                         <field name="section" invisible="not context.get('section',False)"/>
                         <field name="parent_id"/>
                     </group>
+
 					<separator colspan="4" string="Informations"/>
                     <field name="text_area" nolabel="1" colspan="4" select="1" widget="text_wiki"/>
                     <separator colspan="4" string="Modifications"/>

From d4a599ad8e028bc159ae94047703ea986b39cbad Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 9 Jun 2010 10:37:06 +0530
Subject: [PATCH 041/121] [IMP]: Added log message on create

bzr revid: rpa@tinyerp.com-20100609050706-y14rswfmt1qzantb
---
 addons/base_contact/base_contact.py   | 2 ++
 addons/crm_profiling/crm_profiling.py | 1 +
 addons/document/directory_content.py  | 2 ++
 addons/idea/idea.py                   | 1 +
 addons/sale_crm/wizard/makesale.py    | 1 +
 addons/survey/survey.py               | 3 +++
 6 files changed, 10 insertions(+)

diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
index 23589fd2d6d..75cbfd20c03 100644
--- a/addons/base_contact/base_contact.py
+++ b/addons/base_contact/base_contact.py
@@ -26,6 +26,7 @@ class res_partner_contact(osv.osv):
 
     _name = "res.partner.contact"
     _description = "Contact"
+    _log_create = True
 
     def _title_get(self,cr, user, context={}):
         """
@@ -207,6 +208,7 @@ class res_partner_job(osv.osv):
     _name = 'res.partner.job'
     _description ='Contact Partner Function'
     _order = 'sequence_contact'
+    _log_create = True
 
     _columns = {
         'name': fields.related('address_id', 'partner_id', type='many2one',\
diff --git a/addons/crm_profiling/crm_profiling.py b/addons/crm_profiling/crm_profiling.py
index 760c9b20bba..77675ff513d 100644
--- a/addons/crm_profiling/crm_profiling.py
+++ b/addons/crm_profiling/crm_profiling.py
@@ -158,6 +158,7 @@ class questionnaire(osv.osv):
 
     _name="crm_profiling.questionnaire"
     _description= "Questionnaire"
+    _log_create = True
 
     def build_form(self, cr, uid, data, context):
         """
diff --git a/addons/document/directory_content.py b/addons/document/directory_content.py
index 2d434712f56..dff02e8cb61 100644
--- a/addons/document/directory_content.py
+++ b/addons/document/directory_content.py
@@ -47,6 +47,8 @@ class document_directory_content(osv.osv):
     _name = 'document.directory.content'
     _description = 'Directory Content'
     _order = "sequence"
+    _log_create = True
+
     def _extension_get(self, cr, uid, context={}):
         cr.execute('select code,name from document_directory_content_type where active')
         res = cr.fetchall()
diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index 64b197cf858..20a2904c4e6 100644
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -304,6 +304,7 @@ class idea_vote(osv.osv):
     _name = 'idea.vote'
     _description = 'Idea Vote'
     _rec_name = 'score'
+    _log_create = True
 
     _columns = {
         'user_id': fields.many2one('res.users', 'By user', readonly="True"),
diff --git a/addons/sale_crm/wizard/makesale.py b/addons/sale_crm/wizard/makesale.py
index e4aacce1044..47e4cd15c6d 100644
--- a/addons/sale_crm/wizard/makesale.py
+++ b/addons/sale_crm/wizard/makesale.py
@@ -131,6 +131,7 @@ class make_sale(wizard.interface):
                     sale_line_obj.create(cr, uid, value)
 
             case_obj.write(cr, uid, [case.id], {'ref': 'sale.order,%s' % new_id})
+            case._table.log(cr, uid, case.id, "Opportunity '" + case.name + "' is converted into Sale Order: " + str(new_id) , context=context)
             new_ids.append(new_id)
 
         if data['form']['close']:
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index c86f13b262f..f1260b08f12 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -45,6 +45,7 @@ class survey(osv.osv):
     _name = 'survey'
     _description = 'Survey'
     _rec_name = 'title'
+    _log_create = True
 
     def default_get(self, cr, uid, fields, context={}):
         data = super(survey, self).default_get(cr, uid, fields, context)
@@ -588,6 +589,8 @@ survey_answer()
 class survey_response(osv.osv):
     _name = "survey.response"
     _rec_name = 'date_create'
+    _log_create = True
+
     _columns = {
         'survey_id' : fields.many2one('survey', 'Survey', required=1, ondelete='cascade'),
         'date_create' : fields.datetime('Create Date', required=1),

From ddc39402653940512471e3d93785f3eb9a828bc5 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Wed, 9 Jun 2010 14:48:17 +0530
Subject: [PATCH 042/121] [IMP] base_action_rule: add scheduler to check rules
 every 4 hours

bzr revid: hmo@tinyerp.com-20100609091817-2xk85a6ldw0sluiq
---
 addons/base_action_rule/__openerp__.py        |  4 +++-
 addons/base_action_rule/base_action_rule.py   |  5 ++++-
 .../base_action_rule_data.xml                 | 19 +++++++++++++++++++
 addons/crm/crm_data.xml                       | 11 +----------
 4 files changed, 27 insertions(+), 12 deletions(-)
 create mode 100644 addons/base_action_rule/base_action_rule_data.xml

diff --git a/addons/base_action_rule/__openerp__.py b/addons/base_action_rule/__openerp__.py
index ab1ae6c965b..cdb62316d15 100644
--- a/addons/base_action_rule/__openerp__.py
+++ b/addons/base_action_rule/__openerp__.py
@@ -27,7 +27,9 @@
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
-    'init_xml': [],
+    'init_xml': [
+        'base_action_rule_data.xml'
+    ],
     'update_xml': [
         'base_action_rule_view.xml',        
         'security/ir.model.access.csv',
diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py
index 85c4e9d4480..9cd5f9c93c5 100644
--- a/addons/base_action_rule/base_action_rule.py
+++ b/addons/base_action_rule/base_action_rule.py
@@ -136,7 +136,7 @@ the rule to mark CC(mail to any other person defined in actions)."),
     
     def pre_action(self, cr, uid, ids, model, context=None):
         # Searching for action rules
-        cr.execute("SELECT m.model, r.id  from base_action_rule r left join ir_model m on (m.id = r.name)")
+        cr.execute("SELECT model.model, rule.id  FROM base_action_rule rule LEFT JOIN ir_model model on (model.id = rule.name)")
         res = cr.fetchall()
         # Check if any rule matching with current object
         for obj_name, rule_id in res:
@@ -197,6 +197,9 @@ the rule to mark CC(mail to any other person defined in actions)."),
 
     def _check(self, cr, uid, automatic=False, use_new_cursor=False, \
                        context=None):
+        """
+        This Function is call by scheduler.
+        """
         rule_pool= self.pool.get('base.action.rule')
         rule_ids = rule_pool.search(cr, uid, [], context=context)
         return rule_pool.write(cr, uid, rule_ids, {}, context=context)
diff --git a/addons/base_action_rule/base_action_rule_data.xml b/addons/base_action_rule/base_action_rule_data.xml
new file mode 100644
index 00000000000..288215202d6
--- /dev/null
+++ b/addons/base_action_rule/base_action_rule_data.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+		<record id="ir_cron_crm_action" model="ir.cron">
+            <field name="name">Check Action Rules</field>
+            <field name="interval_number">4</field>
+            <field name="interval_type">hours</field>
+            <field name="numbercall">-1</field>
+            <field eval="False" name="doall"/>
+            <field eval="'base.action.rule'" name="model"/>
+            <field eval="'_check'" name="function"/>
+            <field eval="'()'" name="args"/>
+        </record>      
+        
+        
+        
+                
+    </data>
+</openerp>
diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml
index 1873f53f573..61a9c4909de 100644
--- a/addons/crm/crm_data.xml
+++ b/addons/crm/crm_data.xml
@@ -7,16 +7,7 @@
 		</record>
         
         
-        <record id="ir_cron_crm_action" model="ir.cron">
-            <field name="name">Check cases rules</field>
-            <field name="interval_number">4</field>
-            <field name="interval_type">hours</field>
-            <field name="numbercall">-1</field>
-            <field eval="False" name="doall"/>
-            <field eval="'crm.case'" name="model"/>
-            <field eval="'_check'" name="function"/>
-            <field eval="'()'" name="args"/>
-        </record>      
+        
                 
     </data>
 </openerp>

From 1514c31c989068737e1821b6b819e11ba24970fb Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Wed, 9 Jun 2010 15:04:23 +0530
Subject: [PATCH 043/121] [REF] base_action_rule: refactor code

bzr revid: hmo@tinyerp.com-20100609093423-4z9qfmrmmnm5yic0
---
 addons/base_action_rule/base_action_rule.py | 36 +++++++++------------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py
index 9cd5f9c93c5..7d9d7ea63ff 100644
--- a/addons/base_action_rule/base_action_rule.py
+++ b/addons/base_action_rule/base_action_rule.py
@@ -147,7 +147,7 @@ the rule to mark CC(mail to any other person defined in actions)."),
                 self._action(cr, uid, [rule_id], obj.browse(cr, uid, ids, context=context))
         return True
 
-    def new_create(self, old_create, model, context=None):
+    def _create(self, old_create, model, context=None):
         if not context:
             context  = {}
         def make_call_old(cr, uid, vals, context=context):
@@ -157,7 +157,7 @@ the rule to mark CC(mail to any other person defined in actions)."),
             return new_id
         return make_call_old
     
-    def new_write(self, old_write, model, context=None):
+    def _write(self, old_write, model, context=None):
         if not context:
             context  = {}
         def make_call_old(cr, uid, ids, vals, context=context):
@@ -168,31 +168,25 @@ the rule to mark CC(mail to any other person defined in actions)."),
             return old_write(cr, uid, ids, vals, context=context)
         return make_call_old
 
-    def create(self, cr, uid, vals, context=None):
+    def _register_hook(self, cr, uid, ids, context=None):
         if not context:
             context = {}
-        res_id = super(base_action_rule, self).create(cr, uid, vals, context)
         model_pool = self.pool.get('ir.model')
-        model = model_pool.browse(cr, uid, vals.get('name'), context=context).model
-        obj_pool = self.pool.get(model)
-        obj_pool.__setattr__('old_create', obj_pool.create)
-        obj_pool.__setattr__('old_write', obj_pool.write)
-        obj_pool.__setattr__('create', self.new_create(obj_pool.create, model, context=context))
-        obj_pool.__setattr__('write', self.new_write(obj_pool.write, model, context=context))
+        for action_rule in self.browse(cr, uid, ids, context=context):
+            model = action_rule.name.model
+            obj_pool = self.pool.get(model)        
+            obj_pool.__setattr__('create', self._create(obj_pool.create, model, context=context))
+            obj_pool.__setattr__('write', self._write(obj_pool.write, model, context=context))
+        return True
+
+    def create(self, cr, uid, vals, context=None):
+        res_id = super(base_action_rule, self).create(cr, uid, vals, context)
+        self._register_hook(cr, uid, [res_id], context=context)        
         return res_id
     
     def write(self, cr, uid, ids, vals, context=None):
         res = super(base_action_rule, self).write(cr, uid, ids, vals, context)
-        model_pool = self.pool.get('ir.model')
-        if not context:
-            context = {}
-        for rule in self.browse(cr, uid, ids, context=context):
-            model = model_pool.browse(cr, uid, rule.name.id, context=context).model
-            obj_pool = self.pool.get(model)
-            obj_pool.__setattr__('old_create', obj_pool.create)
-            obj_pool.__setattr__('old_write', obj_pool.write)
-            obj_pool.__setattr__('create', self.new_create(obj_pool.create, model, context=context))
-            obj_pool.__setattr__('write', self.new_write(obj_pool.write, model, context=context))
+        self._register_hook(cr, uid, ids, context=context)
         return res
 
     def _check(self, cr, uid, automatic=False, use_new_cursor=False, \
@@ -202,7 +196,7 @@ the rule to mark CC(mail to any other person defined in actions)."),
         """
         rule_pool= self.pool.get('base.action.rule')
         rule_ids = rule_pool.search(cr, uid, [], context=context)
-        return rule_pool.write(cr, uid, rule_ids, {}, context=context)
+        return self._register_hook(cr, uid, rule_ids, context=context)
         
 
     def format_body(self, body):

From 297da6d3c9419d3b33358c8d54670ec255966cd2 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Wed, 9 Jun 2010 15:25:45 +0530
Subject: [PATCH 044/121] [IMP] Task 909: * Put multi_level_bom = True on demo
 data for product appearing into Manufacturing/Master Data/Master Bill of
 Materials * Put domain = [('multi_level_bom','=',True)] on menu
 Manufacturing/Master Data/Master Bill of Materials

bzr revid: uco@tinyerp.com-20100609095545-2lpvxkg3gw1lqyp5
---
 addons/mrp/mrp.py       | 16 +---------------
 addons/mrp/mrp_demo.xml | 13 +++++++++++++
 addons/mrp/mrp_view.xml |  6 +++---
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index d7ca66c2580..9d8bc5eab4c 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -248,21 +248,7 @@ class mrp_bom(osv.osv):
                 v['name'] = prod.name
             return {'value': v}
         return {}
-    
-    def onchange_multi_level_bom(self, cr, uid, ids, multi_level_bom, context={}):
-        """ Changes multi_level_bom.
-        @param multi_level_bom: Changed multi_level_bom
-        @return:  Dictionary of changed values
-        """
-        bom_ids = ids and ids[0]
-        bom = self.browse(cr, uid, bom_ids)
-        line_ids = bom and map(lambda x:x.id, bom.bom_lines)
-        if multi_level_bom:
-            self.write(cr, uid, line_ids, {'multi_level_bom': multi_level_bom})
-            return {'value': {'bom_lines': line_ids}}
-        else:
-            self.write(cr, uid, line_ids, {'multi_level_bom': multi_level_bom})
-            return {'value': {}}
+
     def _bom_find(self, cr, uid, product_id, product_uom, properties=[]):
         """ Finds BoM for particular product and product uom.
         @param product_id: Selected product.
diff --git a/addons/mrp/mrp_demo.xml b/addons/mrp/mrp_demo.xml
index 581cc04c05e..21415ad56f9 100644
--- a/addons/mrp/mrp_demo.xml
+++ b/addons/mrp/mrp_demo.xml
@@ -171,6 +171,7 @@
             <field name="routing_id" ref="mrp_routing_2"/>
             <field name="type">normal</field>
             <field model="product.product" name="product_id" ref="product.product_product_cpu_gen"/>
+            <field name="multi_level_bom">True</field>
         </record>
 
         <record id="mrp_bom_1" model="mrp.bom">
@@ -180,6 +181,7 @@
             <field name="product_qty">1.0</field>
             <field name="routing_id" ref="mrp_routing_0"/>
             <field model="product.product" name="product_id" ref="product.product_product_pc2" />
+            <field name="multi_level_bom">True</field>
         </record>
         <record id="mrp_bom_2" model="mrp.bom">
             <field name="name">Assembly Medium PC</field>
@@ -187,6 +189,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field model="product.product" name="product_id" ref="product.product_product_pc3"/>
+            <field name="multi_level_bom">True</field>
         </record>
         <record id="mrp_bom_3" model="mrp.bom">
             <field name="name">Assembly Customizable PC</field>
@@ -194,6 +197,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field model="product.product" name="product_id" ref="product.product_product_pc4"/>
+            <field name="multi_level_bom">True</field>
         </record>
         <record id="mrp_bom_4" model="mrp.bom">
             <field name="name">HDD on demand</field>
@@ -202,6 +206,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
             <field model="product.product" name="product_id" ref="product.product_product_20"/>
+            <field name="multi_level_bom">True</field>
         </record>
         <record id="mrp_bom_5" model="mrp.bom">
             <field name="name">RAM on demand</field>
@@ -210,6 +215,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
             <field model="product.product" name="product_id" ref="product.product_product_21"/>
+            <field name="multi_level_bom">True</field>
         </record>
         <record id="mrp_bom_6" model="mrp.bom">
             <field name="name">HDD on demand</field>
@@ -218,6 +224,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
             <field model="product.product" name="product_id" ref="product.product_product_20"/>
+            <field name="multi_level_bom">True</field>
         </record>
         <record id="mrp_bom_7" model="mrp.bom">
             <field name="name">HDD on demand</field>
@@ -226,6 +233,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
             <field model="product.product" name="product_id" ref="product.product_product_20"/>
+            <field name="multi_level_bom">True</field>
         </record>
         <record id="mrp_bom_8" model="mrp.bom">
             <field name="name">HDD Seagate</field>
@@ -234,6 +242,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field model="product.product" name="product_id" ref="product.product_product_hdd1"/>
+            <field name="multi_level_bom">True</field>
         </record>
         <record id="mrp_bom_9" model="mrp.bom">
             <field name="name">Assembly Basic PC</field>
@@ -243,6 +252,7 @@
             <field name="routing_id" ref="mrp_routing_0"/>
             <field name="type">normal</field>
             <field model="product.product" name="product_id" ref="product.product_product_pc1"/>
+            <field name="multi_level_bom">True</field>
         </record>
         <record id="mrp_bom_10" model="mrp.bom">
             <field name="name">Complete PC with peripherals</field>
@@ -250,6 +260,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field model="product.product" name="product_id" ref="product.product_product_23"/>
+            <field name="multi_level_bom">True</field>
         </record>
         <record id="mrp_bom_11" model="mrp.bom">
             <field name="name">RAM on demand</field>
@@ -258,6 +269,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
             <field model="product.product" name="product_id" ref="product.product_product_23"/>
+            <field name="multi_level_bom">True</field>
         </record>
 
         <record id="mrp_bom_13" model="mrp.bom">
@@ -266,6 +278,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field model="product.product" name="product_id" ref="product.product_product_cpu3"/>
+            <field name="multi_level_bom">True</field>
         </record>
 
         <record id="mrp_bom_kit" model="mrp.bom">
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 3895c10ed9b..9bf7a795b78 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -255,12 +255,12 @@
                         <field name="product_uos" groups="product.group_uos,base.group_extended" widget="selection"/>
                         <field name="product_uos_qty" groups="product.group_uos,base.group_extended" />
                         <newline/>
-                        <field name="multi_level_bom" on_change="onchange_multi_level_bom(multi_level_bom)"/>
+                        <field name="multi_level_bom"/>
                         <field name="type" groups="base.group_extended"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <notebook colspan="4" >
-                        <page string="Components" attrs="{'invisible': [('bom_id','!=',False),('multi_level_bom','=',False)]}">
+                        <page string="Components" attrs="{'invisible': [('multi_level_bom','=',False)]}">
                             <field colspan="4" name="bom_lines" nolabel="1" widget="one2many_list" />
                         </page>
                         <page string="Revisions" groups="base.group_extended" attrs="{'invisible': [('bom_id','!=',False),('multi_level_bom','=',False)]}">
@@ -329,7 +329,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.bom</field>
             <field name="view_type">form</field>
-            <field name="domain">[('bom_id','=',False)]</field>
+            <field name="domain">[('bom_id','=',False),('multi_level_bom','=',True)]</field>
             <field name="search_view_id" ref="view_mrp_bom_filter"/>
         </record>
         <record id="mrp_bom_form_action2" model="ir.actions.act_window">

From e02afffe617553c2213270868c65c4efe46e133e Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 9 Jun 2010 17:24:39 +0530
Subject: [PATCH 045/121] [IMP]: fetchmail: Fetchmail should depend on
 mail_gateway and should not use separate object for history as its achieved
 by mailgate.message

bzr revid: rpa@tinyerp.com-20100609115439-pzh4iquokb64fk2k
---
 addons/fetchmail/__openerp__.py               |  2 +-
 addons/fetchmail/fetchmail.py                 | 12 +---
 addons/fetchmail/fetchmail_view.xml           | 72 ++++++-------------
 addons/fetchmail/security/ir.model.access.csv |  1 -
 4 files changed, 26 insertions(+), 61 deletions(-)

diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py
index a1276c11643..31037cca63f 100644
--- a/addons/fetchmail/__openerp__.py
+++ b/addons/fetchmail/__openerp__.py
@@ -24,7 +24,7 @@
 {
     "name" : "Fetchmail Server",
     "version" : "1.0",
-    "depends" : ["base"],
+    "depends" : ["base", 'mail_gateway'],
     "author" : "Tiny",
     "description": """Fetchmail: 
     * Fetch email from Pop / IMAP server
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 6419cc8a18d..10a51f0f5b2 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -181,7 +181,7 @@ class email_server(osv.osv):
         context.update({
             'server_id':server.id
         })
-        history_pool = self.pool.get('mail.server.history')
+        history_pool = self.pool.get('mailgate.message')
         msg_txt = email.message_from_string(message)
         message_id = msg_txt.get('Message-ID', False)
 
@@ -329,7 +329,7 @@ class email_server(osv.osv):
                 'name': message_id, 
                 'res_id': res_id, 
                 'server_id': server.id, 
-                'note': msg.get('body', msg.get('from')),
+                'description': msg.get('body', msg.get('from')),
                 'ref_id':msg.get('references', msg.get('id')),
                 'type':server.type
             }
@@ -412,17 +412,11 @@ email_server()
 
 class mail_server_history(osv.osv):
 
-    _name = "mail.server.history"
-    _description = "Mail Server History"
+    _inherit = "mailgate.message"
     
     _columns = {
-        'name': fields.char('Message Id', size=256, readonly=True, help="Message Id in Email Server.", select=True),
         'ref_id': fields.char('Referance Id', size=256, readonly=True, help="Message Id in Email Server.", select=True),
-        'res_id': fields.integer("Resource ID", readonly=True, select=True),
         'server_id': fields.many2one('email.server',"Mail Server", readonly=True, select=True),
-        'model_id':fields.related('server_id', 'object_id', type='many2one', relation='ir.model', string='Model', readonly=True, select=True), 
-        'note': fields.text('Notes', readonly=True),
-        'create_date': fields.datetime('Created Date', readonly=True),
         'type':fields.selection([
             ('pop','POP Server'),
             ('imap','IMAP Server'),
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 510b31b6131..330f9fec349 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -103,82 +103,54 @@
             action="action_email_server_tree_imap"
         />
         
-        <record model="ir.ui.view" id="view_mail_server_history_tree">
-            <field name="name">mail.server.history.tree</field>
-            <field name="model">mail.server.history</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Received Mail History">
-                    <field name="server_id" select="1"/>
-                    <field name="create_date" select="1"/>
-                    <field name="model_id"/>
-                    <field name="name" select="1"/>
-                    <field name="ref_id"/>
-                </tree>
-            </field>
-        </record>
-        <record model="ir.ui.view" id="view_email_server_history_form">
-            <field name="name">mail.server.history.form</field>
-            <field name="model">mail.server.history</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Email History">
-                    <group col="6" colspan="4">
+      <record model="ir.ui.view" id="mailgate_message_tree_view">
+                <field name="name">mailgate.message.tree</field>
+                <field name="model">mailgate.message</field>
+                <field name="type">tree</field>
+                <field name="inherit_id" ref="mail_gateway.view_mailgate_message_tree"/>
+                <field name="arch" type="xml">
+                    <field name="user_id" position="after">
                         <field name="server_id" select="1"/>
-                        <field name="create_date" select="1"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator string="Resource Information" colspan="2"/>
-                        <field name="model_id" select="1"/>
-                        <field name="res_id"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator string="Meta Information" colspan="2"/>
-                        <field name="name" select="1"/>
                         <field name="ref_id"/>
-                    </group>
-                    <newline/>
-                    <separator string="Description" colspan="4"/>
-                    <field name="note" colspan="4" nolabel="1"/>
-                </form>
-            </field>
-        </record>
-        
+                    </field>
+                </field>
+            </record>
+
         <act_window 
             context="{'server_id': active_id}"
             domain="[('server_id', '=', active_id)]"
             id="act_server_history" name="Email History"
-            res_model="mail.server.history" src_model="email.server"/>
+            res_model="mailgate.message" src_model="email.server"/>
             
-        <record model="ir.actions.act_window" id="action_email_server_history_tree">
+        <record model="ir.actions.act_window" id="action_mailgate_message_tree">
             <field name="name">Received Email History</field>
-            <field name="res_model">mail.server.history</field>
+            <field name="res_model">mailgate.message</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_mail_server_history_tree"/>
+            <field name="view_id" ref="mailgate_message_tree_view"/>
             <field name="context">{'type':'imap'}</field>
             <field name="domain">[('type','=','imap')]</field>
         </record>
         
         <menuitem 
             parent="menu_action_email_server_tree_imap" 
-            id="menu_action_email_server_history_tree" 
-            action="action_email_server_history_tree"/>
+            id="menu_action_mailgate_message_tree" 
+            action="action_mailgate_message_tree"/>
             
-        <record model="ir.actions.act_window" id="action_email_server_history_tree_pop">
+        <record model="ir.actions.act_window" id="action_mailgate_message_tree_pop">
             <field name="name">Received Email History</field>
-            <field name="res_model">mail.server.history</field>
+            <field name="res_model">mailgate.message</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_mail_server_history_tree"/>
+            <field name="view_id" ref="mailgate_message_tree_view"/>
             <field name="context">{'type':'pop'}</field>
             <field name="domain">[('type','=','pop')]</field>
         </record>
         
         <menuitem 
             parent="menu_action_email_server_tree" 
-            id="menu_action_email_server_history_tree_pop" 
-            action="action_email_server_history_tree_pop"/>
+            id="menu_action_mailgate_message_tree_pop" 
+            action="action_mailgate_message_tree_pop"/>
 
     </data>
 </openerp>
diff --git a/addons/fetchmail/security/ir.model.access.csv b/addons/fetchmail/security/ir.model.access.csv
index 907aa187913..d31fd067485 100644
--- a/addons/fetchmail/security/ir.model.access.csv
+++ b/addons/fetchmail/security/ir.model.access.csv
@@ -1,4 +1,3 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_email_server","email.server","model_email_server",,1,1,1,1
-"access_mail_server_history","mail.server.history","model_mail_server_history",,1,1,1,1
 "access_email_server_tools","email.server.tools","model_email_server_tools",,1,1,1,1

From 118d5545bf2b797378214cd584a09dcbd62cafbb Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Wed, 9 Jun 2010 17:41:21 +0530
Subject: [PATCH 046/121] [IMP] mail_gateway: improve view

bzr revid: hmo@tinyerp.com-20100609121121-0q2ma69ux81jrtsq
---
 addons/mail_gateway/mail_gateway_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
index 436492460eb..0395d9ea643 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="mailgate message">
                     <group colspan="4" col="6">
-	                    <field name="name" required="1" select="1"/>
+	                    <field name="name" string="Subject" required="1" select="1"/>
 	                    <field name="date" required="1" select="1"/>
 	                    <field name="user_id" string="Responsible" select="1"/>
 	                    <field name="partner_id" readonly="1" />
@@ -47,7 +47,7 @@
             <field name="arch" type="xml">
                 <tree string="Mailgateway Message">
                     <field name="date" />
-                    <field name="name" />
+                    <field name="name" string="Subject"/>
                     <field name="email_from" string="From"/>
                     <field name="user_id" string="Responsible"/>
                 </tree>
@@ -60,7 +60,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Mailgateway Message Search">
-                    <field name="name" />
+                    <field name="name" string="Subject"/>
                     <field name="date" />
                     <field name="user_id" />
                     <field name="message_id" />

From d30a81d6fb2f1d21c55ea4c505e43a7b02c462b3 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Wed, 9 Jun 2010 17:48:59 +0530
Subject: [PATCH 047/121] [IMP] sale: Improved yaml for procurement.

bzr revid: uco@tinyerp.com-20100609121859-oz61e713gcdqtw2z
---
 addons/sale/test/sale_procurement.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/sale/test/sale_procurement.yml b/addons/sale/test/sale_procurement.yml
index c9d26baec9f..9879a0abf29 100644
--- a/addons/sale/test/sale_procurement.yml
+++ b/addons/sale/test/sale_procurement.yml
@@ -68,21 +68,21 @@
 -
   I check that one procurement is generated.
 -
-  !python {model: mrp.procurement}: |
+  !python {model: procurement.order}: |
     from tools.translate import _
     proc_ids = self.search(cr, uid, [('state','=','confirmed')])
     assert proc_ids, _('No Procurements!')
 - 
   The scheduler runs.
 -
-  !function {model: mrp.procurement, name: run_scheduler}:
-    - model: mrp.procurement
+  !function {model: procurement.order, name: run_scheduler}:
+    - model: procurement.order
       search: "[('state','=','confirmed')]"
 -
   I check that the procurement for the product table is in exception state.
   As my product's supply method is produce and mrp module is yet not installed.
 -
-  !python {model: mrp.procurement}: |
+  !python {model: procurement.order}: |
     from tools.translate import _
     proc_ids = self.search(cr, uid, [('state','=','exception')])
     assert proc_ids, _('No Procurements are in exception state!')

From b2b048737d6dd067be9cbfbf5dff729c4e9da3c8 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 9 Jun 2010 18:10:06 +0530
Subject: [PATCH 048/121] [IMP]: fetchmail: * If the model for which mails to
 be fetched do not have message_new, we should use basic create method. *
 Improved history maintenance (Put proper data + attachment in history)

bzr revid: rpa@tinyerp.com-20100609124006-84whz7b92fgnmr7e
---
 addons/fetchmail/fetchmail.py | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 10a51f0f5b2..4b798cea9a4 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -282,7 +282,6 @@ class email_server(osv.osv):
                 ref = msg.get('references').split('\r\n')
             else:
                 ref = msg.get('references').split(' ')
-                
             if ref:
                 hids = history_pool.search(cr, uid, [('name','=',ref[0].strip())])
                 if hids:
@@ -306,9 +305,18 @@ class email_server(osv.osv):
             if hasattr(model_pool, 'message_new'):
                 res_id = model_pool.message_new(cr, uid, msg, context)
             else:
-                logger.notifyChannel('imap', netsvc.LOG_WARNING, 'method def message_new is not define in model %s' % (model_pool._name))
-                return False
-            
+                data = {
+                    'name': msg.get('subject'), 
+                    'email_from': msg.get('from'), 
+                    'email_cc': msg.get('cc'),
+                    'user_id': False, 
+                    'description': msg.get('body'), 
+                    'state' : 'draft',
+                }
+                res_id = model_pool.create(cr, uid, data, context=context)
+                logger.notifyChannel('imap', netsvc.LOG_WARNING, 'method def message_new is not define in model %s. Using default method' % (model_pool._name))
+
+            att_ids = []
             if server.attach:
                 for attactment in attachents or []:
                     data_attach = {
@@ -319,19 +327,25 @@ class email_server(osv.osv):
                         'res_model': server.object_id.model,
                         'res_id': res_id,
                     }
-                    self.pool.get('ir.attachment').create(cr, uid, data_attach)
+                    att_ids.append(self.pool.get('ir.attachment').create(cr, uid, data_attach))
             
             if server.action_id:
                 action_pool = self.pool.get('ir.actions.server')
                 action_pool.run(cr, uid, [server.action_id.id], {'active_id':res_id, 'active_ids':[res_id]})
-            
             res = {
-                'name': message_id, 
+                'name': msg.get('subject', 'No subject'), 
+                'message_id': message_id,
+                'date': msg.get('date'),
                 'res_id': res_id, 
+                'email_from': msg.get('from'), 
+                'email_to': msg.get('to'), 
+                'email_cc': msg.get('cc'), 
+                'model': server.object_id.model, 
                 'server_id': server.id, 
                 'description': msg.get('body', msg.get('from')),
                 'ref_id':msg.get('references', msg.get('id')),
-                'type':server.type
+                'type':server.type, 
+                'attachment_ids': [(6, 0, att_ids)]
             }
             his_id = history_pool.create(cr, uid, res)
             

From 7b98c7a4c1d77926828ae17a50d072a563fa8c18 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Wed, 9 Jun 2010 18:38:59 +0530
Subject: [PATCH 049/121] [IMP] Get New Value for action in audittrial

bzr revid: ksa@tinyerp.co.in-20100609130859-4wpkabs0dqw0yecw
---
 addons/audittrail/audittrail.py | 76 ++++++++++++++++++++-------------
 1 file changed, 47 insertions(+), 29 deletions(-)

diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index 015e586c0a2..7c28d6373fb 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -296,6 +296,9 @@ class audittrail_objects_proxy(osv_pool):
             if 'id' in new_value:
                 del new_value['id']
             if not logged_uids or uid in logged_uids:
+                resource_pool = pool.get(model_object.model)
+                resource_name = hasattr(resource_pool,'name_get')
+            if not resource_name:
                 resource_name = pool.get(model_object.model).name_get(cr, uid, [res_id])
                 resource_name = resource_name and resource_name[0][1] or ''
                 vals = {
@@ -406,7 +409,7 @@ class audittrail_objects_proxy(osv_pool):
             return res
         cr.close()
 
-    def log_action(self, db, uid, object, method, fct_src, *args):
+    def action_log(self, db, uid, object, method, fct_src, *args):
         """
         Logging function: This function is performs logging oprations according to method
         @param db: the current database
@@ -417,42 +420,57 @@ class audittrail_objects_proxy(osv_pool):
 
         @return: Returns result as per method of Object proxy
         """
-
         logged_uids = []
         pool = pooler.get_pool(db)
         cr = pooler.get_db(db).cursor()
         obj_ids = pool.get('ir.model').search(cr, uid, [('model', '=', object)])
         model_object = pool.get('ir.model').browse(cr, uid, obj_ids)[0]
-        res_ids = args[0]
-        if not isinstance(res_ids, list):
-            res_ids = [res_ids]
-        else:
-            res_ids = res_ids
 
+        res_id = args[0]
+
+        old_values_text = {}
         old_values = {}
-        for res_id in res_ids:
-            old_values[res_id] = pool.get(model_object.model).read(cr, uid, res_id, [])
+        new_values = {}
+        old_values = pool.get(model_object.model).read(cr, uid, res_id,[])[0]
+        for field in old_values.keys():
+            old_values_text[field] = self.get_value_text(cr, uid, field, old_values[field], model_object)
 
-        for res_id in res_ids:
-            if not logged_uids or uid in logged_uids:
-                resource_name = pool.get(model_object.model).name_get(cr, uid, [res_id])
-                resource_name = resource_name and resource_name[0][1] or ''
-                id = pool.get('audittrail.log').create(cr, uid, {"method": 'action', "object_id": model_object.id, "user_id": uid, "res_id": res_id, "name": resource_name, "method_name": method})
-                lines = []
-                for field in old_values[res_id]:
-                    if old_values[res_id][field]:
-                        line = {
-                              'name': field,
-                              'old_value': old_values[res_id][field],
-                              'old_value_text': self.get_value_text(cr, uid, field, old_values[res_id][field], model_object)
-                              }
-                        lines.append(line)
-                cr.commit()
-                self.create_log_line(cr, uid, id, model_object, lines)
-            res = fct_src(db, uid, object, method, *args)
-            cr.close()
-            return res
+        res = super(audittrail_objects_proxy, self).execute(db, uid, object, method,*args)
+        cr.commit()
+        new_values = pool.get(model_object.model).read(cr, uid, res_id,[])[0]
+
+        resource_pool = pool.get(model_object.model)
+        resource_name = hasattr(resource_pool,'name_get')
+        if not resource_name:
+            resource_name = pool.get(model_object.model).name_get(cr, uid, args[0])
+            resource_name = resource_name and resource_name[0][1] or ''
+        id =args and args[0] and args[0][0]
+        l_id = pool.get('audittrail.log').create(cr, uid, {"method": 'action', "object_id": model_object.id, "user_id": uid, "res_id": id, "name": resource_name, "method_name": method})
+        diff = {}
+        log_line_pool = pool.get('audittrail.log.line')
+        for field in old_values.keys():
+            if old_values[field] == new_values[field]:
+                continue
+            else:
+                diff.update({field: (old_values[field], new_values[field])})
+
+            if model_object._inherits:
+                inherits_ids = pool.get('ir.model').search(cr, uid, [('model', '=', model_object._inherits.keys()[0])])
+                f_id = pool.get('ir.model.fields').search(cr, uid, [('name', '=', field), ('model_id', 'in', (model_object.id, inherits_ids[0]))])
+            else:
+                f_id = pool.get('ir.model.fields').search(cr, uid, [('name', '=', field), ('model_id', '=', model_object.id)])
+            if f_id:
+                fields = pool.get('ir.model.fields').read(cr, uid, f_id)
+                log_line_pool.create(cr, uid, {'field_id': f_id[0], 'log_id': l_id, \
+                                'old_value': str(old_values[field]),\
+                                 'new_value': str(new_values[field]),\
+                                 'old_value_text':str(old_values_text[field]),
+                                 'new_value_text':self.get_value_text(cr, uid, field, new_values[field], model_object),
+                                 })
+        cr.commit()
         cr.close()
+        return res
+
 
     def execute(self, db, uid, object, method, *args, **kw):
         """
@@ -497,7 +515,7 @@ class audittrail_objects_proxy(osv_pool):
 
                     elif field not in ('default_get','read','fields_view_get','fields_get','search','search_count','name_search','name_get','get','request_get', 'get_sc', 'unlink') and (field != 'write' and field != 'create'):
                         if thisrule.log_action:
-                            return self.log_action(db, uid, object, method, fct_src, *args)
+                            return self.action_log(db, uid, object, method, fct_src, *args)
                 return fct_src(db, uid, object, method, *args)
         res = my_fct(db, uid, object, method, *args)
         cr.close()

From b43768931986ad245f285eac36d08c6dce1ea460 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Wed, 9 Jun 2010 18:54:15 +0530
Subject: [PATCH 050/121] [FIX] purchase: Corrected the passing of wrong
 partner_id in purchase order from procurements.

bzr revid: uco@tinyerp.com-20100609132415-ij6m4wqhl3w8ncpr
---
 addons/purchase/purchase.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 08507f9dfac..65d188844ea 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -729,7 +729,7 @@ class procurement_order(osv.osv):
             partner_list = sorted([(partner_id.sequence, partner_id) for partner_id in  procurement.product_id.seller_ids if partner_id])
             partner_rec = partner_list and partner_list[0] and partner_list[0][1] or False
             partner = partner_rec.name or False
-            partner_id = partner_rec.id or False
+            partner_id = partner.id or False
             address_id = partner_obj.address_get(cr, uid, [partner_id], ['delivery'])['delivery']
             pricelist_id = partner.property_product_pricelist_purchase.id
 

From 1b4d31046d3938e77830390860954da3c3753db1 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 9 Jun 2010 19:07:55 +0530
Subject: [PATCH 051/121] [IMP]: mail_gateway: * Put reference_id for message
 reference * Referenced thread_id for mailgate.message object

bzr revid: rpa@tinyerp.com-20100609133755-4jlx6hlmt5d9xsyb
---
 addons/fetchmail/fetchmail.py                 |  1 -
 addons/mail_gateway/mail_gateway.py           |  1 +
 addons/mail_gateway/mail_gateway_view.xml     |  3 ++-
 .../openerp_mailgate/openerp_mailgate.py      | 27 ++++++++++++-------
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 4b798cea9a4..a96f1bf9af9 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -429,7 +429,6 @@ class mail_server_history(osv.osv):
     _inherit = "mailgate.message"
     
     _columns = {
-        'ref_id': fields.char('Referance Id', size=256, readonly=True, help="Message Id in Email Server.", select=True),
         'server_id': fields.many2one('email.server',"Mail Server", readonly=True, select=True),
         'type':fields.selection([
             ('pop','POP Server'),
diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index d5bba205425..03c40b9cefb 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -134,6 +134,7 @@ class mailgate_message(osv.osv):
     _columns = {
         'name':fields.char('Message', size=64), 
         'thread_id':fields.many2one('mailgate.thread', 'Thread'), 
+        'ref_id': fields.char('Reference Id', size=256, readonly=True, help="Message Id in Email Server.", select=True),
         'date': fields.datetime('Date'), 
         'history': fields.boolean('Is History?', required=False), 
         'user_id': fields.many2one('res.users', 'User Responsible', readonly=True), 
diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
index 436492460eb..76862e6207f 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -26,7 +26,8 @@
                                 <separator string="Message Details" colspan="4"/>
                                     <field name="model" readonly="1"/>
                                     <field name="res_id"  readonly="1"/>
-                                <field name="message_id" />
+                                    <field name="message_id" />
+                                    <field name="ref_id" />
                            </group>
 			               <separator string="Description" colspan="4"/>
                             <field name="description" nolabel="1" colspan="4" />
diff --git a/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py b/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
index 4a18d8cb251..de49ddfaccb 100755
--- a/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
+++ b/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
@@ -177,13 +177,19 @@ class email_parser(object):
         s = decode_header(s.replace('\r', '')) 
         return ''.join(map(lambda x:self._to_decode(x[0], [x[1]]), s or []))
     
-    def history(self, model, new_id, msg_id, subject, msg_to, msg_from, body, attach):
+    def history(self, model, new_id, msg_id, ref_id, subject, msg_to, msg_from, body, attach):
+        try:
+            thread_id = self.rpc(model, 'read', new_id, ['thread_id'])['thread_id'][0]
+        except Exception, e:
+            thread_id = None
         msg_data = {
                     'name': subject, 
                     'history': True, 
                     'model': model, 
                     'res_id': new_id, 
+                    'thread_id': thread_id, 
                     'message_id': msg_id, 
+                    'ref_id': ref_id or '', 
                     'user_id': self.rpc.user_id, 
                     'date': time.strftime('%Y-%m-%d %H:%M:%S'), 
                     'email_from': msg_from, 
@@ -228,7 +234,7 @@ class email_parser(object):
             try:
                 self.rpc(self.model, 'history', [new_id], 'Receive', True, msg_to, message['body'], msg_from, False, {'model' : self.model})
             except Exception, e:
-                self.history(self.model, new_id, msg['Message-Id'], msg_subject, msg_to, msg_from, message['body'], att_ids)
+                self.history(self.model, new_id, msg['Message-Id'], msg['References'], msg_subject, msg_to, msg_from, message['body'], att_ids)
         except Exception, e:
             if getattr(e, 'faultCode', '') and 'AccessError' in e.faultCode:
                 e = '\n\nThe Specified user does not have an access to the Model.'
@@ -294,22 +300,23 @@ class email_parser(object):
             return False
         del msg['To']
         msg['To'] = emails[0]
+        msg['Subject'] = 'OpenERP Record-id:' + msg['Subject']
         if len(emails)>1:
             if 'Cc' in msg:
                 del msg['Cc']
             msg['Cc'] = ','.join(emails[1:])
         del msg['Reply-To']
         msg['Reply-To'] = self.email
-        s = smtplib.SMTP(self.smtp_server, self.smtp_port)
-        s.ehlo()
-        s.starttls()
-        s.ehlo()
-        
         if self.smtp_user and self.smtp_password:
+            s = smtplib.SMTP(self.smtp_server, self.smtp_port)
+            s.ehlo()
+            s.starttls()
+            s.ehlo()
             s.login(self.smtp_user, self.smtp_password)
             s.sendmail(self.email, emails, msg.as_string())
-        s.close()
-        return True
+            s.close()
+            return True
+        return False
 
 
     def parse(self, msg):
@@ -319,7 +326,7 @@ class email_parser(object):
         if msg.get('Subject', ''):
             del msg['Subject']
         msg['Subject'] = '['+str(res_id)+'] '+subject
-        msg['Message-Id'] = '<'+str(time.time())+'-openerpcrm-'+str(res_id)+'@'+socket.gethostname()+'>'
+#        msg['Message-Id'] = '<'+str(time.time())+'-openerpcrm-'+str(res_id)+'@'+socket.gethostname()+'>'
 
         mm = [self._decode_header(msg['From']), self._decode_header(msg['To'])]+self._decode_header(msg.get('Cc', '')).split(',')
         msg_mails = map(self.email_get, filter(None, mm))

From 29b06ee78aea21fa6212a56ec05d432ad768f1f0 Mon Sep 17 00:00:00 2001
From: "atp (OpenERP)" <>
Date: Wed, 9 Jun 2010 19:28:21 +0530
Subject: [PATCH 052/121] [IMP] event: improvement

bzr revid: hmo@tinyerp.com-20100609135821-61rfaf9lnqit5aez
---
 addons/event/__init__.py                      |   2 +
 addons/event/__openerp__.py                   |   4 +-
 addons/event/event.py                         | 230 ++++++++------
 addons/event/event_view.xml                   | 294 ++++++++----------
 addons/event/report/__init__.py               |  24 ++
 .../event/report/report_event_registration.py |  83 +++++
 .../report/report_event_registration_view.xml | 117 +++++++
 addons/event/security/ir.model.access.csv     |   1 -
 addons/event/test/test_event.yml              | 239 ++++++++++++++
 .../event_confirm_registration_view.xml       |  22 +-
 addons/event/wizard/event_make_invoice.py     |  64 ++--
 addons/event/wizard/event_registration.py     |  12 +-
 .../event/wizard/event_registration_view.xml  |  25 +-
 .../wizard/event_registrations_partner.py     |   9 +
 .../wizard/event_registrations_partner.xml    |  25 +-
 15 files changed, 827 insertions(+), 324 deletions(-)
 create mode 100644 addons/event/report/__init__.py
 create mode 100644 addons/event/report/report_event_registration.py
 create mode 100644 addons/event/report/report_event_registration_view.xml
 create mode 100644 addons/event/test/test_event.yml

diff --git a/addons/event/__init__.py b/addons/event/__init__.py
index 55915834aa9..7bfc93318eb 100644
--- a/addons/event/__init__.py
+++ b/addons/event/__init__.py
@@ -21,5 +21,7 @@
 
 import event
 import wizard
+import report
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 3e76b9d19a2..61cb62ee600 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -34,7 +34,7 @@
     Note that:
     - You can define new types of events in
                 Events / Configuration / Types of Events
-    - You can access predefined reports about number of registration per event or per event category in :
+    - You can access predefined reports about number of registration per event or per event category in:
                 Events / Reporting
 """,
     'author': 'Tiny',
@@ -43,6 +43,7 @@
     'update_xml': [
         'wizard/event_confirm_registration_view.xml',
         'event_view.xml',
+        'report/report_event_registration_view.xml',
         'event_sequence.xml',
         'security/event_security.xml',
         'security/ir.model.access.csv',
@@ -51,6 +52,7 @@
         'wizard/event_make_invoice_view.xml',
     ],
     'demo_xml': ['event_demo.xml'],
+    'test': ['test/test_event.yml'],
     'installable': True,
     'active': False,
     'certificate': '0083059161581',
diff --git a/addons/event/event.py b/addons/event/event.py
index 1985cf9cc7d..73cab202df6 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -19,30 +19,47 @@
 #
 ##############################################################################
 
+from crm import crm
 from osv import fields, osv
-import time
+from tools.translate import _
 import netsvc
 import pooler
+import time
 import tools
-from tools.translate import _
-from crm import crm
 
 
 class event_type(osv.osv):
+    
+    """ Event Type """
+    
     _name = 'event.type'
-    _description= 'Event type'
+    _description = __doc__
     _columns = {
         'name': fields.char('Event type', size=64, required=True), 
     }
+    
 event_type()
 
 class event(osv.osv):
+    
+    """Event"""
+    
     _name = 'event.event'
-    _description = 'Event'
-    _inherits = {'crm.case.section': 'section_id'}
+    _description = __doc__
+    _inherit = 'crm.case.section'
     _order = 'date_begin'
 
     def copy(self, cr, uid, id, default=None, context=None):
+        
+        """
+        Copy record of Given id
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param id: Id of Event Registration type record.
+        @param context: A standard dictionary for contextual values
+        """
+        
         return super(event, self).copy(cr, uid, id, default={'code': self.pool.get('ir.sequence').get(cr, uid, 'event.event'), 'state': 'draft'})
 
     def button_draft(self, cr, uid, ids, context={}):
@@ -55,16 +72,32 @@ class event(osv.osv):
         return self.write(cr, uid, ids, {'state': 'done'})
 
     def button_confirm(self, cr, uid, ids, context={}):
+        
         for eve in self.browse(cr, uid, ids):
             if eve.mail_auto_confirm:
                 #send reminder that will confirm the event for all the people that were already confirmed
-                reg_ids = self.pool.get('event.registration').search(cr, uid, [('event_id', '=', eve.id), ('state', 'not in', ['draft', 'cancel'])])
+                reg_ids = self.pool.get('event.registration').search(cr, uid, 
+                                                                     [('event_id', '=', eve.id), 
+                                                                      ('state', 'not in', ['draft', 'cancel'])])
                 if reg_ids:
                     self.pool.get('event.registration').mail_user_confirm(cr, uid, reg_ids)
+                    
         return self.write(cr, uid, ids, {'state': 'confirm'})
 
     def _get_register(self, cr, uid, ids, name, args, context=None):
-        res={}
+        
+        """
+        Get Confirm or uncofirm register value. 
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Event registration type's id
+        @param name: List of function fields(register_current and register_prospect).
+        @param context: A standard dictionary for contextual values
+        @return: Dictionary of function fields value. 
+        """
+        
+        res = {}
         for event in self.browse(cr, uid, ids, context):
             res[event.id] = {}
             state = 'draft'
@@ -74,22 +107,35 @@ class event(osv.osv):
                         from event_registration r 
                         where state=%s and event_id=%s"""
 
-            cr.execute(query, (state, event.id, ))
+            cr.execute(query, (state, event.id,))
             res2 = cr.fetchone()
+            
             if res2 and res2[0]:
                 res[event.id][name[0]] = res2[0]
             else:
                 res[event.id][name[0]] = 0
+               
         return res
 
     def write(self, cr, uid, ids, vals, *args, **kwargs):
+        """
+        Writes values in one or several fields.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Event registration type's IDs
+        @param vals: dictionary with values to update.
+        @return: True
+        """
+        
         res = super(event, self).write(cr, uid, ids, vals, *args, **kwargs)
         if 'date_begin' in vals and vals['date_begin']:
             for eve in self.browse(cr, uid, ids):
                 #change the deadlines of the registration linked to this event
-                reg_ids = self.pool.get('event.registration').search(cr, uid, [('event_id', '=', eve.id)])
+                reg_ids = self.pool.get('event.registration').search(cr, uid, 
+                                                                     [('event_id', '=', eve.id)])
                 if reg_ids:
-                    self.pool.get('event.registration').write(cr, uid, reg_ids, {'date_deadline': vals['date_begin']})
+                    self.pool.get('event.registration').write(cr, uid, reg_ids, 
+                                                              {'date_deadline': vals['date_begin']})
 
         #change the description of the registration linked to this event
         if 'mail_auto_confirm' in vals:
@@ -98,17 +144,18 @@ class event(osv.osv):
                     for eve in self.browse(cr, uid, ids):
                         vals['mail_confirm'] = eve.mail_confirm
             else:
-                vals['mail_confirm']=False
+                vals['mail_confirm'] = False
         if 'mail_confirm' in vals:
             for eve in self.browse(cr, uid, ids):
-                reg_ids = self.pool.get('event.registration').search(cr, uid, [('event_id', '=', eve.id)])
+                reg_ids = self.pool.get('event.registration').search(cr, uid, 
+                                                                     [('event_id', '=', eve.id)])
                 if reg_ids:
-                    self.pool.get('event.registration').write(cr, uid, reg_ids, {'description': vals['mail_confirm']})
+                    self.pool.get('event.registration').write(cr, uid, reg_ids, 
+                                                              {'description': vals['mail_confirm']})
         return res
 
     _columns = {
         'type': fields.many2one('event.type', 'Type'), 
-        'section_id': fields.many2one('crm.case.section', 'Case section', required=True), 
         'register_max': fields.integer('Maximum Registrations'), 
         'register_min': fields.integer('Minimum Registrations'), 
         'register_current': fields.function(_get_register, method=True, string='Confirmed Registrations', multi='register_current'), 
@@ -134,8 +181,20 @@ class event(osv.osv):
 event()
 
 class event_registration(osv.osv):
+    
+    """Event Registration"""
 
     def check_confirm(self, cr, uid, ids, context):
+        
+        """
+        Check confirm event register on given id.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Event registration's IDs
+        @param context: A standard dictionary for contextual values
+        @return: Dictionary value which open Confirm registration form.
+        """
+        
         mod_obj = self.pool.get('ir.model.data')
         current_registration = self.browse(cr, uid, [ids[0]])[0]
         total_confirmed = current_registration.event_id.register_current + current_registration.nb_register
@@ -161,6 +220,16 @@ class event_registration(osv.osv):
             }
 
     def _history(self, cr, uid, ids, keyword, history=False, email=False, context={}):
+        
+        """
+        Create value in mailgateway.message model.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Event registration's IDs
+        @param context: A standard dictionary for contextual values
+        @return: True
+        """
+        
         for case in self.browse(cr, uid, ids):
             data = {
                 'name': keyword, 
@@ -183,24 +252,43 @@ class event_registration(osv.osv):
         return True
 
     def create(self, cr, uid, *args, **argv):
+        """ Overrides orm create method.
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param *args: Fields value
+        @return : New created record Id.
+        """
+
         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, [res], 'Created', history=True)
+        
         return res
 
     def write(self, cr, uid, *args, **argv):
+    
         if 'event_id' in args[1]:
             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):
-        reg_ids = self.browse(cr,uid,ids)
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Event Registration's Id.
+        @return : False
+        """
+       
+        reg_ids = self.browse(cr, uid, ids)
         for reg_id in reg_ids:
             src = reg_id.event_id.reply_to or False
             dest = []
@@ -215,7 +303,15 @@ class event_registration(osv.osv):
         return False
 
     def mail_user(self, cr, uid, ids):
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Event Registration's Id.
+        @return : False
+        """
         reg_ids = self.browse(cr, uid, ids)
+        
         for reg_id in reg_ids:
             src = reg_id.event_id.reply_to or False
             dest = []
@@ -234,16 +330,26 @@ class event_registration(osv.osv):
         return False
 
     def _create_invoice_lines(self, cr, uid, ids, vals):
+        
+        """ Create account Invoice line for Registration Id.
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param Ids: List of event registration's Id
+        @param vals: Create fields value
+        @return : New created record Id.
+        """
+        
         return self.pool.get('account.invoice.line').create(cr, uid, vals)
 
     _name= 'event.registration'
-    _description = 'Event Registration'
+    _description = __doc__
     _inherit = 'crm.meeting'
 
     _columns = {
         'email_cc': fields.text('Watchers Emails', size=252 , help="These \
 people will receive a copy of the future communication between partner \
-and users by email"),
+and users by email"), 
         'nb_register': fields.integer('Number of Registration', readonly=True, states={'draft': [('readonly', False)]}), 
         'event_id': fields.many2one('event.event', 'Event Related', required=True), 
         "partner_invoice_id": fields.many2one('res.partner', 'Partner Invoiced'), 
@@ -272,6 +378,7 @@ and users by email"),
     }
 
     def onchange_badge_name(self, cr, uid, ids, badge_name):
+        
         data ={}
         if not badge_name:
             return data
@@ -279,9 +386,11 @@ and users by email"),
         return {'value': data}
 
     def onchange_contact_id(self, cr, uid, ids, contact, partner):
+        
         data ={}
         if not contact:
             return data
+        
         contact_id = self.pool.get('res.partner.contact').browse(cr, uid, contact)
         data['badge_name'] = contact_id.name
         data['badge_title'] = contact_id.title
@@ -298,20 +407,23 @@ and users by email"),
     def onchange_event(self, cr, uid, ids, event_id, partner_invoice_id):
         context={}
         if not event_id:
-            return {'value': {'unit_price': False , 'invoice_label': False }}
+            return {'value': {'unit_price': False, 'invoice_label': False}}
         data_event =  self.pool.get('event.event').browse(cr, uid, event_id)
+        
         if data_event.product_id:
             if not partner_invoice_id:
                 unit_price=self.pool.get('product.product').price_get(cr, uid, [data_event.product_id.id], context=context)[data_event.product_id.id]
-                return {'value': {'unit_price': unit_price , 'invoice_label': data_event.product_id.name}}
+                return {'value': {'unit_price': unit_price, 'invoice_label': data_event.product_id.name}}
             data_partner = self.pool.get('res.partner').browse(cr, uid, partner_invoice_id)
             context.update({'partner_id': data_partner})
             unit_price = self.pool.get('product.product')._product_price(cr, uid, [data_event.product_id.id], False, False, {'pricelist': data_partner.property_product_pricelist.id})[data_event.product_id.id]
-            return {'value': {'unit_price': unit_price , 'invoice_label': data_event.product_id.name}}
+            return {'value': {'unit_price': unit_price, 'invoice_label': data_event.product_id.name}}
+        
         return {'value': {'unit_price': False, 'invoice_label': False}}
 
 
     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:
@@ -334,6 +446,7 @@ and users by email"),
         return {'value': data}
 
     def onchange_partner_invoice_id(self, cr, uid, ids, event_id, partner_invoice_id):
+        
         data={}
         context={}
         data['unit_price']=False
@@ -351,80 +464,9 @@ and users by email"),
             return {'value': data}
         return {'value': data}
 
-    def onchange_categ_id(self, cr, uid, ids, categ, context={}):
-        if not categ:
-            return {'value': {}}
-        cat = self.pool.get('crm.case.categ').browse(cr, uid, categ, context).probability
-        return {'value': {'probability': cat}}
 
 event_registration()
 
 
-
-class report_event_registration(osv.osv):
-    _name = "report.event.registration"
-    _description = "Events on registrations"
-    _auto = False
-    _columns = {
-        'name': fields.char('Event', size=20), 
-        'date_begin': fields.datetime('Beginning date', required=True), 
-        'date_end': fields.datetime('Ending date', required=True), 
-        'draft_state': fields.integer('Draft Registration', size=20), 
-        'confirm_state': fields.integer('Confirm Registration', size=20), 
-        'register_max': fields.integer('Maximum Registrations'), 
-    }
-    def init(self, cr):
-        cr.execute("""
-            create or replace view report_event_registration as (
-                select
-                e.id as id,
-                c.name as name,
-                e.date_begin as date_begin,
-                e.date_end as date_end,
-                (SELECT sum(c.nb_register) FROM event_registration  c  WHERE c.section_id=e.section_id and state in ('draft')) as draft_state,
-                (SELECT sum(c.nb_register) FROM event_registration  c  WHERE c.section_id=e.section_id and state in ('open')) as confirm_state,
-                e.register_max as register_max
-                from
-                event_event e,crm_case_section c
-                where
-                e.section_id=c.id
-                )""")
-
-report_event_registration()
-
-class report_event_type_registration(osv.osv):
-    _name = "report.event.type.registration"
-    _description = "Event type on registration"
-    _auto = False
-    _columns = {
-        'name': fields.char('Event Type', size=20), 
-        'nbevent': fields.integer('Number Of Events'), 
-        'draft_state': fields.integer('Draft Registrations', size=20), 
-        'confirm_state': fields.integer('Confirm Registrations', size=20), 
-        }
-        
-        
-    def init(self, cr):
-        cr.execute("""
-            create or replace view report_event_type_registration as (
-                select
-                count(t.id) as id,
-                t.name as name,
-                (select sum(c.nb_register) from event_registration c, event_event e  where c.section_id=e.section_id and c.state='draft' and e.type=t.id ) as draft_state ,
-                (select sum(c.nb_register) from event_registration c, event_event e  where c.section_id=e.section_id and c.state='open' and e.type=t.id ) as  confirm_state,
-                count(t.id) as nbevent
-                from
-                    event_event e
-                inner join
-                    crm_case_section c1 on (e.section_id=c1.id)
-                inner join
-                    event_type t on (e.type=t.id)
-                group by
-                    t.name,t.id
-
-            )""")
-report_event_type_registration()
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index a238f637dad..201cbff93f0 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -80,17 +80,23 @@
                            <button string="Set To Draft" name="button_draft" states="confirm,cancel,done" type="object" icon="gtk-convert"/>
                         </group>
                     </page>
-                    <page string="Mailing">
+                   <page string="Mailing">
                         <field name="reply_to"/>
-                        <separator string="Auto Registration Email" colspan="4"/>
-                        <field name="mail_auto_registr"/>
-                        <newline/>
-                        <field name="mail_registr" colspan="4"/>
-                        <separator string="Auto Confirmation Email" colspan="4"/>
-                        <field name="mail_auto_confirm"/>
-                        <newline/>
-                        <field name="mail_confirm" colspan="4"/>
                         <newline/>
+                        <group col="3" colspan="2">
+                            <separator string="Auto Registration Email" colspan="2"/>
+                            <newline/>
+                            <field name="mail_auto_registr"/>
+                            <separator string="Registration Email" colspan="2"/>
+                            <field name="mail_registr" colspan="2" nolabel="1"/>
+                        </group>
+                        <group col="2" colspan="2">
+                            <separator string="Auto Confirmation Email" colspan="2"/>
+                            <field name="mail_auto_confirm"/>
+                            <newline/>
+                            <separator string="Confirmation Email" colspan="2"/>
+                            <field name="mail_confirm" colspan="2" nolabel="1"/>
+                        </group>
                     </page>
                     <page string="Statistics">
                         <separator string="Registrations" colspan="4"/>
@@ -103,6 +109,7 @@
         </record>
 
         <!-- event.event tree view -->
+        
         <record model="ir.ui.view" id="view_event_tree">
             <field name="name">event.event.tree</field>
             <field name="model">event.event</field>
@@ -126,20 +133,34 @@
             <field name="arch" type="xml">
                 <search string="Events">
                     <group col="10" colspan="4">
-                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Events"/>
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed Events"/>
                         <separator orientation="vertical"/>
                         <field name="name" string="Event" select="1"/>
-                        <field name="user_id" select="1"/>
+                        <field name="user_id" widget="selection">
+                               <filter icon="terp-partner"
+                                    string="My Events"
+                                    help="My Events"
+                                    domain="[('user_id','=',uid)]"/>
+                        </field>            
                         <field name="date_begin" select="1"/>
                         <field name="state" select="1"/>
                     </group>
+                    <newline/>
+                    <group expand="1" string="Group By..." colspan="4" col="12">
+                        <filter string="Responsible" name="user" icon="terp-partner" context="{'group_by': 'user_id'}"/>
+                        <filter string="Event Type" icon="terp-crm"  context="{'group_by':'type'}"/>
+                        <filter string="state" icon="terp-crm" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Creation" icon="terp-project"
+                            domain="[]" context="{'group_by':'date_begin'}" />
+                    </group>
                 </search>
             </field>
         </record>
 
     <!-- Events Organisation/CONFIGURATION/EVENTS  -->
+    
        <record model="ir.actions.act_window" id="action_event_view">
            <field name="name">Events</field>
            <field name="type">ir.actions.act_window</field>
@@ -155,6 +176,7 @@
     <!-- EVENTS/REGISTRATIONS/EVENTS  -->
 
         <!-- Registration view (form) by _inherits  .................. -->
+        
         <record model="ir.ui.view" id="event_registration_tree">
             <field name="name">event.registration.tree</field>
             <field name="model">event.registration</field>
@@ -189,91 +211,97 @@
                         <field name="unit_price"/>
                     </group>
                     <notebook colspan="4">
-                    <page string="General">
-                        <field name="contact_id" on_change="onchange_contact_id(contact_id, partner_id)" /><newline/>
-                        <field name="email_from"/>
-                        <button name="remind_partner" string="Send Reminder" states="open,pending" type="object" colspan="2" icon="gtk-go-forward"/>
-                        <newline/>
-                        <separator string="Badge" colspan="4"/>
-                        <field name="badge_title"/>
-                        <field name="badge_name" on_change="onchange_badge_name(badge_name)"/>
-                        <field name="badge_partner"/>
-                        <newline/>
-                        <separator string="Status" colspan="4"/>
-                        <group col="8" colspan="4">
-                            <field name="state" select="1" colspan="2"/>
-                            <button name="button_reg_close" string="Registration Invoiced" states="open" type="object" icon="gtk-print"/>
-                            <button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                            <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
-                        </group>
-                    </page>
-                    <page string="Extra Info">
-                        <field name="name" select="1" colspan="4"/>
-                        <field name="id" select="1"/>
-                        <field name="active"/>
-                        <field name="email_cc" colspan="4"/>
-                        <field name="categ_id" on_change="onchange_categ_id(categ_id)"/>
-                        <separator colspan="4" string="Dates"/>
-                        <field name="create_date"/>
-                        <field name="date_closed"/>
-                        <separator colspan="4" string="References"/>
-                        <field name="ref" colspan="4"/>
-                        <field name="ref2" colspan="4"/>
-                    </page>
-                    <page string="History">
-                        <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
-	                        <form string="Communication history">
-                                    <group col="6" colspan="4">
+                        <page string="General">
+                            <field name="contact_id" on_change="onchange_contact_id(contact_id, partner_id)" /><newline/>
+                            <field name="email_from"/>
+                            <button name="remind_partner" string="Send Reminder" states="open,pending" type="object" colspan="2" icon="gtk-go-forward"/>
+                            <newline/>
+                            <separator string="Badge" colspan="4"/>
+                            <field name="badge_title"/>
+                            <field name="badge_name" on_change="onchange_badge_name(badge_name)"/>
+                            <field name="badge_partner"/>
+                            <newline/>
+                            <separator string="Status" colspan="4"/>
+                            <group col="8" colspan="4">
+                                <field name="state" select="1" colspan="2"/>
+                                <button name="button_reg_close" string="Registration Invoiced" states="open" type="object" icon="gtk-print"/>
+                                <button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                                <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                            </group>
+                        </page>
+                        <page string="Payments">
+                            <field name="invoice_label" select="1"/>
+                            <field name="tobe_invoiced" select="1"/>
+                            <field name="invoice_id"/>
+                        </page>
+                        <page string="History">
+                            <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
+                                <form string="Communication history">
+                                        <group col="6" colspan="4">
+                                            <field name="date"/>
+                                            <field name="email_to"/>
+                                            <field name="email_from"/>
+                                        </group>
+                                        <notebook colspan="4">
+                                            <page string="Details">
+                                                <field name="description" colspan="4" nolabel="1"/>
+                                            </page>
+                                            <page string="Attachments">
+                                                <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
+                                            </page>
+                                        </notebook>
+                                        <button colspan="4"
+                                        string="Reply to Last Email"
+                                        name="%(crm.action_crm_send_mail)d"
+                                        context="{'mail':'reply', 'model': 'event.registration'}"
+                                        icon="gtk-undo" type="action" />
+                                    </form>
+                                    <tree string="Communication history">
                                         <field name="date"/>
+                                        <field name="email_from" />
                                         <field name="email_to"/>
-                                        <field name="email_from"/>
-                                    </group>
-                                    <notebook colspan="4">
-                                        <page string="Details">
-                                            <field name="description" colspan="4" nolabel="1"/>
-                                        </page>
-                                        <page string="Attachments">
-                                            <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
-                                        </page>
-                                    </notebook>
-                                    <button colspan="4"
-                                    string="Reply to Last Email"
-                                    name="%(crm.action_crm_send_mail)d"
-                                    context="{'mail':'reply', 'model': 'event.registration'}"
-                                    icon="gtk-undo" type="action" />
-                                </form>
-                                <tree string="Communication history">
+                                        <field name="description"/>
+                                    </tree>
+                                </field>
+                            <field name="log_ids" nolabel="1" colspan="4" mode="tree,form" readonly="1">
+                                <tree string="Actions">
+                                    <separator string="Action Information" colspan="4"/>
+                                    <field name="name"/>
                                     <field name="date"/>
-                                    <field name="email_from" />
-                                    <field name="email_to"/>
-                                    <field name="description"/>
+                                    <field name="user_id"/>
                                 </tree>
+                                <form string="Actions">
+                                    <separator string="Action Information" colspan="4"/>
+                                    <field name="name" colspan="4"/>
+                                    <field name="date"/>
+                                    <field name="user_id"/>
+                                </form>
                             </field>
-                        <field name="log_ids" nolabel="1" colspan="4" mode="tree,form" readonly="1">
-                            <tree string="Actions">
-                                <separator string="Action Information" colspan="4"/>
-                                <field name="name"/>
-                                <field name="date"/>
-                                <field name="user_id"/>
-                            </tree>
-                            <form string="Actions">
-                                <separator string="Action Information" colspan="4"/>
-                                <field name="name" colspan="4"/>
-                                <field name="date"/>
-                                <field name="user_id"/>
-                            </form>
-                        </field>
-                    </page>
-                    <page string="Payments">
-                        <field name="invoice_label" select="1"/>
-                        <field name="tobe_invoiced" select="1"/>
-                        <field name="invoice_id"/>
-                    </page>
+                        </page>
+                        <page string="Extra Info">
+                            <group col="6" colspan="4">
+                                <field name="name" select="1" colspan="6"/>
+                                <newline/>
+                                <field name="categ_id"/>
+                                <field name="id" select="1"/>
+                                <field name="active"/>
+                                <separator colspan="6" string="Watchers Emails" />
+                                <field name="email_cc" colspan="6" nolabel="1"/>
+                            </group>
+                            <separator colspan="4" string="Dates"/>
+                            <field name="create_date"/>
+                            <field name="date_closed"/>
+                            <separator colspan="4" string="References"/>
+                            <field name="ref" colspan="4"/>
+                            <field name="ref2" colspan="4"/>
+                        </page>
                     </notebook>
                 </form>
             </field>
         </record>
 
+<!-- Search view of event registration form-->
+
         <record model="ir.ui.view" id="view_registration_search">
             <field name="name">Registrations</field>
             <field name="model">event.registration</field>
@@ -285,12 +313,18 @@
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Registrations"/>
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','in',('open','done'))]" help="Confirmed Registrations"/>
                         <separator orientation="vertical"/>
-                        <field name="event_id" select="1"/>
-                        <field name="user_id" select="1"/>
-                        <field name="partner_id" select="1"/>
+                        <field name="event_id" widget="selection"/>
+                        <field name="user_id" widget="selection"/>
                         <field name="state" select="1"/>
-                        <field name="invoice_label" select="1"/>
                     </group>
+                    <newline/>    
+                    <group expand="1" string="Group By...">
+                        <filter string="Event" icon="terp-crm" domain="[]" context="{'group_by':'event_id'}"/> 
+                        <filter string="State" icon="terp-crm" domain="[]" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Partner" icon="terp-crm" domain="[]" context="{'group_by':'partner_id'}"/>                        
+                        <filter string="Responsible" name="uid" icon="terp-partner" domain="[]" context="{'group_by':'user_id'}"/>
+                   </group>
                 </search>
             </field>
         </record>
@@ -308,86 +342,6 @@
             name="Registrations"
             id="menu_action_registration" parent="menu_event_main"
             action="action_registration"/>
-
-    <!-- report , event on registration... start -->
-        <record model="ir.ui.view" id="report_event_registration_tree">
-            <field name="name">report.event.registration.tree</field>
-            <field name="model">report.event.registration</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Event on Registration">
-                    <field name="name" select="1"/>
-                    <field name="date_begin" select="1"/>
-                    <field name="date_end"/>
-                    <field name="draft_state"/>
-                    <field name="confirm_state"/>
-                    <field name="register_max"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model ="ir.ui.view" id="report_event_registration_graph">
-            <field name="name">report.event.registration.graph</field>
-            <field name="model">report.event.registration</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Event on Registration" type="bar">
-                    <field name="name"/>
-                    <field name="draft_state" operator="+"/>
-                    <field name="confirm_state" operator="+"/>
-                    <field name="register_max" operator="+"/>
-                </graph>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_event_registration">
-            <field name="name">Events On Registrations</field>
-            <field name="res_model">report.event.registration</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
-        </record>
         <menuitem name="Reporting" id="menu_report_event" parent="menu_marketing_event_main" sequence="20"/>
-        <!--<menuitem parent="menu_report_event" action="action_event_registration" id="menu_report_event_registration"/>-->
-        <menuitem parent="menu_report_event" action="action_event_registration" id="menu_report_event_registration" />
-    <!-- end... -->
-
-
-    <!-- report , event  type on registration... start -->
-        <record model="ir.ui.view" id="report_event_type_registration_tree">
-            <field name="name">report.event.type.registration.tree</field>
-            <field name="model">report.event.type.registration</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Registration By Event Types">
-                    <field name="name" select="1"/>
-                    <field name="nbevent"/>
-                    <field name="draft_state"/>
-                    <field name="confirm_state"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="report_event_type_registration_graph">
-            <field name="name">report.event.type.registration.graph</field>
-            <field name="model">report.event.type.registration</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Registration By Event Types" type="bar">
-                    <field name="name"/>
-                    <field name="draft_state" operator="+"/>
-                    <field name="confirm_state" operator="+"/>
-                </graph>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_event_type_registration">
-            <field name="name">Registration By Event Types</field>
-            <field name="res_model">report.event.type.registration</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-        </record>
-            <menuitem parent="menu_report_event" action="action_event_type_registration" id="menu_report_event_type_registration"/>
-
-    <!-- end...  -->
     </data>
 </openerp>
diff --git a/addons/event/report/__init__.py b/addons/event/report/__init__.py
new file mode 100644
index 00000000000..1c60e2715df
--- /dev/null
+++ b/addons/event/report/__init__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import report_event_registration
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py
new file mode 100644
index 00000000000..d9232136c3a
--- /dev/null
+++ b/addons/event/report/report_event_registration.py
@@ -0,0 +1,83 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import fields, osv
+import tools
+
+class report_event_registration(osv.osv):
+    
+    _name = "report.event.registration"
+    _description = "Events on registrations and Events on type"
+    _auto = False
+    _rec_name = 'date'
+    _columns = {
+        'date': fields.date('Date', readonly=True),
+        'year': fields.char('Year', size=4, readonly=True),
+        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
+            ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
+            ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
+        'day': fields.char('Day', size=128, readonly=True),        
+        'event_id': fields.many2one('event.event', 'Event Related', required=True), 
+        'draft_state': fields.integer(' # No of draft Registration.', size=20), 
+        'confirm_state': fields.integer(' # No of Confirm Registration', size=20), 
+        'register_max': fields.integer('Maximum Registrations'), 
+        'nbevent': fields.integer('Number Of Events'), 
+        'type': fields.many2one('event.type', 'Event Type'),
+        'state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, required=True),
+        'user_id':fields.many2one('res.users', 'Responsible', readonly=True),
+    }
+    _order = 'date desc'
+    def init(self, cr):
+        """
+        initialize the sql view for the event registration
+        cr -- the cursor
+        """
+        cr.execute("""
+         create or replace view report_event_registration as (
+                select
+                e.id as id,
+                c.event_id as event_id,
+                e.date_begin as date,
+                e.user_id as user_id,
+                to_char(e.date_begin, 'YYYY') as year,
+                to_char(e.date_begin, 'MM') as month,
+                to_char(e.date_begin, 'YYYY-MM-DD') as day,
+                count(t.id) as nbevent,
+                t.id as type,
+                (SELECT sum(c.nb_register) FROM event_registration  c  WHERE c.event_id=e.id and t.id=e.type and state in ('draft')) as draft_state,
+                (SELECT sum(c.nb_register) FROM event_registration  c  WHERE c.event_id=e.id and t.id=e.type and state in ('open')) as confirm_state,
+                e.register_max as register_max,
+                e.state as state
+                from
+                event_event e
+                inner join
+                    event_registration c on (e.id=c.event_id)
+                inner join
+                    event_type t on (e.type=t.id)
+               group by
+                    to_char(e.date_begin, 'YYYY'),
+                    to_char(e.date_begin, 'MM'),
+                    t.id, e.id, e.date_begin,
+                    e.register_max, e.type, e.state, c.event_id, e.user_id,
+                    to_char(e.date_begin, 'YYYY-MM-DD')
+                )""")
+
+report_event_registration()
diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
new file mode 100644
index 00000000000..f7a2009020c
--- /dev/null
+++ b/addons/event/report/report_event_registration_view.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0"?>
+<openerp>
+   <data>
+    <!-- report , event on registration... start -->
+        <record model="ir.ui.view" id="report_event_registration_tree">
+            <field name="name">report.event.registration.tree</field>
+            <field name="model">report.event.registration</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Event on Registration">
+                    <field name="date" invisible="1"/>
+                    <field name="user_id" invisible="1"/>
+                    <field name="year" invisible="1"/>
+                    <field name="day" invisible="1"/>
+                    <field name="month" invisible="1"/>
+                    <field name="event_id" invisible="1"/>
+                    <field name="state" invisible="1"/>
+                    <field name="type" invisible="1"/>
+                    <field name="nbevent"/>
+                    <field name="draft_state"/>
+                    <field name="confirm_state"/>
+                    <field name="register_max"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model ="ir.ui.view" id="report_event_registration_graph">
+            <field name="name">report.event.registration.graph</field>
+            <field name="model">report.event.registration</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph  string="Event on Registration" type="bar">
+                    <field name="type"/>
+                    <field name="draft_state" operator="+"/>
+                    <field name="confirm_state" operator="+"/>
+                    <field name="register_max" operator="+"/>
+                    <field group="True"  name="event_id" />
+                    
+                </graph>
+            </field>
+        </record>
+        
+              <!-- Event on Registration search view -->  
+        
+        <record model="ir.ui.view" id="view_report_event_registration_search">
+            <field name="name">.search</field>
+            <field name="model">report.event.registration</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Event on Registration">
+                    <group col="8" colspan="4">
+                    <filter icon="gtk-media-rewind" string="  365 Days  "
+                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
+                        help="Tasks performed in last 365 days"/>
+                    <filter icon="gtk-media-rewind" string="   30 Days   "
+                        name="month"
+                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
+                        help="Tasks performed in last 30 days"/>
+                    <filter icon="gtk-media-rewind"
+                         string="    7 Days    "
+                         separator="1"
+                         domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                         help="Tasks during last 7 days"/>
+                         
+                    <separator orientation="vertical"/>
+                      <filter icon="terp-crm"
+                        string="Draft"
+                        domain="[('state','=','draft')]"/>
+                    <filter icon="terp-crm"
+                        string="Confirm"
+                        domain="[('state', '=', 'confirm')]"/>
+                    <separator orientation="vertical"/>    
+                        <field name="event_id" widget="selection"/>
+
+                         <field name="type" widget="selection"/>
+                         <field name="user_id" widget="selection">
+                            <filter icon="terp-partner"
+                                string="My Events"
+                                help="My Events"
+                                domain="[('user_id','=',uid)]"/>
+                        </field>
+                         <field name="date" />
+                    </group>
+                    <newline/>
+                    <group expand="1" string="Group By..." colspan="4" col="12">
+                        <filter string="User" name="user" icon="terp-partner" context="{'group_by': 'user_id'}"/>
+                        <filter string="Event" name="event" icon="terp-crm" context="{'group_by':'event_id'}"/>
+                        <filter string="Event Type" icon="terp-crm"  context="{'group_by':'type'}"/>
+                        <filter string="state" icon="terp-crm" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical" />
+                        <filter string="Day" icon="terp-crm"
+                            domain="[]" context="{'group_by':'day'}"/>
+                        <filter string="Month" icon="terp-crm"
+                            domain="[]" context="{'group_by':'month'}"/>
+                        <filter string="Year" icon="terp-crm"
+                            domain="[]" context="{'group_by':'year'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+    
+
+        <record  model="ir.actions.act_window" id="action_report_event_registration">
+            <field name="name">Events On Registrations</field>
+            <field name="res_model">report.event.registration</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,graph</field>
+            <field name="search_view_id" ref="view_report_event_registration_search"/>
+            <field name="context">{"search_default_user":1,"search_default_month":1,'group_by_no_leaf':1,'group_by':[]}</field>
+        </record>
+       
+        <!--<menuitem parent="menu_report_event" action="action_event_registration" id="menu_report_event_registration"/>-->
+        <menuitem parent="menu_report_event" action="action_report_event_registration" id="menu_report_event_registration" />
+ 
+    <!-- end...  -->
+    </data>
+</openerp>    
diff --git a/addons/event/security/ir.model.access.csv b/addons/event/security/ir.model.access.csv
index 9eccb065448..6a5f00e2846 100644
--- a/addons/event/security/ir.model.access.csv
+++ b/addons/event/security/ir.model.access.csv
@@ -4,7 +4,6 @@
 "access_event_event","event.event","model_event_event","crm.group_crm_user",1,1,1,1
 "access_event_registration","event.registration","model_event_registration","crm.group_crm_user",1,1,1,1
 "access_report_event_registration","report.event.registration","model_report_event_registration","crm.group_crm_user",1,0,0,0
-"access_report_event_type_registration","report.event.type.registration","model_report_event_type_registration","crm.group_crm_user",1,0,0,0
 "access_event_confirm_registration","event.confirm.registration","model_event_confirm_registration","crm.group_crm_user",1,0,0,0
 "access_event_confirm_registration_manager","event.confirm.registration manager","model_event_confirm_registration","crm.group_crm_manager",1,1,1,1
 "access_event_make_invoice","event.make.invoice","model_event_make_invoice","crm.group_crm_user",1,1,1,1
diff --git a/addons/event/test/test_event.yml b/addons/event/test/test_event.yml
new file mode 100644
index 00000000000..4cf9438cb3d
--- /dev/null
+++ b/addons/event/test/test_event.yml
@@ -0,0 +1,239 @@
+- |
+  In order to test the 'event' module in OpenERP, we create a new event.
+  
+- |
+  Given that I have product "Ticket for Concert".
+- 
+  !record {model: product.product, id: product_product_ticketforconcert0}:
+    categ_id: product.cat1
+    cost_method: standard
+    list_price: 68.0
+    mes_type: fixed
+    name: Ticket for Concert
+    procure_method: make_to_stock
+    standard_price: 15.0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+    volume: 0.0
+    warranty: 0.0
+    weight: 0.0
+    weight_net: 0.0
+  
+- |
+  Given that I have also Event type "Conference".
+-   
+  !record {model: event.type, id: event_type_conference0}:
+     name: Conference
+- |
+  I create partner "Mark Johnson" and and I provide an address to this
+   new customer, as well as an email "info@mycustomer.com".
+- 
+  !record {model: res.partner, id: res_partner_markjohnson0}:
+    address:
+      - city: Bruxelles
+        country_id: base.be
+        job_ids:
+          - contact_id: base_contact.res_partner_contact_jacot0
+            function: CTO
+            name: base.res_partner_maxtor
+            sequence_partner: 0.0
+            state: current
+        street: Rue des Palais 51, bte 33
+        type: default
+        zip: '1000'
+        email: 'info@mycustomer.com'
+    credit_limit: 0.0
+    lang: en_US
+    name: Mark Johnson
+    property_account_payable: account.a_pay
+    property_account_receivable: account.a_recv
+    
+- |
+  we create it with a "Conference on ERP Buisness" event and provide "Beginning date", "Ending Date", "Product" as Concert Ticket.
+-
+  !record {model: event.event, id: event_event_conference0}:
+    code: C/004
+    date_begin: '2010-06-07 13:39:00'
+    date_end: '2010-06-10 13:39:00'
+    name: Conference on ERP Buisness
+    parent_id: event.case_section_event
+    product_id: 'product_product_ticketforconcert0'
+    register_max: 0.0
+    register_min: 0.0
+    state: draft
+    type: 'event_type_conference0'
+    
+- |
+  we  set the limit of registrations to this event using "Minimum Registrations"  2 and "Maximum Registrations" 10
+-   
+  !python {model: event.event}: |
+    self.write(cr, uid, [ref('event_event_conference0')], {'register_max': 10, 'register_min': 2})
+    
+- |
+  We Check that the event is in "Draft" state.
+- 
+  !assert {model: event.event, id: event_event_conference0}:
+     - state == 'draft'
+   
+- |
+  Then we confirm it press on "Confirm Event" button.
+-  
+  !python {model: event.event}: |
+    self.button_confirm(cr, uid, [ref("event_event_conference0")], {"active_ids": [ref("event.menu_event_event")]})
+    
+- |
+  Check that Event is "confirmed" or not. 
+-   
+  !assert {model: event.event, id: event_event_conference0}:
+     - state == 'confirm'
+     
+- |
+  person "Mark Johnson" want to  confirm their registrations. for that 
+  I create New Registration for "Conference on ERP Buisness" event. 
+- 
+  !record {model: event.registration, id: event_registration_registrationjacot0}:
+    badge_name: Jacot
+    badge_partner: Mark Johnson
+    badge_title: M.
+    contact_id: base_contact.res_partner_contact_jacot0
+    date_deadline: '2010-06-07 13:39:00'
+    event_id: event.event_event_conference0
+    invoice_label: Ticket for Concert
+    name: 'Registration: Jacot'
+    partner_id: 'res_partner_markjohnson0'
+    partner_invoice_id: 'res_partner_markjohnson0'
+    unit_price: 68.0
+- |
+  I check that "Number of registration" is less than "Maximum registration" defined in "Conference on ERP Buisness" event.
+  if not then  confirmation will fail because its greater  then the Maximum registration.   
+- 
+  !python {model: event.event}: |
+     obj_register = self.pool.get('event.registration')
+     event_id1 = self.browse(cr, uid, [ref('event_event_conference0')])[0]
+     register_ids = obj_register.search(cr, uid, [('event_id', '=', event_id1.id)])
+     register_id = obj_register.browse(cr, uid, register_ids)[0]
+     assert register_id.nb_register <= event_id1.register_max 
+          
+- |
+  And Confirm that Registration by click on "Confirm Registration" button of Registraion form.     
+- 
+  !python {model: event.registration}: |
+    self.check_confirm(cr, uid, [ref("event_registration_registrationjacot0")], {"active_ids": [ref("event.menu_action_registration")]})
+
+- |
+  one other Person "Zen" also want to confirm their Registraions. so
+  They create New registraion for This event.
+- 
+  !record {model: event.registration, id: event_registration_registrationzen0}:
+    badge_name: Zen
+    badge_partner: China Export
+    contact_id: base_contact.res_partner_contact_zen0
+    date_deadline: '2010-06-07 13:39:00'
+    event_id: event.event_event_conference0
+    invoice_label: Ticket for Concert
+    name: 'Registration: Zen'
+    partner_id: base.res_partner_3
+    partner_invoice_id: base.res_partner_3
+    unit_price: 68.0
+    
+- |
+  And Confirm that Registration by click on "Confirm Registration" button of Registraion form.     
+- 
+  !python {model: event.registration}: |
+    self.check_confirm(cr, uid, [ref("event_registration_registrationzen0")], {"active_ids": [ref("event.menu_action_registration")]})
+
+- |
+  Third person create New Registration for "Conference on ERP Business" event. 
+- 
+  !record {model: event.registration, id: event_registration_registrationpassot0}:
+    badge_name: Passot
+    badge_partner: Mediapole SPRL
+    badge_title: M.
+    contact_id: base_contact.res_partner_contact_passot0
+    date_deadline: '2010-06-07 13:39:00'
+    email_from: info@mediapole.net
+    event_id: 'event_event_conference0'
+    invoice_label: Ticket for Concert
+    name: 'Registration: Passot'
+    partner_id: base.res_partner_8
+    partner_invoice_id: base.res_partner_8
+    unit_price: 68.0
+- |
+  This person cannot Confirm their registration.so I check that state is "Unconfirmed".     
+- 
+  !assert {model: event.registration, id: event_registration_registrationpassot0}:
+     - state == 'draft'
+  
+- |
+  I Check that  the total number of confirmed is 2 and  unconfirmed registrations 1.    
+-
+  !python {model: event.event}: |
+     obj_event = self.browse(cr, uid, [ref('event_event_conference0')])[0]
+     assert  obj_event.register_current == '2'
+     assert obj_event.register_prospect == '1'
+    
+- |
+  We check all registered partners to this event using the wizard "List Register Partners".
+- 
+  !record {model: event.partners.list, id: event_partners_list_0}:
+    {}
+- 
+  I click on "Open Partners" button of "List Register Partners" wizard.
+- 
+  !python {model: event.partners.list}: |
+    self.list_partners(cr, uid, [ref("event_partners_list_0")], {"active_ids":
+      [ref("event.event_event_conference0")]})
+  
+- | 
+  We check all registrations on current event using the wizard "Registrations"
+- 
+  !record {model: event.registration.list, id: event_registration_list_0}:
+    {}
+- | 
+  I click on "Open Registrations" button of  "Registrations" wizard.  
+- 
+  !python {model: event.registration.list}: |
+    self.open_registration(cr, uid, [ref("event_registration_list_0")], {"active_ids": [ref("event.event_event_conference0")]})
+
+- |
+  This event is finished by click on "Event Done" button of this event form.
+- 
+  !python {model: event.event}: |
+    self.button_done(cr, uid, [ref("event.event_event_conference0")], {"active_ids": [ref("event.menu_event_event")] })
+- |
+  We can create invoice if the registration is in "Open" state otherwise it gives the warning to the user.
+  so I check that Registration is in "Open" state before click on "Make Invoices."
+- 
+  !assert {model: event.registration, id: event_registration_registrationjacot0}: 
+     - state == 'open'  
+- |
+  Now, I will invoice the participant who have address using "Make Invoices". This wizard will also give the number of invoices are created and rejected.
+  Create invoice will be linked to Invoice Field available on Payments tab of registrations
+- 
+  !record {model: event.make.invoice, id: event_make_invoice_0}:
+    inv_created: '0'
+    inv_rej_reason: 'ID 1: Registration already has an invoice linked. \n'
+    inv_rejected: '1'
+- |
+  I click on "Open" button of this "Make Invoices" wizard.
+- 
+  !python {model: event.make.invoice}: |
+    self.confirm(cr, uid, [ref("event_make_invoice_0")], {"active_ids": [ref("event_registration_registrationjacot0")]})  
+- |
+  I check  that Invoice for this partner is create or not.
+-
+  !python {model: event.registration}: |
+     obj_event_reg = self.pool.get('event.registration')
+     obj_lines = self.pool.get('account.invoice.line')
+     inv_obj = self.pool.get('account.invoice')
+     data_event_reg = obj_event_reg.browse(cr, uid, [ref('event_registration_registrationzen0')], context=context)[0]
+     invoice_ids = inv_obj.search(cr, uid, [('partner_id', '=', data_event_reg.partner_invoice_id.id)])
+     invoice_id = inv_obj.browse(cr, uid, invoice_ids)
+     if invoice_id:
+        line_ids = obj_lines.search(cr, uid, [('product_id', '=', data_event_reg.event_id.product_id), ('invoice_id', '=', invoice_id.id), ('price_unit', '=', data_event_reg.unit_price)])
+        line_id = obj_lines.browse(cr, uid, line_ids)[0]
+        assert line_id.product_id == data_event_reg.product_id
+        assert data_event_reg.partner_id == invoice_id.partner_id
+        assert invoice_id.address_invoice_id == data_event_reg.partner_address_id
diff --git a/addons/event/wizard/event_confirm_registration_view.xml b/addons/event/wizard/event_confirm_registration_view.xml
index 03733d2045d..049d4f5bb7f 100644
--- a/addons/event/wizard/event_confirm_registration_view.xml
+++ b/addons/event/wizard/event_confirm_registration_view.xml
@@ -2,32 +2,32 @@
 <openerp>
     <data>
 
-    	<record id="view_event_confirm_registration" model="ir.ui.view">
+        <record id="view_event_confirm_registration" model="ir.ui.view">
             <field name="name">Registration Confirmation</field>
             <field name="model">event.confirm.registration</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Registration Confirmation">
-              	<field name="msg"/>
-              	<separator string="" colspan="4"/>
+                  <field name="msg"/>
+                  <separator string="" colspan="4"/>
                 <group colspan="4" col="6">
-            		<button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
-            		<button icon="gtk-ok" name="confirm" string="Confirm Anyway" type="object"/>
+                    <button  icon="gtk-close" special="cancel" string="Close"/>
+                    <button icon="gtk-ok" name="confirm" string="Confirm Anyway" type="object"/>
                 </group>
-			</form>
+            </form>
             </field>
-		</record>
+        </record>
 
-		<record id="action_event_confirm_registration" model="ir.actions.act_window">
+        <record id="action_event_confirm_registration" model="ir.actions.act_window">
             <field name="name">Registrations</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">event.confirm.registration</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="view_id" ref="view_event_confirm_registration"/>
-	        <field name="context">{'record_id' : active_id}</field>
+            <field name="context">{'record_id' : active_id}</field>
             <field name="target">new</field>
-    	</record>
+        </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/event/wizard/event_make_invoice.py b/addons/event/wizard/event_make_invoice.py
index e4eacf99d3c..7a8bcfb489b 100644
--- a/addons/event/wizard/event_make_invoice.py
+++ b/addons/event/wizard/event_make_invoice.py
@@ -27,13 +27,21 @@ class event_make_invoice(osv.osv_memory):
     _name = "event.make.invoice"
     _description = "Event Make Invoice"
     _columns = {
-        'inv_created': fields.char('Invoice Created', size=32, readonly=True),
-        'inv_rejected': fields.char('Invoice Rejected', size=32, readonly=True),
-        'inv_rej_reason': fields.text('Error Messages', readonly=True),
+        'inv_created': fields.char('Invoice Created', size=32, readonly=True), 
+        'inv_rejected': fields.char('Invoice Rejected', size=32, readonly=True), 
+        'inv_rej_reason': fields.text('Error Messages', readonly=True), 
 #        'invoice_ids': fields.char('Invoice Ids', size=128), # Improve me
                }
 
     def _makeInvoices(self, cr, uid, context={}):
+        """
+        Get default value for  fields
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values
+        @return: Dictionary of value
+        """
+        
         invoices = {}
         invoice_ids = []
         create_ids=[]
@@ -45,7 +53,7 @@ class event_make_invoice(osv.osv_memory):
         obj_event_reg = self.pool.get('event.registration')
         obj_lines = self.pool.get('account.invoice.line')
         inv_obj = self.pool.get('account.invoice')
-        data_event_reg = obj_event_reg.browse(cr,uid, context['active_ids'], context=context)
+        data_event_reg = obj_event_reg.browse(cr, uid, context['active_ids'], context=context)
 
         for reg in data_event_reg:
             if reg.state=='draft':
@@ -79,27 +87,27 @@ class event_make_invoice(osv.osv_memory):
                 continue
 
             inv_create = inv_create + 1
-            value = obj_lines.product_id_change(cr, uid, [], reg.event_id.product_id.id,uom =False, partner_id=reg.partner_invoice_id.id, fposition_id=reg.partner_invoice_id.property_account_position.id)
-            data_product = self.pool.get('product.product').browse(cr,uid,[reg.event_id.product_id.id])
+            value = obj_lines.product_id_change(cr, uid, [], reg.event_id.product_id.id, uom =False, partner_id=reg.partner_invoice_id.id, fposition_id=reg.partner_invoice_id.property_account_position.id)
+            data_product = self.pool.get('product.product').browse(cr, uid, [reg.event_id.product_id.id])
             for tax in data_product[0].taxes_id:
                 tax_ids.append(tax.id)
 
             vals = value['value']
             c_name = reg.contact_id and ('-' + self.pool.get('res.partner.contact').name_get(cr, uid, [reg.contact_id.id])[0][1]) or ''
             vals.update({
-                'name': reg.invoice_label + '-' + c_name,
-                'price_unit': reg.unit_price,
-                'quantity': reg.nb_register,
-                'product_id':reg.event_id.product_id.id,
-                'invoice_line_tax_id': [(6, 0, tax_ids)],
+                'name': reg.invoice_label + '-' + c_name, 
+                'price_unit': reg.unit_price, 
+                'quantity': reg.nb_register, 
+                'product_id':reg.event_id.product_id.id, 
+                'invoice_line_tax_id': [(6, 0, tax_ids)], 
             })
             inv_line_ids = obj_event_reg._create_invoice_lines(cr, uid, [reg.id], vals)
 
             val_invoice['value'].update({
-                'origin': reg.invoice_label,
-                'reference': False,
-                'invoice_line': [(6,0,[inv_line_ids])],
-                'comment': "",
+                'origin': reg.invoice_label, 
+                'reference': False, 
+                'invoice_line': [(6, 0, [inv_line_ids])], 
+                'comment': "", 
             })
 
             inv_id = inv_obj.create(cr, uid, val_invoice['value'])
@@ -108,7 +116,7 @@ class event_make_invoice(osv.osv_memory):
             obj_event_reg._history(cr, uid, [reg.id], 'Invoiced', history=True)
 
 #        {'inv_created' : str(inv_create) , 'inv_rejected' : str(inv_reject), 'invoice_ids': str(list_inv), 'inv_rej_reason': inv_rej_reason}
-        return {'inv_created' : str(inv_create) , 'inv_rejected' : str(inv_reject), 'inv_rej_reason': inv_rej_reason}
+        return {'inv_created': str(inv_create), 'inv_rejected': str(inv_reject), 'inv_rej_reason': inv_rej_reason}
 
     def default_get(self, cr, uid, fields_list, context=None):
         res = super(event_make_invoice, self).default_get(cr, uid, fields_list, context)
@@ -116,18 +124,26 @@ class event_make_invoice(osv.osv_memory):
         return res
 
     def confirm(self, cr, uid, ids, context={}):
+        """
+        Open Account invoice form.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of event make invoice's Id.
+        @param context: A standard dictionary for contextual values
+        @return: Dictionary of value
+        """
         obj_model = self.pool.get('ir.model.data')
         data_inv = self.read(cr, uid, ids, [], context)[0]
-        model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','invoice_form')])
-        resource_id = obj_model.read(cr,uid,model_data_ids,fields=['res_id'])[0]['res_id']
+        model_data_ids = obj_model.search(cr, uid, [('model', '=', 'ir.ui.view'), ('name', '=', 'invoice_form')])
+        resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'])[0]['res_id']
         return {
 #            'domain': "[('id','in', ["+','.join(map(str,data_inv['invoice_ids']))+"])]",
-            'name': 'Invoices',
-            'view_type': 'form',
-            'view_mode': 'tree,form',
-            'res_model': 'account.invoice',
-            'views': [(False,'tree'),(resource_id,'form')],
-            'context': "{'type':'out_invoice'}",
+            'name': 'Invoices', 
+            'view_type': 'form', 
+            'view_mode': 'tree,form', 
+            'res_model': 'account.invoice', 
+            'views': [(False, 'tree'), (resource_id, 'form')], 
+            'context': "{'type':'out_invoice'}", 
             'type': 'ir.actions.act_window'
         }
 
diff --git a/addons/event/wizard/event_registration.py b/addons/event/wizard/event_registration.py
index 4803d118610..7640f040a99 100644
--- a/addons/event/wizard/event_registration.py
+++ b/addons/event/wizard/event_registration.py
@@ -23,10 +23,20 @@ from osv import fields, osv
 
 class event_registration_list(osv.osv_memory):
     """ List Event Registration """
+    
     _name = "event.registration.list"
     _description = "List Event Registrations"
 
     def open_registration(self, cr, uid, ids, context={}):
+        """
+        Open Event Registration form
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Event registration list's IDs
+        @param context: A standard dictionary for contextual values
+        @return: Dictionary value which open Event registration form.
+        """
+
         if not context.get('active_id', None):
             return {
             'name': 'Event Registrations',
@@ -37,7 +47,7 @@ class event_registration_list(osv.osv_memory):
             }
 
         return {
-            'domain': [('section_id', '=', context['active_id'])],
+            'domain': [('event_id', '=', context['active_id'])],
             'name': 'Event Registrations',
             'view_type': 'form',
             'view_mode': 'tree,form',
diff --git a/addons/event/wizard/event_registration_view.xml b/addons/event/wizard/event_registration_view.xml
index 5afe437bc0f..7a89628f219 100644
--- a/addons/event/wizard/event_registration_view.xml
+++ b/addons/event/wizard/event_registration_view.xml
@@ -2,30 +2,33 @@
 <openerp>
     <data>
 
-    	<record id="view_event_registration" model="ir.ui.view">
+        <record id="view_event_registration" model="ir.ui.view">
             <field name="name">List Event Registrations</field>
             <field name="model">event.registration.list</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-              <form string="">
-              	<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-            	<button name="open_registration" string="Open Registrations" type="object" icon="gtk-open"/>
-			</form>
+              <form string="Event Registrations">
+                <group colspan="4" col="2">
+                    <separator string="List Event Registrations" colspan="4"/>
+                      <button special="cancel" string="Close" icon="gtk-close"/>
+                    <button name="open_registration" string="Open Registrations" type="object" icon="gtk-open"/>
+                </group>
+            </form>
             </field>
-		</record>
+        </record>
 
-		<record id="action_event_registration" model="ir.actions.act_window">
+        <record id="action_event_registration" model="ir.actions.act_window">
             <field name="name">Registrations</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">event.registration.list</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="view_id" ref="view_event_registration"/>
-	        <field name="context">{'record_id' : active_id}</field>
+            <field name="context">{'record_id' : active_id}</field>
             <field name="target">new</field>
-    	</record>
+        </record>
 
-		<record model="ir.values" id="event_registration_values">
+        <record model="ir.values" id="event_registration_values">
             <field name="model_id" ref="event.model_event_event" />
             <field name="object" eval="1" />
             <field name="name">Event Registrations</field>
@@ -36,4 +39,4 @@
         </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/event/wizard/event_registrations_partner.py b/addons/event/wizard/event_registrations_partner.py
index e8fe43f97e0..5c443e39c1b 100644
--- a/addons/event/wizard/event_registrations_partner.py
+++ b/addons/event/wizard/event_registrations_partner.py
@@ -23,10 +23,19 @@ from tools.translate import _
 
 class event_partners_list(osv.osv_memory):
     """ Event Partners """
+    
     _name = "event.partners.list"
     _description = "List Event Partners"
 
     def list_partners(self, cr, uid, ids, context={}):
+        """
+        Open Event Partner
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Event partners list's IDs
+        @param context: A standard dictionary for contextual values
+        @return: Dictionary value which open Partner  form.
+        """
         obj_reg = self.pool.get('event.registration')
         mod_obj = self.pool.get('ir.model.data')
         list_partner = []
diff --git a/addons/event/wizard/event_registrations_partner.xml b/addons/event/wizard/event_registrations_partner.xml
index c700bde11f9..bc982757435 100644
--- a/addons/event/wizard/event_registrations_partner.xml
+++ b/addons/event/wizard/event_registrations_partner.xml
@@ -2,30 +2,33 @@
 <openerp>
     <data>
 
-    	<record id="view_event_partners" model="ir.ui.view">
+        <record id="view_event_partners" model="ir.ui.view">
             <field name="name">Event Partners</field>
             <field name="model">event.partners.list</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-             	 <form string="Event Partners">
-             	 	<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-            		<button name="list_partners" string="Open Partners" type="object" icon="gtk-open"/>
-			  	 </form>
+                  <form string="Event Partners">
+                      <group colspan="4" col="2">
+                          <separator string="List Registrer Partners" colspan="4"/>
+                          <button special="cancel" string="Close" icon="gtk-close"/>
+                        <button name="list_partners" string="Open Partners" type="object" icon="gtk-open"/>
+                    </group>
+                   </form>
             </field>
-		</record>
+        </record>
 
-		<record id="action_event_partners" model="ir.actions.act_window">
+        <record id="action_event_partners" model="ir.actions.act_window">
             <field name="name">List Register Partners</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">event.partners.list</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="view_id" ref="view_event_partners"/>
-	        <field name="context">{'record_id' : active_id}</field>
+            <field name="context">{'record_id' : active_id}</field>
             <field name="target">new</field>
-    	</record>
+        </record>
 
-		<record model="ir.values" id="event_partner_values">
+        <record model="ir.values" id="event_partner_values">
             <field name="model_id" ref="event.model_event_event" />
             <field name="object" eval="1" />
             <field name="name">Event Partners</field>
@@ -36,4 +39,4 @@
         </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>

From ccd09bcef30411410f4de3d500a2ae0987d86cfc Mon Sep 17 00:00:00 2001
From: "atp (OpenERP)" <>
Date: Wed, 9 Jun 2010 20:30:54 +0530
Subject: [PATCH 053/121] [IMP] membership: improvment

bzr revid: hmo@tinyerp.com-20100609150054-8wqicowhoczpp5d0
---
 addons/membership/__init__.py                 |   1 +
 addons/membership/__openerp__.py              |   2 +
 addons/membership/membership.py               | 245 +++---------------
 addons/membership/membership_view.xml         | 227 ++--------------
 .../wizard/membership_unpaid_invoice.py       |   4 +-
 5 files changed, 62 insertions(+), 417 deletions(-)

diff --git a/addons/membership/__init__.py b/addons/membership/__init__.py
index 4ae17c80e71..7e377bcdace 100644
--- a/addons/membership/__init__.py
+++ b/addons/membership/__init__.py
@@ -21,5 +21,6 @@
 
 import membership
 import wizard
+import report
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/membership/__openerp__.py b/addons/membership/__openerp__.py
index 49297bc010d..1de648ff8e8 100644
--- a/addons/membership/__openerp__.py
+++ b/addons/membership/__openerp__.py
@@ -43,10 +43,12 @@ invoice and send propositions for membership renewal.
         'security/ir.model.access.csv',
         'wizard/membership_invoice_view.xml',
         'membership_view.xml',
+        'report/report_membership_view.xml',
         'wizard/membership_unpaid_invoice_view.xml',
         'process/membership_process.xml'
     ],
     'demo_xml': ['membership_demo.xml'],
+    'test': ['test/test_membership.yml'],             
     'installable': True,
     'active': False,
     'certificate': '0042907796381',
diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index 23f9cd19275..af70c174519 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -221,6 +221,7 @@ class Partner(osv.osv):
     _inherit = 'res.partner'
 
     def _get_partner_id(self, cr, uid, ids, context=None):
+       
         data_inv = self.pool.get('membership.membership_line').browse(cr, uid, ids, context)
         list_partner = []
         for data in data_inv:
@@ -298,55 +299,47 @@ class Partner(osv.osv):
                 res_state = self._membership_state(cr, uid, [partner_data.associate_member.id], name, args, context)
                 res[id] = res_state[partner_data.associate_member.id]
         return res
-
-    def _membership_start(self, cr, uid, ids, name, args, context=None):
-        '''Return the start date of membership'''
+    
+    def _membership_date(self, cr, uid, ids, name, args, context=None):
+        
+        '''Return  date of membership'''
+        
+        name = name[0]
         res = {}
         member_line_obj = self.pool.get('membership.membership_line')
+        
         for partner in self.browse(cr, uid, ids):
+            
             if partner.associate_member:
-                partner_id = partner.associate_member.id
+                 partner_id = partner.associate_member.id
             else:
-                partner_id = partner.id
-            line_id = member_line_obj.search(cr, uid, [('partner', '=', partner_id)],
-                    limit=1, order='date_from')
-            if line_id:
-                res[partner.id] = member_line_obj.read(cr, uid, line_id[0],
-                        ['date_from'])['date_from']
-            else:
-                res[partner.id] = False
-        return res
-
-    def _membership_stop(self, cr, uid, ids, name, args, context=None):
-        '''Return the stop date of membership'''
-        res = {}
-        member_line_obj = self.pool.get('membership.membership_line')
-        for partner in self.browse(cr, uid, ids):
-            cr.execute('select membership_state from res_partner where id=%s', (partner.id,))
-            data_state = cr.fetchall()
-            if partner.associate_member:
-                partner_id = partner.associate_member.id
-            else:
-                partner_id = partner.id
-            line_id = member_line_obj.search(cr, uid, [('partner', '=', partner_id)],
-                    limit=1, order='date_to desc')
-            if line_id:
-                res[partner.id] = member_line_obj.read(cr, uid, line_id[0],
-                        ['date_to'])['date_to']
-            else:
-                res[partner.id] = False
-        return res
-
-    def _membership_cancel(self, cr, uid, ids, name, args, context=None):
-        '''Return the cancel date of membership'''
-        res = {}
-        member_line_obj = self.pool.get('membership.membership_line')
-        for partner in self.browse(cr, uid, ids, context=context):
-            res[partner.id] = False
-            if partner.membership_state == 'canceled':
-                line_id = member_line_obj.search(cr, uid, [('partner', '=', partner.id)],limit=1, order='date_cancel')
+                 partner_id = partner.id
+                    
+            res[partner.id]={
+                             'membership_start': False,
+                             'membership_stop': False,
+                             'membership_cancel': False
+                             }        
+            
+            if name == 'membership_start':
+                line_id = member_line_obj.search(cr, uid, [('partner', '=', partner_id)],
+                            limit=1, order='date_from')
                 if line_id:
-                    res[partner.id] = member_line_obj.read(cr, uid, line_id[0],['date_cancel'])['date_cancel']
+                        res[partner.id]['membership_start'] = member_line_obj.read(cr, uid, line_id[0],
+                                ['date_from'])['date_from']
+
+            if name == 'membership_stop':        
+                line_id1 = member_line_obj.search(cr, uid, [('partner', '=', partner_id)],
+                            limit=1, order='date_to desc')
+                if line_id1:
+                      res[partner.id]['membership_stop'] = member_line_obj.read(cr, uid, line_id1[0],
+                                ['date_to'])['date_to']
+            if name == 'membership_cancel':     
+                if partner.membership_state == 'canceled':
+                    line_id2 = member_line_obj.search(cr, uid, [('partner', '=', partner.id)],limit=1, order='date_cancel')
+                    if line_id2:
+                        res[partner.id]['membership_cancel'] = member_line_obj.read(cr, uid, line_id2[0],['date_cancel'])['date_cancel']
+
         return res
 
     def _get_partners(self, cr, uid, ids, context={}):
@@ -376,17 +369,17 @@ class Partner(osv.osv):
                         }
                     ),
         'membership_start': fields.function(
-                    _membership_start, method=True,
+                    _membership_date, method=True, multi='membeship_start',
                     string = 'Start membership date', type = 'date',
                     store = {
                         'account.invoice':(_get_invoice_partner,['state'], 10),
-                        'membership.membership_line':(_get_partner_id,['state'], 10),
+                        'membership.membership_line':(_get_partner_id,['state'], 10, ),
                         'res.partner':(lambda self,cr,uid,ids,c={}:ids, ['free_member'], 10)
                         }
                     ),
         'membership_stop': fields.function(
-                    _membership_stop, method = True,
-                    string = 'Stop membership date', type = 'date',
+                    _membership_date, method = True,
+                    string = 'Stop membership date', type = 'date', multi='membership_stop',
                     store = {
                         'account.invoice':(_get_invoice_partner,['state'], 10),
                         'membership.membership_line':(_get_partner_id,['state'], 10),
@@ -395,8 +388,8 @@ class Partner(osv.osv):
                     ),
 
         'membership_cancel': fields.function(
-                    _membership_cancel, method = True,
-                    string = 'Cancel membership date', type='date',
+                    _membership_date, method = True,
+                    string = 'Cancel membership date', type='date', multi='membership_cancel',
                     store = {
                         'account.invoice':(_get_invoice_partner,['state'], 11),
                         'membership.membership_line':(_get_partner_id,['state'], 10),
@@ -490,160 +483,6 @@ class Invoice(osv.osv):
         return super(Invoice, self).action_cancel(cr, uid, ids, context)
 Invoice()
 
-
-class ReportPartnerMemberYear(osv.osv):
-    '''Membership by Years'''
-
-    _name = 'report.partner_member.year'
-    _description = __doc__
-    _auto = False
-    _rec_name = 'year'
-    _columns = {
-        'year': fields.char('Year', size='4', readonly=True, select=1),
-        'canceled_number': fields.integer('Canceled', readonly=True),
-        'waiting_number': fields.integer('Waiting', readonly=True),
-        'invoiced_number': fields.integer('Invoiced', readonly=True),
-        'paid_number': fields.integer('Paid', readonly=True),
-        'canceled_amount': fields.float('Canceled', digits=(16, 2), readonly=True),
-        'waiting_amount': fields.float('Waiting', digits=(16, 2), readonly=True),
-        'invoiced_amount': fields.float('Invoiced', digits=(16, 2), readonly=True),
-        'paid_amount': fields.float('Paid', digits=(16, 2), readonly=True),
-        'currency': fields.many2one('res.currency', 'Currency', readonly=True,
-            select=2),
-    }
-
-    def init(self, cr):
-        '''Create the view'''
-        cr.execute("""
-    CREATE OR REPLACE VIEW report_partner_member_year AS (
-        SELECT
-        MIN(id) AS id,
-        COUNT(ncanceled) as canceled_number,
-        COUNT(npaid) as paid_number,
-        COUNT(ninvoiced) as invoiced_number,
-        COUNT(nwaiting) as waiting_number,
-        SUM(acanceled) as canceled_amount,
-        SUM(apaid) as paid_amount,
-        SUM(ainvoiced) as invoiced_amount,
-        SUM(awaiting) as waiting_amount,
-        year,
-        currency
-        FROM (SELECT
-            CASE WHEN ai.state = 'cancel' THEN ml.id END AS ncanceled,
-            CASE WHEN ai.state = 'paid' THEN ml.id END AS npaid,
-            CASE WHEN ai.state = 'open' THEN ml.id END AS ninvoiced,
-            CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
-                THEN ml.id END AS nwaiting,
-            CASE WHEN ai.state = 'cancel'
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS acanceled,
-            CASE WHEN ai.state = 'paid'
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS apaid,
-            CASE WHEN ai.state = 'open'
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS ainvoiced,
-            CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS awaiting,
-            TO_CHAR(ml.date_from, 'YYYY') AS year,
-            ai.currency_id AS currency,
-            MIN(ml.id) AS id
-            FROM membership_membership_line ml
-            JOIN (account_invoice_line ail
-                LEFT JOIN account_invoice ai
-                ON (ail.invoice_id = ai.id))
-            ON (ml.account_invoice_line = ail.id)
-            JOIN res_partner p
-            ON (ml.partner = p.id)
-            GROUP BY TO_CHAR(ml.date_from, 'YYYY'), ai.state,
-            ai.currency_id, ml.id) AS foo
-        GROUP BY year, currency)
-                """)
-
-ReportPartnerMemberYear()
-
-
-class ReportPartnerMemberYearNew(osv.osv):
-    '''New Membership by Years'''
-
-    _name = 'report.partner_member.year_new'
-    _description = __doc__
-    _auto = False
-    _rec_name = 'year'
-    _columns = {
-        'year': fields.char('Year', size='4', readonly=True, select=1),
-        'canceled_number': fields.integer('Canceled', readonly=True),
-        'waiting_number': fields.integer('Waiting', readonly=True),
-        'invoiced_number': fields.integer('Invoiced', readonly=True),
-        'paid_number': fields.integer('Paid', readonly=True),
-        'canceled_amount': fields.float('Canceled', digits=(16, 2), readonly=True),
-        'waiting_amount': fields.float('Waiting', digits=(16, 2), readonly=True),
-        'invoiced_amount': fields.float('Invoiced', digits=(16, 2), readonly=True),
-        'paid_amount': fields.float('Paid', digits=(16, 2), readonly=True),
-        'currency': fields.many2one('res.currency', 'Currency', readonly=True,
-            select=2),
-    }
-
-    def init(self, cursor):
-        '''Create the view'''
-        cursor.execute("""
-        CREATE OR REPLACE VIEW report_partner_member_year_new AS (
-        SELECT
-        MIN(id) AS id,
-        COUNT(ncanceled) AS canceled_number,
-        COUNT(npaid) AS paid_number,
-        COUNT(ninvoiced) AS invoiced_number,
-        COUNT(nwaiting) AS waiting_number,
-        SUM(acanceled) AS canceled_amount,
-        SUM(apaid) AS paid_amount,
-        SUM(ainvoiced) AS invoiced_amount,
-        SUM(awaiting) AS waiting_amount,
-        year,
-        currency
-        FROM (SELECT
-            CASE WHEN ai.state = 'cancel' THEN ml2.id END AS ncanceled,
-            CASE WHEN ai.state = 'paid' THEN ml2.id END AS npaid,
-            CASE WHEN ai.state = 'open' THEN ml2.id END AS ninvoiced,
-            CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
-                THEN ml2.id END AS nwaiting,
-            CASE WHEN ai.state = 'cancel'
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS acanceled,
-            CASE WHEN ai.state = 'paid'
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS apaid,
-            CASE WHEN ai.state = 'open'
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS ainvoiced,
-            CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS awaiting,
-            TO_CHAR(ml2.date_from, 'YYYY') AS year,
-            ai.currency_id AS currency,
-            MIN(ml2.id) AS id
-            FROM (SELECT
-                    partner AS id,
-                    MIN(date_from) AS date_from
-                    FROM membership_membership_line
-                    GROUP BY partner
-                ) AS ml1
-                JOIN membership_membership_line ml2
-                JOIN (account_invoice_line ail
-                    LEFT JOIN account_invoice ai
-                    ON (ail.invoice_id = ai.id))
-                ON (ml2.account_invoice_line = ail.id)
-                ON (ml1.id = ml2.partner AND ml1.date_from = ml2.date_from)
-            JOIN res_partner p
-            ON (ml2.partner = p.id)
-            GROUP BY TO_CHAR(ml2.date_from, 'YYYY'), ai.state,
-            ai.currency_id, ml2.id) AS foo
-        GROUP BY year, currency
-        )
-    """)
-
-ReportPartnerMemberYearNew()
-
 class account_invoice_line(osv.osv):
     _inherit='account.invoice.line'
     
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 2ba81d2c1ee..3b1009963cb 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -39,7 +39,8 @@
                     <field name="membership" colspan="1"/>
                     <field name="active" colspan="1"/>
                     <newline/>
-                    <field name="taxes_id" colspan="4"/>
+                    <separator colspan="4" string="Customer Taxes:"/>
+                    <field name="taxes_id" colspan="4" nolabel="1"/> 
                 </form>
             </field>
         </record>
@@ -110,20 +111,28 @@
                 </tree>
             </field>
         </record>
+        
         <record id="view_res_partner_member_filter" model="ir.ui.view">
             <field name="name">res.partner.select</field>
             <field name="model">res.partner</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <field name="category_id" position="after">
-                    <group col="4" colspan="6">
-                        <filter string="Members" icon="terp-personal" domain="[]" context="{'group_by':'membership_state'}"/>
-                        <separator orientation="vertical"/>
-                        <field name="membership_state"/>
-                    </group>
+                       <filter icon="terp-partner" domain="[('membership_state', '=', 'paid')]" string="Paid Members" />
+                       <filter icon="terp-partner" domain="[('membership_state', '=', 'invoiced')]" string="Invoiced Members" />
+                       <filter icon="terp-partner" domain="[('membership_state', '=', 'waiting')]" string="Future Members" />
+                       <separator orientation="vertical"/>
+                       <field name="membership_state">
+                       <field name="membership_start"/>
+                    </field>
+                    <newline/>
+                   <group expand="1" string="Group By..." position="after">
+                       <filter string="Associate Members" icon="terp-personal" domain="[]" context="{'group_by': 'associate_member'}"/>
+                   </group>     
                </field>
             </field>
         </record>
+        
 
         <record model="ir.actions.act_window" id="action_membership_members">
             <field name="name">Members</field>
@@ -199,7 +208,6 @@
                         </field>
                     </page>
                 </notebook>
-
             </field>
         </record>
 
@@ -208,211 +216,6 @@
             sequence="2"
             id="menu_reporting"/>
 
-        <!-- REPORTING/MEMBERSHIP BY YEAR  -->
-
-
-        <record model="ir.ui.view" id="view_report_partner_member_year_tree1">
-            <field name="name">report.partner_member.year.tree</field>
-            <field name="model">report.partner_member.year</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Membership by Years">
-                    <field name="canceled_number"/>
-                    <field name="waiting_number"/>
-                    <field name="invoiced_number"/>
-                    <field name="paid_number"/>
-                    <field name="year"/>
-                </tree>
-            </field>
-        </record>
-
-
-        <record model="ir.ui.view" id="view_report_partner_member_year_tree2">
-            <field name="name">report.partner_member.year.tree</field>
-            <field name="model">report.partner_member.year</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Membership by Years">
-                    <field name="canceled_amount"/>
-                    <field name="waiting_amount"/>
-                    <field name="invoiced_amount"/>
-                    <field name="paid_amount"/>
-                    <field name="currency"/>
-                    <field name="year"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_report_partner_member_year_graph1">
-            <field name="name">report.partner_member.year.graph1</field>
-            <field name="model">report.partner_member.year</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Membership by Years" type="bar">
-                    <field name="year"/>
-                    <field name="canceled_number"/>
-                    <field name="waiting_number"/>
-                    <field name="invoiced_number"/>
-                    <field name="paid_number"/>
-                </graph>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_report_partner_member_year_graph2">
-            <field name="name">report.partner_member.year.graph2</field>
-            <field name="model">report.partner_member.year</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Membership by Years" type="bar">
-                    <field name="year"/>
-                    <field name="canceled_amount"/>
-                    <field name="waiting_amount"/>
-                    <field name="invoiced_amount"/>
-                    <field name="paid_amount"/>
-                </graph>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_report_partner_member_year_tree">
-            <field name="res_model">report.partner_member.year</field>
-            <field name="view_type">form</field>
-        </record>
-
-        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_tree_view1">
-            <field name="sequence" eval="3"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_report_partner_member_year_tree1"/>
-            <field name="act_window_id" ref="action_report_partner_member_year_tree"/>
-        </record>
-
-
-        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_tree_view4">
-            <field name="sequence" eval="4"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_report_partner_member_year_tree2"/>
-            <field name="act_window_id" ref="action_report_partner_member_year_tree"/>
-        </record>
-
-        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_tree_view2">
-            <field name="sequence" eval="1"/>
-            <field name="view_mode">graph</field>
-            <field name="view_id" ref="view_report_partner_member_year_graph1"/>
-            <field name="act_window_id" ref="action_report_partner_member_year_tree"/>
-        </record>
-
-        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_tree_view3">
-            <field name="sequence" eval="2"/>
-            <field name="view_mode">graph</field>
-            <field name="view_id" ref="view_report_partner_member_year_graph2"/>
-            <field name="act_window_id" ref="action_report_partner_member_year_tree"/>
-        </record>
-
-        <menuitem name="Membership by Years" parent="menu_reporting"
-            action="action_report_partner_member_year_tree"
-            id="menu_report_partner_member_year"/>
-
-
-        <!-- REPORTING/NEW MEMBERSHIP BY YEAR  -->
-
-
-
-        <record model="ir.ui.view" id="view_report_partner_member_year_new_tree1">
-            <field name="name">report.partner_member.year_new.tree</field>
-            <field name="model">report.partner_member.year_new</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="New Membership by Years">
-                    <field name="canceled_number"/>
-                    <field name="waiting_number"/>
-                    <field name="invoiced_number"/>
-                    <field name="paid_number"/>
-                    <field name="year"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_report_partner_member_year_new_tree2">
-            <field name="name">report.partner_member.year_new.tree</field>
-            <field name="model">report.partner_member.year_new</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="New Membership by Years">
-                    <field name="canceled_amount"/>
-                    <field name="waiting_amount"/>
-                    <field name="invoiced_amount"/>
-                    <field name="paid_amount"/>
-                    <field name="currency"/>
-                    <field name="year"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_report_partner_member_year_new_graph1">
-            <field name="name">report.partner_member.year_new.graph1</field>
-            <field name="model">report.partner_member.year_new</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="New Membership by Years" type="bar">
-                    <field name="year"/>
-                    <field name="canceled_number"/>
-                    <field name="waiting_number"/>
-                    <field name="invoiced_number"/>
-                    <field name="paid_number"/>
-                </graph>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_report_partner_member_year_new_graph2">
-            <field name="name">report.partner_member.year_new.graph2</field>
-            <field name="model">report.partner_member.year_new</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="New Membership by Years" type="bar">
-                    <field name="year"/>
-                    <field name="canceled_amount"/>
-                    <field name="waiting_amount"/>
-                    <field name="invoiced_amount"/>
-                    <field name="paid_amount"/>
-                </graph>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_report_partner_member_year_new_tree">
-            <field name="res_model">report.partner_member.year_new</field>
-            <field name="view_type">form</field>
-        </record>
-
-        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_new_tree_view4">
-            <field name="sequence" eval="4"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_report_partner_member_year_new_tree2"/>
-            <field name="act_window_id" ref="action_report_partner_member_year_new_tree"/>
-        </record>
-
-        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_new_tree_view1">
-            <field name="sequence" eval="3"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_report_partner_member_year_new_tree1"/>
-            <field name="act_window_id" ref="action_report_partner_member_year_new_tree"/>
-        </record>
-
-        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_new_tree_view2">
-            <field name="sequence" eval="1"/>
-            <field name="view_mode">graph</field>
-            <field name="view_id" ref="view_report_partner_member_year_new_graph1"/>
-            <field name="act_window_id" ref="action_report_partner_member_year_new_tree"/>
-        </record>
-
-        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_new_tree_view3">
-            <field name="sequence" eval="2"/>
-            <field name="view_mode">graph</field>
-            <field name="view_id" ref="view_report_partner_member_year_new_graph2"/>
-            <field name="act_window_id" ref="action_report_partner_member_year_new_tree"/>
-        </record>
-
-        <menuitem name="New Membership by Years" parent="menu_reporting"
-            action="action_report_partner_member_year_new_tree"
-            id="menu_report_partner_member_year_new"/>
 
 <!-- View for product.product object inherited from product module................ -->
         <record model="ir.ui.view" id="view_product_form_inherit1">
diff --git a/addons/membership/wizard/membership_unpaid_invoice.py b/addons/membership/wizard/membership_unpaid_invoice.py
index 1b9a6ac3464..f403e78c81d 100644
--- a/addons/membership/wizard/membership_unpaid_invoice.py
+++ b/addons/membership/wizard/membership_unpaid_invoice.py
@@ -29,7 +29,7 @@ class member_unpaid_invoice(osv.osv_memory):
         'product': fields.many2one('product.product','Membership product', size=64,required=True, help='Select Membership product'),
                }
 
-    def _invoice_membership(self, cr, uid, ids, context):
+    def invoice_membership(self, cr, uid, ids, context):
         model_obj = self.pool.get('ir.model.data')
         partners = []
         result = model_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
@@ -56,4 +56,4 @@ class member_unpaid_invoice(osv.osv_memory):
 
 member_unpaid_invoice()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From ff1681b22f7b237cb51050aa1b034d55edc4449c Mon Sep 17 00:00:00 2001
From: "atp (OpenERP)" <>
Date: Wed, 9 Jun 2010 20:40:36 +0530
Subject: [PATCH 054/121] [IMP] membership: report, yml

bzr revid: hmo@tinyerp.com-20100609151036-9ynxz71j28y71yb9
---
 addons/membership/report/__init__.py          |  22 ++
 addons/membership/report/report_membership.py | 175 +++++++++++++++
 .../report/report_membership_view.xml         | 211 ++++++++++++++++++
 addons/membership/test/test_membership.yml    | 115 ++++++++++
 4 files changed, 523 insertions(+)
 create mode 100644 addons/membership/report/__init__.py
 create mode 100644 addons/membership/report/report_membership.py
 create mode 100644 addons/membership/report/report_membership_view.xml
 create mode 100644 addons/membership/test/test_membership.yml

diff --git a/addons/membership/report/__init__.py b/addons/membership/report/__init__.py
new file mode 100644
index 00000000000..dd247c52f3a
--- /dev/null
+++ b/addons/membership/report/__init__.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import report_membership
diff --git a/addons/membership/report/report_membership.py b/addons/membership/report/report_membership.py
new file mode 100644
index 00000000000..50273fbace4
--- /dev/null
+++ b/addons/membership/report/report_membership.py
@@ -0,0 +1,175 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import fields, osv
+import tools
+
+
+class ReportPartnerMemberYear(osv.osv):
+    '''Membership by Years'''
+
+    _name = 'report.partner_member.year'
+    _description = __doc__
+    _auto = False
+    _rec_name = 'year'
+    _columns = {
+        'year': fields.char('Year', size='4', readonly=True, select=1),
+        'canceled_number': fields.integer('Canceled', readonly=True),
+        'waiting_number': fields.integer('Waiting', readonly=True),
+        'invoiced_number': fields.integer('Invoiced', readonly=True),
+        'paid_number': fields.integer('Paid', readonly=True),
+        'canceled_amount': fields.float('Canceled', digits=(16, 2), readonly=True),
+        'waiting_amount': fields.float('Waiting', digits=(16, 2), readonly=True),
+        'invoiced_amount': fields.float('Invoiced', digits=(16, 2), readonly=True),
+        'paid_amount': fields.float('Paid', digits=(16, 2), readonly=True),
+        'currency': fields.many2one('res.currency', 'Currency', readonly=True,
+            select=2),
+    }
+
+    def init(self, cr):
+        '''Create the view'''
+        cr.execute("""
+    CREATE OR REPLACE VIEW report_partner_member_year AS (
+        SELECT
+        MIN(id) AS id,
+        COUNT(ncanceled) as canceled_number,
+        COUNT(npaid) as paid_number,
+        COUNT(ninvoiced) as invoiced_number,
+        COUNT(nwaiting) as waiting_number,
+        SUM(acanceled) as canceled_amount,
+        SUM(apaid) as paid_amount,
+        SUM(ainvoiced) as invoiced_amount,
+        SUM(awaiting) as waiting_amount,
+        year,
+        currency
+        FROM (SELECT
+            CASE WHEN ai.state = 'cancel' THEN ml.id END AS ncanceled,
+            CASE WHEN ai.state = 'paid' THEN ml.id END AS npaid,
+            CASE WHEN ai.state = 'open' THEN ml.id END AS ninvoiced,
+            CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
+                THEN ml.id END AS nwaiting,
+            CASE WHEN ai.state = 'cancel'
+                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
+            ELSE 0 END AS acanceled,
+            CASE WHEN ai.state = 'paid'
+                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
+            ELSE 0 END AS apaid,
+            CASE WHEN ai.state = 'open'
+                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
+            ELSE 0 END AS ainvoiced,
+            CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
+                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
+            ELSE 0 END AS awaiting,
+            TO_CHAR(ml.date_from, 'YYYY') AS year,
+            ai.currency_id AS currency,
+            MIN(ml.id) AS id
+            FROM membership_membership_line ml
+            JOIN (account_invoice_line ail
+                LEFT JOIN account_invoice ai
+                ON (ail.invoice_id = ai.id))
+            ON (ml.account_invoice_line = ail.id)
+            JOIN res_partner p
+            ON (ml.partner = p.id)
+            GROUP BY TO_CHAR(ml.date_from, 'YYYY'), ai.state,
+            ai.currency_id, ml.id) AS foo
+        GROUP BY year, currency)
+                """)
+ReportPartnerMemberYear()
+
+class ReportPartnerMemberYearNew(osv.osv):
+    '''New Membership by Years'''
+
+    _name = 'report.partner_member.year_new'
+    _description = __doc__
+    _auto = False
+    _rec_name = 'year'
+    _columns = {
+        'year': fields.char('Year', size='4', readonly=True, select=1),
+        'canceled_number': fields.integer('Canceled', readonly=True),
+        'waiting_number': fields.integer('Waiting', readonly=True),
+        'invoiced_number': fields.integer('Invoiced', readonly=True),
+        'paid_number': fields.integer('Paid', readonly=True),
+        'canceled_amount': fields.float('Canceled', digits=(16, 2), readonly=True),
+        'waiting_amount': fields.float('Waiting', digits=(16, 2), readonly=True),
+        'invoiced_amount': fields.float('Invoiced', digits=(16, 2), readonly=True),
+        'paid_amount': fields.float('Paid', digits=(16, 2), readonly=True),
+        'currency': fields.many2one('res.currency', 'Currency', readonly=True,
+            select=2),
+    }
+
+    def init(self, cursor):
+        '''Create the view'''
+        cursor.execute("""
+        CREATE OR REPLACE VIEW report_partner_member_year_new AS (
+        SELECT
+        MIN(id) AS id,
+        COUNT(ncanceled) AS canceled_number,
+        COUNT(npaid) AS paid_number,
+        COUNT(ninvoiced) AS invoiced_number,
+        COUNT(nwaiting) AS waiting_number,
+        SUM(acanceled) AS canceled_amount,
+        SUM(apaid) AS paid_amount,
+        SUM(ainvoiced) AS invoiced_amount,
+        SUM(awaiting) AS waiting_amount,
+        year,
+        currency
+        FROM (SELECT
+            CASE WHEN ai.state = 'cancel' THEN ml2.id END AS ncanceled,
+            CASE WHEN ai.state = 'paid' THEN ml2.id END AS npaid,
+            CASE WHEN ai.state = 'open' THEN ml2.id END AS ninvoiced,
+            CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
+                THEN ml2.id END AS nwaiting,
+            CASE WHEN ai.state = 'cancel'
+                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
+            ELSE 0 END AS acanceled,
+            CASE WHEN ai.state = 'paid'
+                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
+            ELSE 0 END AS apaid,
+            CASE WHEN ai.state = 'open'
+                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
+            ELSE 0 END AS ainvoiced,
+            CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
+                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
+            ELSE 0 END AS awaiting,
+            TO_CHAR(ml2.date_from, 'YYYY') AS year,
+            ai.currency_id AS currency,
+            MIN(ml2.id) AS id
+            FROM (SELECT
+                    partner AS id,
+                    MIN(date_from) AS date_from
+                    FROM membership_membership_line
+                    GROUP BY partner
+                ) AS ml1
+                JOIN membership_membership_line ml2
+                JOIN (account_invoice_line ail
+                    LEFT JOIN account_invoice ai
+                    ON (ail.invoice_id = ai.id))
+                ON (ml2.account_invoice_line = ail.id)
+                ON (ml1.id = ml2.partner AND ml1.date_from = ml2.date_from)
+            JOIN res_partner p
+            ON (ml2.partner = p.id)
+            GROUP BY TO_CHAR(ml2.date_from, 'YYYY'), ai.state,
+            ai.currency_id, ml2.id) AS foo
+        GROUP BY year, currency
+        )
+    """)
+
+ReportPartnerMemberYearNew()
\ No newline at end of file
diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml
new file mode 100644
index 00000000000..6f15636847b
--- /dev/null
+++ b/addons/membership/report/report_membership_view.xml
@@ -0,0 +1,211 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <!-- REPORTING/MEMBERSHIP BY YEAR  -->
+
+
+        <record model="ir.ui.view" id="view_report_partner_member_year_tree1">
+            <field name="name">report.partner_member.year.tree</field>
+            <field name="model">report.partner_member.year</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Membership by Years">
+                    <field name="canceled_number"/>
+                    <field name="waiting_number"/>
+                    <field name="invoiced_number"/>
+                    <field name="paid_number"/>
+                    <field name="year"/>
+                </tree>
+            </field>
+        </record>
+
+
+        <record model="ir.ui.view" id="view_report_partner_member_year_tree2">
+            <field name="name">report.partner_member.year.tree</field>
+            <field name="model">report.partner_member.year</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Membership by Years">
+                    <field name="canceled_amount"/>
+                    <field name="waiting_amount"/>
+                    <field name="invoiced_amount"/>
+                    <field name="paid_amount"/>
+                    <field name="currency"/>
+                    <field name="year"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_report_partner_member_year_graph1">
+            <field name="name">report.partner_member.year.graph1</field>
+            <field name="model">report.partner_member.year</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Membership by Years" type="bar">
+                    <field name="year"/>
+                    <field name="canceled_number"/>
+                    <field name="waiting_number"/>
+                    <field name="invoiced_number"/>
+                    <field name="paid_number"/>
+                </graph>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_report_partner_member_year_graph2">
+            <field name="name">report.partner_member.year.graph2</field>
+            <field name="model">report.partner_member.year</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Membership by Years" type="bar">
+                    <field name="year"/>
+                    <field name="canceled_amount"/>
+                    <field name="waiting_amount"/>
+                    <field name="invoiced_amount"/>
+                    <field name="paid_amount"/>
+                </graph>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="action_report_partner_member_year_tree">
+            <field name="res_model">report.partner_member.year</field>
+            <field name="view_type">form</field>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_tree_view1">
+            <field name="sequence" eval="3"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_report_partner_member_year_tree1"/>
+            <field name="act_window_id" ref="action_report_partner_member_year_tree"/>
+        </record>
+
+
+        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_tree_view4">
+            <field name="sequence" eval="4"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_report_partner_member_year_tree2"/>
+            <field name="act_window_id" ref="action_report_partner_member_year_tree"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_tree_view2">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_report_partner_member_year_graph1"/>
+            <field name="act_window_id" ref="action_report_partner_member_year_tree"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_tree_view3">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_report_partner_member_year_graph2"/>
+            <field name="act_window_id" ref="action_report_partner_member_year_tree"/>
+        </record>
+
+        <menuitem name="Membership by Years" parent="menu_reporting"
+            action="action_report_partner_member_year_tree"
+            id="menu_report_partner_member_year"/>
+
+
+        <!-- REPORTING/NEW MEMBERSHIP BY YEAR  -->
+
+
+
+        <record model="ir.ui.view" id="view_report_partner_member_year_new_tree1">
+            <field name="name">report.partner_member.year_new.tree</field>
+            <field name="model">report.partner_member.year_new</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="New Membership by Years">
+                    <field name="canceled_number"/>
+                    <field name="waiting_number"/>
+                    <field name="invoiced_number"/>
+                    <field name="paid_number"/>
+                    <field name="year"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_report_partner_member_year_new_tree2">
+            <field name="name">report.partner_member.year_new.tree</field>
+            <field name="model">report.partner_member.year_new</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="New Membership by Years">
+                    <field name="canceled_amount"/>
+                    <field name="waiting_amount"/>
+                    <field name="invoiced_amount"/>
+                    <field name="paid_amount"/>
+                    <field name="currency"/>
+                    <field name="year"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_report_partner_member_year_new_graph1">
+            <field name="name">report.partner_member.year_new.graph1</field>
+            <field name="model">report.partner_member.year_new</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="New Membership by Years" type="bar">
+                    <field name="year"/>
+                    <field name="canceled_number"/>
+                    <field name="waiting_number"/>
+                    <field name="invoiced_number"/>
+                    <field name="paid_number"/>
+                </graph>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_report_partner_member_year_new_graph2">
+            <field name="name">report.partner_member.year_new.graph2</field>
+            <field name="model">report.partner_member.year_new</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="New Membership by Years" type="bar">
+                    <field name="year"/>
+                    <field name="canceled_amount"/>
+                    <field name="waiting_amount"/>
+                    <field name="invoiced_amount"/>
+                    <field name="paid_amount"/>
+                </graph>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="action_report_partner_member_year_new_tree">
+            <field name="res_model">report.partner_member.year_new</field>
+            <field name="view_type">form</field>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_new_tree_view4">
+            <field name="sequence" eval="4"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_report_partner_member_year_new_tree2"/>
+            <field name="act_window_id" ref="action_report_partner_member_year_new_tree"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_new_tree_view1">
+            <field name="sequence" eval="3"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_report_partner_member_year_new_tree1"/>
+            <field name="act_window_id" ref="action_report_partner_member_year_new_tree"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_new_tree_view2">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_report_partner_member_year_new_graph1"/>
+            <field name="act_window_id" ref="action_report_partner_member_year_new_tree"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_new_tree_view3">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_report_partner_member_year_new_graph2"/>
+            <field name="act_window_id" ref="action_report_partner_member_year_new_tree"/>
+        </record>
+
+        <menuitem name="New Membership by Years" parent="menu_reporting"
+            action="action_report_partner_member_year_new_tree"
+            id="menu_report_partner_member_year_new"/>
+
+    </data>
+</openerp>            
\ No newline at end of file
diff --git a/addons/membership/test/test_membership.yml b/addons/membership/test/test_membership.yml
new file mode 100644
index 00000000000..5a67ea7f476
--- /dev/null
+++ b/addons/membership/test/test_membership.yml
@@ -0,0 +1,115 @@
+- |  
+  In Order to test the Membership in OpenERP, which allows us to manage all operations for managing memberships.
+- |
+  We have to create "Membership Products" to make it available for partner or customer to make membership with it.
+  select product type   to "service" type and membership field is ticked to visible this product while creating membership for the partner.
+- 
+  !record {model: product.product, id: product_product_membershipproduct0}:
+    categ_id: product.cat1
+    membership: 1
+    membership_date_from: '2009-06-01'
+    membership_date_to: '2010-06-01'
+    name: Membership Products
+    type: service
+    list_price: 80.00
+    
+- |
+  I create new member "Mark Johnson" and I provide an address to this
+  new customer, as well as an email "info@mycustomer.com".
+- 
+  !record {model: res.partner, id: res_partner_markjohnson0}:
+    address:
+      - city: paris
+        country_id: base.fr
+        name: Arthur Grosbonnet
+        street: 1 rue Rockfeller
+        title: M.
+        type: default
+        zip: '75016'
+    credit_limit: 0.0
+    membership_amount: 0.0
+    name: Mark Johnson
+    property_account_payable: account.a_pay
+    property_account_receivable: account.a_recv
+
+- |
+  I check that "Current membership state" is set to "Non Member". 
+- 
+  !assert {model: res.partner, id: res_partner_markjohnson0}:
+      - membership_state == 'none'
+- |  
+  I can make it a Free member by selecting the "Free member" check box.
+- 
+  !record {model: res.partner, id: membership.res_partner_markjohnson0}:
+    free_member: 1
+- |
+  Now, I create Membership Invoices using wizard available on partner and  Select Membership Product.
+- 
+  !record {model: membership.invoice, id: membership_invoice_0}:
+    product_id: membership.product_product_membershipproduct0
+- |
+  I check that address is  defined or not  for this Member.   
+- 
+  !python {model: membership.invoice}: |
+      partner_ids = [ref('res_partner_markjohnson0')]
+      addre_obj = self.pool.get('res.partner.address')
+      ids = addre_obj.search(cr, uid, [('partner_id', '=', partner_ids)])
+         
+      addre_id = addre_obj.browse(cr, uid, ids)[0]
+      assert addre_id.partner_id
+      assert addre_id.id
+      assert addre_id.type    
+    
+- |
+  I click on "Confirm" button of this wizard. 
+- 
+  !python {model: membership.invoice}: |
+    self.membership_invoice(cr, uid, [ref("membership_invoice_0")], {"active_ids": [ref("membership.res_partner_markjohnson0")]})
+
+- |
+  I check that Invoice is created for this members.
+-
+  !python {model: res.partner}: |
+        invoice_obj = self.pool.get('account.invoice')
+        partner_obj = self.pool.get('res.partner')
+        product_obj = self.pool.get('product.product')
+        invoice_line_obj = self.pool.get(('account.invoice.line'))
+        
+        partner_id = self.browse(cr, uid, [ref('res_partner_markjohnson0')])[0]
+        ids = invoice_obj.search(cr, uid, [('partner_id', '=', partner_id.id), ('account_id', '=', partner_id.property_account_receivable.id)])
+        invoice_id = invoice_obj.browse(cr, uid, ids)[0]
+        
+        product = product_obj.browse(cr, uid, [ref('product_product_membershipproduct0')], context=context)[0]        
+        line_ids = invoice_line_obj.search(cr, uid, [('product_id', '=', product.id), ('invoice_id', '=', invoice_id.id)])
+        line_id = invoice_line_obj.browse(cr, uid, line_ids)[0]
+         
+        assert line_id.product_id.id == product.id
+        assert  invoice_id.partner_id.id == partner_id.id
+         
+- |
+  I check that the "Current membership state" will remain same untill opening the invoice.
+-
+  !assert {model: res.partner, id: res_partner_markjohnson0}:
+     - membership_state == 'free'  
+  
+- |
+  "Current membership state" of any member depends on the state of invoice.
+  So, I check that  invoice is in draft state then the "membership state" of a member is "Waiting member".
+-
+  !python {model: membership.membership_line}: |
+        partner_id = self.pool.get('res.partner').browse(cr, uid, [ref('res_partner_markjohnson0')])[0]
+        ids = self.search(cr, uid, [('partner', '=', partner_id.id)])
+        current_id = self.browse(cr, uid, ids)[0]
+              
+        partner_obj = self.pool.get('res.partner')
+        inv_obj = self.pool.get('account.invoice')
+        
+        ids = inv_obj.search(cr, uid, [('partner_id', '=', partner_id.id), ('account_id', '=', partner_id.property_account_receivable.id)])
+        inv_id = inv_obj.browse(cr, uid, ids)[0]
+        if inv_id.state == 'draft':
+            assert current_id == 'waiting'
+- |
+  When the invoice is in open state it become Invoiced Member, When the invoice is in paid state the same "Current membership state" changed to Paid Member. 
+  Now, If we cancel the invoice "Current membership state" changed to Cancel Member.           
+            
+            
\ No newline at end of file

From 89000304744c2d1fa7b0410029d55331aa087c30 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Wed, 9 Jun 2010 21:00:30 +0530
Subject: [PATCH 055/121] [IMP]sale_crm: convert make sale order winzard into
 osv_memory

bzr revid: hmo@tinyerp.com-20100609153030-mhp8hzp9f0ennmuv
---
 addons/sale_crm/__openerp__.py                |   2 +-
 addons/sale_crm/sale_crm_view.xml             |   2 +-
 addons/sale_crm/sale_crm_wizard.xml           |  14 --
 addons/sale_crm/wizard/__init__.py            |   2 +-
 addons/sale_crm/wizard/crm_make_sale.py       | 180 ++++++++++++++++++
 addons/sale_crm/wizard/crm_make_sale_view.xml |  43 +++++
 addons/sale_crm/wizard/makesale.py            | 179 -----------------
 7 files changed, 226 insertions(+), 196 deletions(-)
 delete mode 100644 addons/sale_crm/sale_crm_wizard.xml
 create mode 100644 addons/sale_crm/wizard/crm_make_sale.py
 create mode 100644 addons/sale_crm/wizard/crm_make_sale_view.xml
 delete mode 100644 addons/sale_crm/wizard/makesale.py

diff --git a/addons/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py
index 9464db91b6f..49f867ee79d 100644
--- a/addons/sale_crm/__openerp__.py
+++ b/addons/sale_crm/__openerp__.py
@@ -38,7 +38,7 @@ crm modules.
     'website': 'http://www.openerp.com',
     'depends': ['sale', 'crm'],
     'init_xml': [],
-    'update_xml': ['sale_crm_wizard.xml',
+    'update_xml': ['wizard/crm_make_sale_view.xml',
                    'sale_crm_view.xml',
                    'process/sale_crm_process.xml',
                    'security/sale_crm_security.xml',
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index bf5f1aaac52..ad7b1e2485a 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -9,7 +9,7 @@
         <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
         <field name="arch" type="xml">
             <field name="priority" position="after">
-                <button string="Create a Sale Order" icon="terp-sale" name="%(sale_crm_wizard)d" type="action"/>
+                <button string="Create a Sale Order" icon="terp-sale" name="%(action_crm_make_sale)d" type="action"/>
                 <label colspan="2"  string=""/>
             </field>
         </field>
diff --git a/addons/sale_crm/sale_crm_wizard.xml b/addons/sale_crm/sale_crm_wizard.xml
deleted file mode 100644
index 74dcf06e901..00000000000
--- a/addons/sale_crm/sale_crm_wizard.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-    <data>
-
-        <wizard
-            string="Make Quotation"
-            model="crm.opportunity"
-            name="crm.opportunity.make_order"
-            keyword="client_action_multi"
-            multi="True"
-            id="sale_crm_wizard"/>
-        
-    </data>
-</openerp>
diff --git a/addons/sale_crm/wizard/__init__.py b/addons/sale_crm/wizard/__init__.py
index 87048a13fc4..04f40c92207 100644
--- a/addons/sale_crm/wizard/__init__.py
+++ b/addons/sale_crm/wizard/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import makesale
+import crm_make_sale
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
new file mode 100644
index 00000000000..f53ce3d24d5
--- /dev/null
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -0,0 +1,180 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+from mx.DateTime import now
+
+
+class crm_make_sale(osv.osv_memory):
+    """ Make sale  order for crm """
+
+    _name = "crm.make.sale"
+    _description = "Make sale"
+    
+    def _selectPartner(self, cr, uid, context=None):
+        """
+        This function gets default value for partner_id field.
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values
+        @return : default value of partner_id field.
+        """ 
+        if not context:
+            context = {}
+            
+        data = context and context.get('active_ids', []) or []
+        case_obj = self.pool.get('crm.lead')
+        case = case_obj.read(cr, uid, data, ['partner_id'])
+        return  case[0]['partner_id']
+    
+    def makeOrder(self, cr, uid, ids, context=None):
+        """
+        This function  create Quotation on given case.
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of crm make sale' ids
+        @param context: A standard dictionary for contextual values
+        @return : Dictionary value of created sale order.
+        """
+        if not context:
+            context = {}
+            
+        mod_obj = self.pool.get('ir.model.data')
+
+
+        result = mod_obj._get_id(cr, uid, 'sale', 'view_sales_order_filter')
+        id = mod_obj.read(cr, uid, result, ['res_id'])
+
+        case_obj = self.pool.get('crm.lead')
+        sale_obj = self.pool.get('sale.order')
+        partner_obj = self.pool.get('res.partner')
+        sale_line_obj = self.pool.get('sale.order.line')
+        
+        data = context and context.get('active_ids', []) or []
+             
+        for make in self.browse(cr, uid, ids):  
+            default_partner_addr = partner_obj.address_get(cr, uid, [make.partner_id.id],
+                    ['invoice', 'delivery', 'contact'])
+            default_pricelist = partner_obj.browse(cr, uid, make.partner_id.id,
+                         context).property_product_pricelist.id
+            fpos_data = partner_obj.browse(cr, uid, make.partner_id.id, context).property_account_position
+            new_ids = []
+    
+            for case in case_obj.browse(cr, uid, data):
+                if case.partner_id and case.partner_id.id:
+                    partner_id = case.partner_id.id
+                    fpos = case.partner_id.property_account_position and case.partner_id.property_account_position.id or False
+                    partner_addr = partner_obj.address_get(cr, uid, [case.partner_id.id],
+                            ['invoice', 'delivery', 'contact'])
+                    pricelist = partner_obj.browse(cr, uid, case.partner_id.id,
+                            context).property_product_pricelist.id
+                else:
+                    partner_id = make.partner_id.id
+                    fpos = fpos_data and fpos_data.id or False
+                    partner_addr = default_partner_addr
+                    pricelist = default_pricelist
+    
+                if False in partner_addr.values():
+                    raise osv.except_osv(_('Data Insufficient!'),_('Customer has no addresses defined!'))
+    
+                vals = {
+                    'origin': 'CRM-Opportunity:%s' % str(case.id),
+                    'section_id': case.section_id and case.section_id.id or False,
+                    'picking_policy': make.picking_policy,
+                    'shop_id': make.shop_id.id,
+                    'partner_id': partner_id,
+                    'pricelist_id': pricelist,
+                    'partner_invoice_id': partner_addr['invoice'],
+                    'partner_order_id': partner_addr['contact'],
+                    'partner_shipping_id': partner_addr['delivery'],
+                    'order_policy': 'manual',
+                    'date_order': now(),
+                    'fiscal_position': fpos,
+                }
+    
+                if partner_id:
+                    partner = partner_obj.browse(cr, uid, partner_id, context=context)
+                    vals['user_id'] = partner.user_id and partner.user_id.id or uid
+    
+                if make.analytic_account.id:
+                    vals['project_id'] = make.analytic_account.id
+                new_id = sale_obj.create(cr, uid, vals)
+                for product_id in make.product_ids:
+                    value = sale_line_obj.product_id_change(cr, uid, [], pricelist,
+                            product_id.id, qty=1, partner_id=partner_id, fiscal_position=fpos)['value']
+                    value['product_id'] = product_id.id
+                    value['order_id'] = new_id
+                    value['tax_id'] = [(6,0,value['tax_id'])]
+                    sale_line_obj.create(cr, uid, value)
+    
+                case_obj.write(cr, uid, [case.id], {'ref': 'sale.order,%s' % new_id})
+                new_ids.append(new_id)
+    
+            if make.close:
+                case_obj.case_close(cr, uid, data)
+            
+            if not new_ids:
+                return {}
+            if len(new_ids)<=1:
+                value = {
+                    'domain': str([('id', 'in', new_ids)]),
+                    'view_type': 'form',
+                    'view_mode': 'form',
+                    'res_model': 'sale.order',
+                    'view_id': False,
+                    'type': 'ir.actions.act_window',
+                    'res_id': new_ids and new_ids[0]
+
+                }
+
+                
+            else:
+                value = {
+                    'domain': str([('id', 'in', new_ids)]),
+                    'view_type': 'form',
+                    'view_mode': 'tree,form',
+                    'res_model': 'sale.order',
+                    'view_id': False,
+                    'type': 'ir.actions.act_window',
+                    'res_id':new_ids
+                    }
+            return value
+
+    _columns = {
+                'shop_id': fields.many2one('sale.shop', 'Shop', required = True),
+                'partner_id': fields.many2one('res.partner', 'Customer',  required = True,  help = 'Use this partner if there is no partner on the case'),
+                'picking_policy': fields.selection([('direct','Partial Delivery'),
+                                                    ('one','Complete Delivery')], 'Picking Policy', required = True),
+                'product_ids': fields.many2many('product.product', 'product_sale_rel',\
+                                 'sale_id', 'product_id', 'Products'),
+                'analytic_account': fields.many2one('account.analytic.account', 'Analytic Account'),   
+                'close': fields.boolean('Close Case', help = 'Check this to close the case after having created the sale order.'),              
+               }
+    _defaults = {
+                 'partner_id': _selectPartner,
+                 'close': lambda *a: 1
+                 }
+    
+crm_make_sale()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_crm/wizard/crm_make_sale_view.xml b/addons/sale_crm/wizard/crm_make_sale_view.xml
new file mode 100644
index 00000000000..fd41bfde9ff
--- /dev/null
+++ b/addons/sale_crm/wizard/crm_make_sale_view.xml
@@ -0,0 +1,43 @@
+<openerp>
+   <data>
+
+        <!-- crm make sale's view -->
+
+       <record id="view_crm_make_sale" model="ir.ui.view">
+          <field name="name">crm.make.sale.form</field>
+          <field name="model">crm.make.sale</field>
+          <field name="type">form</field>
+          <field name="arch" type="xml">
+              <form string="Create a Sale Order" >
+                    <group colspan="4">
+                        <field name="partner_id"/>
+                        <field name="shop_id"/>
+                        <field name="analytic_account"/>
+                        <field name="picking_policy"/>
+                        <field name="close"/>
+                    </group>
+                    <separator string="Products" colspan="4"/>
+                    <field name="product_ids" colspan="4" nolabel="1"/>
+                <separator colspan="4"/>
+                <group col="4" colspan="4">
+                    <label string="" colspan="2"/>
+                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    <button name="makeOrder" string="Create" type="object" icon='gtk-go-forward'/>
+                </group>
+            </form>
+          </field>
+       </record>
+       
+       <!-- crm make sale's  action -->
+       
+       <record id="action_crm_make_sale" model="ir.actions.act_window">
+          <field name="name">Make Quotation</field>
+          <field name="type">ir.actions.act_window</field>
+          <field name="res_model">crm.make.sale</field>
+          <field name="view_type">form</field>
+          <field name="view_mode">form</field>
+          <field name="target">new</field>
+       </record>
+       
+   </data>
+</openerp>
diff --git a/addons/sale_crm/wizard/makesale.py b/addons/sale_crm/wizard/makesale.py
deleted file mode 100644
index e4aacce1044..00000000000
--- a/addons/sale_crm/wizard/makesale.py
+++ /dev/null
@@ -1,179 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from mx.DateTime import now
-
-import wizard
-import netsvc
-import ir
-import pooler
-from tools.translate import _
-
-sale_form = """<?xml version="1.0"?>
-<form string="Create a Sale Order">
-    <field name="partner_id" required="True"/>
-    <field name="shop_id" required="True"/>
-    <field name="analytic_account"/>
-    <field name="picking_policy" required="True"/>
-    <field name="close"/>
-    <newline/>
-    <field name="products" colspan="4"/>
-</form>"""
-
-sale_fields = {
-    'shop_id': {'string': 'Shop', 'type': 'many2one', 'relation': 'sale.shop'},
-    'partner_id': {'string': 'Customer', 'type': 'many2one',
-        'relation': 'res.partner',
-        'help': 'Use this partner if there is no partner on the case'},
-    'picking_policy': {'string': 'Picking Policy', 'type': 'selection',
-        'selection': [('direct', 'Partial Delivery'), ('one', 'Complete Delivery')]},
-    'products': {'string': 'Products', 'type': 'many2many',
-        'relation': 'product.product'},
-    'analytic_account': {'string': 'Analytic Account', 'type': 'many2one',
-        'relation': 'account.analytic.account'},
-    'close': {'string': 'Close Case', 'type': 'boolean', 'default': lambda *a: 1,
-        'help': 'Check this to close the case after having created the sale order.'},
-}
-
-
-class make_sale(wizard.interface):
-
-    def _selectPartner(self, cr, uid, data, context):
-        case_obj = pooler.get_pool(cr.dbname).get('crm.lead')
-        case = case_obj.read(cr, uid, data['ids'], ['partner_id'])
-        return {'partner_id': case[0]['partner_id']}
-
-    def _makeOrder(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        mod_obj = pool.get('ir.model.data')
-        result = mod_obj._get_id(cr, uid, 'sale', 'view_sales_order_filter')
-        id = mod_obj.read(cr, uid, result, ['res_id'])
-        case_obj = pool.get('crm.lead')
-        sale_obj = pool.get('sale.order')
-        partner_obj = pool.get('res.partner')
-        sale_line_obj = pool.get('sale.order.line')
-
-        default_partner_addr = partner_obj.address_get(cr, uid, [data['form']['partner_id']],
-                ['invoice', 'delivery', 'contact'])
-        default_pricelist = partner_obj.browse(cr, uid, data['form']['partner_id'],
-                    context).property_product_pricelist.id
-        fpos_data = partner_obj.browse(cr, uid, data['form']['partner_id'],context).property_account_position
-        new_ids = []
-
-        for case in case_obj.browse(cr, uid, data['ids']):
-            if case.partner_id and case.partner_id.id:
-                partner_id = case.partner_id.id
-                fpos = case.partner_id.property_account_position and case.partner_id.property_account_position.id or False
-                partner_addr = partner_obj.address_get(cr, uid, [case.partner_id.id],
-                        ['invoice', 'delivery', 'contact'])
-                pricelist = partner_obj.browse(cr, uid, case.partner_id.id,
-                        context).property_product_pricelist.id
-            else:
-                partner_id = data['form']['partner_id']
-                fpos = fpos_data and fpos_data.id or False
-                partner_addr = default_partner_addr
-                pricelist = default_pricelist
-
-            if False in partner_addr.values():
-                raise wizard.except_wizard(_('Data Insufficient!'),_('Customer has no addresses defined!'))
-
-            vals = {
-                'origin': 'CRM-Opportunity:%s' % str(case.id),
-                'section_id': case.section_id and case.section_id.id or False,
-                'picking_policy': data['form']['picking_policy'],
-                'shop_id': data['form']['shop_id'],
-                'partner_id': partner_id,
-                'pricelist_id': pricelist,
-                'partner_invoice_id': partner_addr['invoice'],
-                'partner_order_id': partner_addr['contact'],
-                'partner_shipping_id': partner_addr['delivery'],
-                'order_policy': 'manual',
-                'date_order': now(),
-                'fiscal_position': fpos,
-            }
-
-            if partner_id:
-                partner = partner_obj.browse(cr, uid, partner_id, context=context)
-                vals['user_id'] = partner.user_id and partner.user_id.id or uid
-
-            if data['form']['analytic_account']:
-                vals['project_id'] = data['form']['analytic_account']
-                
-            vals.update( sale_obj.onchange_partner_id(cr, uid, [], partner_id).get('value',{}) )
-            new_id = sale_obj.create(cr, uid, vals)
-            if data['form']['products']:
-                for product_id in data['form']['products'][0][2]:
-                    value = {
-                    'price_unit': 0.0,
-                    'product_id': product_id,
-                    'order_id': new_id,
-                        }
-                    value.update( sale_line_obj.product_id_change(cr, uid, [], pricelist,product_id, qty=1, partner_id=partner_id, fiscal_position=fpos)['value'] )
-                    value['tax_id'] = [(6,0,value['tax_id'])]
-                    sale_line_obj.create(cr, uid, value)
-
-            case_obj.write(cr, uid, [case.id], {'ref': 'sale.order,%s' % new_id})
-            new_ids.append(new_id)
-
-        if data['form']['close']:
-            case_obj.case_close(cr, uid, data['ids'])
-
-        if not new_ids:
-            return {}
-
-        if len(new_ids)<=1:
-            value = {
-                'domain': str([('id', 'in', new_ids)]),
-                'view_type': 'form',
-                'view_mode': 'form',
-                'res_model': 'sale.order',
-                'view_id': False,
-                'type': 'ir.actions.act_window',
-                'res_id': new_ids and new_ids[0]
-            }
-        else:
-            value = {
-                'domain': str([('id', 'in', new_ids)]),
-                'view_type': 'form',
-                'view_mode': 'tree,form',
-                'res_model': 'sale.order',
-                'view_id': False,
-                'type': 'ir.actions.act_window',
-                'res_id':new_ids
-                }
-
-        return value
-
-    states = {
-        'init': {
-            'actions': [_selectPartner],
-            'result': {'type': 'form', 'arch': sale_form, 'fields': sale_fields,
-                'state' : [('end', 'Cancel', 'gtk-cancel'),('order', 'Create', 'gtk-apply')]}
-        },
-        'order': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _makeOrder, 'state': 'end'}
-        }
-    }
-
-make_sale('crm.opportunity.make_order')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 15da9ad664910d9a1679cfe571a8c2ccc246b1dd Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 10 Jun 2010 12:23:14 +0530
Subject: [PATCH 056/121] [IMP]: base_contact: Improvement for dropping trigger
 and functions

bzr revid: rpa@tinyerp.com-20100610065314-jjik5f5cdtyyk125
---
 .../migrations/1.2/pre-10-res_partner_address_change.py       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/base_contact/migrations/1.2/pre-10-res_partner_address_change.py b/addons/base_contact/migrations/1.2/pre-10-res_partner_address_change.py
index 326a9caed9d..26deac23e7f 100644
--- a/addons/base_contact/migrations/1.2/pre-10-res_partner_address_change.py
+++ b/addons/base_contact/migrations/1.2/pre-10-res_partner_address_change.py
@@ -26,3 +26,7 @@ def generate_contact(cr):
 
     cr.execute("INSERT into res_partner_contact (name, title, email, first_name, website)  (SELECT coalesce(name, 'Noname'), title, email, function , to_char(id, '99999999') from res_partner_address)")
     cr.commit()
+    cr.execute("DROP TRIGGER  IF EXISTS contactjob  on res_partner_contact")
+    cr.execute("DROP LANGUAGE  IF EXISTS  plpgsql CASCADE;")
+    cr.execute("DROP FUNCTION IF EXISTS  add_to_job()")
+    cr.commit()
\ No newline at end of file

From a4f7efe9df72be072aa0d77755ee01562efc1347 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Thu, 10 Jun 2010 14:53:25 +0530
Subject: [PATCH 057/121] [IMP] Improvement for osv related problem

bzr revid: ksa@tinyerp.co.in-20100610092325-x1sqepg6ve7qkxbk
---
 addons/audittrail/audittrail.py | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index 7c28d6373fb..620ef30a821 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -288,19 +288,21 @@ class audittrail_objects_proxy(osv_pool):
         cr = pooler.get_db(db).cursor()
         obj_ids = pool.get('ir.model').search(cr, uid, [('model', '=', object)])
         model_object = pool.get('ir.model').browse(cr, uid, obj_ids)[0]
+        res_id = fct_src(db, uid, object, method, *args)
 
         if method in ('create'):
-            res_id = fct_src(db, uid, object, method, *args)
+
             cr.commit()
             new_value = pool.get(model_object.model).read(cr, uid, [res_id], args[0].keys())[0]
             if 'id' in new_value:
                 del new_value['id']
+
+        resource_pool = pool.get(model_object.model)
+        try:
+            resource_name = resource_pool.name_get(cr, uid, [res_id])
+            resource_name = resource_name and resource_name[0][1] or ''
+
             if not logged_uids or uid in logged_uids:
-                resource_pool = pool.get(model_object.model)
-                resource_name = hasattr(resource_pool,'name_get')
-            if not resource_name:
-                resource_name = pool.get(model_object.model).name_get(cr, uid, [res_id])
-                resource_name = resource_name and resource_name[0][1] or ''
                 vals = {
                         "method": method,
                         "object_id": model_object.id,
@@ -318,9 +320,14 @@ class audittrail_objects_proxy(osv_pool):
                               }
                         lines.append(line)
                 self.create_log_line(cr, uid, id, model_object, lines)
-            cr.commit()
-            cr.close()
-            return res_id
+        except Exception:
+            if not hasattr(resource_pool,'name_get'):
+                resource_name = resource_pool.read(cr, uid, [args[0]])
+                resource_name = resource_name and resource_name[0][1] or ''
+
+        cr.commit()
+        cr.close()
+        return res_id
 
         if method in ('write'):
             res_ids = args[0]
@@ -415,7 +422,7 @@ class audittrail_objects_proxy(osv_pool):
         @param db: the current database
         @param uid: the current user’s ID for security checks,
         @param object: Object who's values are being changed
-        @param method: method to log: create, read, write, unlink
+        @param method: get any method and create log
         @param fct_src: execute method of Object proxy
 
         @return: Returns result as per method of Object proxy
@@ -471,14 +478,13 @@ class audittrail_objects_proxy(osv_pool):
         cr.close()
         return res
 
-
     def execute(self, db, uid, object, method, *args, **kw):
         """
         Overrides Object Proxy execute method
         @param db: the current database
         @param uid: the current user’s ID for security checks,
         @param object: Object who's values are being changed
-        @param method: method to log: create, read, write, unlink
+        @param method: get any method and create log
 
         @return: Returns result as per method of Object proxy
         """
@@ -528,7 +534,7 @@ class audittrail_objects_proxy(osv_pool):
         @param db: the current database
         @param uid: the current user’s ID for security checks,
         @param object: Object who's values are being changed
-        @param method: method to log: create, read, write, unlink
+        @param method: get any method and create log
         @param fct_src: execute method of Object proxy
 
         @return: Returns result as per method of Object proxy

From d5acbf72751cf2809e219935824adcb19e96d065 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Thu, 10 Jun 2010 19:21:38 +0530
Subject: [PATCH 058/121] [IMP] Minor changes in wiki_sale_faq module

bzr revid: ksa@tinyerp.co.in-20100610135138-jxhp9gpsf4hw222x
---
 addons/wiki_sale_faq/wiki_sale_faq_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/wiki_sale_faq/wiki_sale_faq_data.xml b/addons/wiki_sale_faq/wiki_sale_faq_data.xml
index e2e21342d78..576e9e8f4b0 100644
--- a/addons/wiki_sale_faq/wiki_sale_faq_data.xml
+++ b/addons/wiki_sale_faq/wiki_sale_faq_data.xml
@@ -23,7 +23,7 @@
 
          <record id="wiki_wiki_bugs" model="wiki.wiki">
             <field name="name">Sales Management ?</field>
-            <field name="tags">crm, bugs</field>
+            <field name="tags">Sales</field>
             <field name="group_id" ref="wiki_groups_sale_faq"/>
             <field name="minor_edit">0</field>
             <field name="toc">0</field>

From 70d20797aae6411ac71fb9410205b09ea3aecfe6 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 11 Jun 2010 10:48:07 +0530
Subject: [PATCH 059/121] [IMP]: crm: Added logs field in lead form view

bzr revid: rpa@tinyerp.com-20100611051807-hyr077nazn7naxzd
---
 addons/crm/crm_lead_view.xml | 13 +++++++++++++
 addons/crm/crm_mailgate.py   |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 465c63ae626..8a32fe00e32 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -150,6 +150,19 @@
                         <field name="day_open"/>
                         <field name="day_close"/>
                     </group>
+                    <field name="log_ids" nolabel="1" colspan="4">
+                        <tree string="Logs">
+                            <field name="name" colspan="4"/>
+                            <field name="date"/>
+                            <field name="user_id"/>
+                        </tree>
+                        <form string="Logs">
+                            <separator string="Action Information" colspan="4"/>
+                            <field name="name" colspan="4"/>
+                            <field name="date"/>
+                            <field name="user_id"/>
+                        </form>
+                    </field>
                  </page>
                  <page string="Emails" groups="base.group_extended">
                    <group colspan="4">
diff --git a/addons/crm/crm_mailgate.py b/addons/crm/crm_mailgate.py
index 00fa761f51d..3415011cb7f 100644
--- a/addons/crm/crm_mailgate.py
+++ b/addons/crm/crm_mailgate.py
@@ -41,7 +41,7 @@ class crm_cases(osv.osv):
     _name = "mailgate.thread"
     _inherit = "mailgate.thread"    
 
-    def message_new(self, cr, uid, msg, context):
+    def message_new(self, cr, uid, msg, context=None):
         """
         Automatically calls when new email message arrives
         

From 05dfbfc215de485ba0789e3b63a12b5dac9adf16 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Fri, 11 Jun 2010 11:02:04 +0530
Subject: [PATCH 060/121] [MERGE]: Remaining merge from team2 branch

bzr revid: uco@tinyerp.com-20100611053204-rvksxkpzn21rzd2t
---
 addons/sale/__openerp__.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index 000cf41256e..2f265b3d6f7 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -65,6 +65,8 @@
              'test/shipping_manual_sale_order.yml',
              'test/prepaid_sale_order.yml',
              'test/advance_invoice.yml',
+             'test/so_make_line_invoice.yml',
+             'test/so_make_invoice.yml',
              'test/sale_procurement.yml',
             ],
     'installable': True,

From 3809beae9706db8dcfc31e4abd9214ef95dd7642 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Fri, 11 Jun 2010 11:04:31 +0530
Subject: [PATCH 061/121] [ADD] Task 841: (Backlog: 585): Demo data for
 crm.lead and crm.opportunity. Task 868: (Backlog: 641): Test manufacturing
 orders with negative values. (disassembly of products)

bzr revid: uco@tinyerp.com-20100611053431-4pluwz0evur9opyl
---
 addons/crm/crm_lead_demo.xml        | 80 ++++++++++++++++++++++++++
 addons/crm/crm_opportunity_demo.xml | 87 ++++++++++++++++++++++++++++-
 addons/mrp/mrp.py                   | 13 ++++-
 3 files changed, 178 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index 5336f52a000..862f93126db 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -115,5 +115,85 @@
             <field eval="'Gardner Group'" name="name"/>
             <field eval="'(282) 603-7489'" name="phone"/>
         </record>
+        <record id="crm_case_webvisitor0" model="crm.lead">
+            <field eval="1" name="active"/>
+            <field name="type_id" ref="crm.type_lead5"/>
+            <field eval="&quot;1&quot;" name="priority"/>
+            <field name="type">lead</field>
+            <field name="user_id" ref="base.user_demo"/>
+            <field eval="&quot;Questionnaire&quot;" name="name"/>
+            <field eval="&quot;open&quot;" name="state"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field eval="&quot;Smith John&quot;" name="partner_name2"/>
+            <field eval="&quot;(487) 013-1504&quot;" name="partner_mobile"/>
+            <field name="categ_id" ref="crm.categ_oppor6"/>
+            <field eval="&quot;Website Visitor&quot;" name="partner_name"/>
+            <field eval="&quot;smith_john@gmail.com&quot;" name="email_from"/>
+            <field eval="time.strftime('%Y-%m-16 10:05:15')" name="date"/>
+        </record>
+        <record id="crm_case_business_card0" model="crm.lead">
+            <field eval="1" name="active"/>
+            <field name="type_id" ref="crm.type_lead3"/>
+            <field eval="&quot;2&quot;" name="priority"/>
+            <field name="type">lead</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field eval="&quot;Marketing Products&quot;" name="name"/>
+            <field eval="&quot;open&quot;" name="state"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field eval="&quot;Elvis Borne&quot;" name="partner_name2"/>
+            <field eval="&quot;(147) 014-6574&quot;" name="partner_mobile"/>
+            <field name="categ_id" ref="crm.categ_oppor5"/>
+            <field name="stage_id" ref="crm.stage_lead1"/>
+            <field eval="&quot;Business Card&quot;" name="partner_name"/>
+            <field eval="&quot;(124) 587-8974&quot;" name="partner_phone"/>
+            <field eval="time.strftime('%Y-%m-16 11:05:15')" name="date"/>
+        </record>
+        <record id="crm_case_imported_contact0" model="crm.lead">
+            <field eval="1" name="active"/>
+            <field name="type_id" ref="crm.type_lead8"/>
+            <field eval="&quot;2&quot;" name="priority"/>
+            <field name="type">lead</field>
+            <field name="user_id" ref="base.user_demo"/>
+            <field eval="&quot;Business Group&quot;" name="name"/>
+            <field eval="&quot;cancel&quot;" name="state"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field eval="&quot;Drew Clark&quot;" name="partner_name2"/>
+            <field eval="&quot;(125) 021-4781&quot;" name="partner_mobile"/>
+            <field name="categ_id" ref="crm.categ_oppor1"/>
+            <field name="stage_id" ref="crm.stage_lead2"/>
+            <field eval="&quot;Imported Contact&quot;" name="partner_name"/>
+        </record>
+        <record id="crm_case_employee0" model="crm.lead">
+            <field eval="1" name="active"/>
+            <field name="type_id" ref="crm.type_lead3"/>
+            <field eval="&quot;3&quot;" name="priority"/>
+            <field name="type">lead</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field eval="&quot;OpenERP Campaining&quot;" name="name"/>
+            <field eval="&quot;draft&quot;" name="state"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field eval="&quot;Carl Nelson&quot;" name="partner_name2"/>
+            <field eval="&quot;(874) 022-6574&quot;" name="partner_mobile"/>
+            <field name="categ_id" ref="crm.categ_oppor3"/>
+            <field name="stage_id" ref="crm.stage_lead3"/>
+            <field eval="&quot;Campaining&quot;" name="partner_name"/>
+            <field eval="&quot;(232) 147-6329&quot;" name="partner_phone"/>
+        </record>
+        <record id="crm_case_company_partnership0" model="crm.lead">
+            <field eval="1" name="active"/>
+            <field name="type_id" ref="crm.type_lead3"/>
+            <field eval="&quot;3&quot;" name="priority"/>
+            <field name="type">lead</field>
+            <field name="user_id" ref="base.user_demo"/>
+            <field eval="&quot;Offer&quot;" name="name"/>
+            <field eval="&quot;done&quot;" name="state"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field eval="&quot;Joe Lucas&quot;" name="partner_name2"/>
+            <field eval="&quot;(234) 031-1254&quot;" name="partner_mobile"/>
+            <field name="categ_id" ref="crm.categ_oppor7"/>
+            <field name="stage_id" ref="crm.stage_lead1"/>
+            <field eval="&quot;Partnership Offer&quot;" name="partner_name"/>
+            <field eval="&quot;(254) 954-2147&quot;" name="partner_phone"/>
+       </record>
     </data>
 </openerp>
diff --git a/addons/crm/crm_opportunity_demo.xml b/addons/crm/crm_opportunity_demo.xml
index aa965a07594..d03cf78ebbc 100644
--- a/addons/crm/crm_opportunity_demo.xml
+++ b/addons/crm/crm_opportunity_demo.xml
@@ -47,7 +47,7 @@
             <field name="type_id" ref="crm.type_oppor1"/>
             <field name="partner_id" ref="base.res_partner_8"/>
             <field eval="&quot;3&quot;" name="priority"/>
-            <field name="user_id" ref="base.user_root"/>
+            <field name="user_id" ref="base.user_demo"/>
             <field eval="&quot;pending&quot;" name="state"/>
             <field eval="55000.0" name="planned_revenue"/>
             <field eval="70" name="probability"/>
@@ -89,5 +89,90 @@
             <field name="stage_id" ref="crm.stage_oppor6"/>
             <field eval="&quot;Dirt Mining Ltd 271742 - 1000 units&quot;" name="name"/>
         </record>
+        <record id="crm_case_dreamweaversunits0" model="crm.lead">
+            <field eval="75" name="probability"/>
+            <field name="partner_address_id" ref="base.res_partner_address_9"/>
+            <field name="type">opportunity</field>
+            <field eval="1" name="active"/>
+            <field name="type_id" ref="crm.type_oppor1"/>
+            <field name="partner_id" ref="base.res_partner_2"/>
+            <field eval="&quot;3&quot;" name="priority"/>
+            <field name="user_id" ref="base.user_demo"/>
+            <field eval="&quot;open&quot;" name="state"/>
+            <field eval="35000.0" name="planned_cost"/>
+            <field eval="42000.0" name="planned_revenue"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="categ_id" ref="crm.categ_oppor4"/>
+            <field name="stage_id" ref="crm.stage_oppor1"/>
+            <field eval="&quot;Dream Weavers - 2000 units&quot;" name="name"/>
+        </record>
+        <record id="crm_case_supervalueunits0" model="crm.lead">
+            <field eval="70" name="probability"/>
+            <field name="partner_address_id" ref="base.res_partner_address_11"/>
+            <field name="type">opportunity</field>
+            <field eval="1" name="active"/>
+            <field name="type_id" ref="crm.type_oppor1"/>
+            <field name="partner_id" ref="base.res_partner_sednacom"/>
+            <field eval="&quot;2&quot;" name="priority"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field eval="&quot;open&quot;" name="state"/>
+            <field eval="38000.0" name="planned_cost"/>
+            <field eval="49000.0" name="planned_revenue"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="categ_id" ref="crm.categ_oppor5"/>
+            <field name="stage_id" ref="crm.stage_oppor3"/>
+            <field eval="&quot;Super Value 84581- 1500 units&quot;" name="name"/>
+        </record>
+        <record id="crm_case_business_solutionunits0" model="crm.lead">
+            <field eval="85" name="probability"/>
+            <field name="partner_address_id" ref="base.res_partner_address_zen"/>
+            <field name="type">opportunity</field>
+            <field eval="1" name="active"/>
+            <field name="type_id" ref="crm.type_oppor1"/>
+            <field name="partner_id" ref="base.res_partner_3"/>
+            <field eval="&quot;1&quot;" name="priority"/>
+            <field name="user_id" ref="base.user_demo"/>
+            <field eval="&quot;done&quot;" name="state"/>
+            <field eval="35000.0" name="planned_cost"/>
+            <field eval="40000.0" name="planned_revenue"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="categ_id" ref="crm.categ_oppor6"/>
+            <field name="stage_id" ref="crm.stage_oppor6"/>
+            <field eval="&quot;Business Solutions 21478- 2000 units&quot;" name="name"/>
+        </record>
+        <record id="crm_case_sunrisemarketingunits0" model="crm.lead">
+            <field eval="45" name="probability"/>
+            <field name="partner_address_id" ref="base.res_partner_address_7"/>
+            <field name="type">opportunity</field>
+            <field eval="1" name="active"/>
+            <field name="type_id" ref="crm.type_oppor1"/>
+            <field name="partner_id" ref="base.res_partner_4"/>
+            <field eval="&quot;3&quot;" name="priority"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field eval="&quot;draft&quot;" name="state"/>
+            <field eval="45000.0" name="planned_cost"/>
+            <field eval="50000.0" name="planned_revenue"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="categ_id" ref="crm.categ_oppor6"/>
+            <field name="stage_id" ref="crm.stage_oppor6"/>
+            <field eval="&quot;Sunrise Marketing - 3000 units&quot;" name="name"/>
+        </record>
+        <record id="crm_case_alphaunits0" model="crm.lead">
+            <field eval="50" name="probability"/>
+            <field name="partner_address_id" ref="base.res_partner_address_6"/>
+            <field name="type">opportunity</field>
+            <field eval="1" name="active"/>
+            <field name="type_id" ref="crm.type_oppor1"/>
+            <field name="partner_id" ref="base.res_partner_6"/>
+            <field eval="&quot;2&quot;" name="priority"/>
+            <field name="user_id" ref="base.user_demo"/>
+            <field eval="&quot;cancel&quot;" name="state"/>
+            <field eval="30000.0" name="planned_cost"/>
+            <field eval="40000.0" name="planned_revenue"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="categ_id" ref="crm.categ_oppor7"/>
+            <field name="stage_id" ref="crm.stage_oppor2"/>
+            <field eval="&quot;Alpha Appliances - 2000 units&quot;" name="name"/>
+        </record>
     </data>
 </openerp>
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 8c2b6789cea..72eb3a7f51c 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -511,7 +511,18 @@ class mrp_production(osv.osv):
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'mrp.production', context=c),
     }
     _order = 'date_planned asc, priority desc';
-
+    
+    def _check_qty(self, cr, uid, ids):
+        orders = self.browse(cr, uid, ids)
+        for order in orders:
+            if order.product_qty <= 0:
+                return False
+        return True
+    
+    _constraints = [
+        (_check_qty, 'Order quantity cannot be negative or zero !', ['product_qty']),
+    ]
+    
     def unlink(self, cr, uid, ids, context=None):
         productions = self.read(cr, uid, ids, ['state'])
         unlink_ids = []

From cd19a60f107796d719b7f669bc6b689bcceafd0d Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 11 Jun 2010 17:52:28 +0530
Subject: [PATCH 062/121] [IMP]: mail_gateway: * Made compatible with
 fetchmail, * Added common class and script that are used for mail processing,
 * Optimised mailgateway script and used common functions

bzr revid: rpa@tinyerp.com-20100611122228-7fjko8endi5d1xqr
---
 addons/mail_gateway/mail_gateway.py           | 238 ++++++++++++++++
 .../openerp_mailgate/openerp_mailgate.py      | 260 ++----------------
 2 files changed, 268 insertions(+), 230 deletions(-)

diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index 03c40b9cefb..f57caf6b879 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -22,6 +22,15 @@
 from osv import osv, fields
 import time
 import  base64
+import re
+import tools
+import binascii
+
+import email
+from email.header import decode_header
+import netsvc
+
+logger = netsvc.Logger()
 
 class one2many_domain(fields.one2many):
     def set(self, cr, obj, id, field, values, user=None, context=None):
@@ -154,4 +163,233 @@ class mailgate_message(osv.osv):
 mailgate_message()
 
 
+class mailgate_tool(osv.osv):
+
+    _name = 'email.server.tools'
+    _description = "Email Tools"
+    _auto = False
+
+    def to_email(self, cr, uid, text):
+        _email = re.compile(r'.*<.*@.*\..*>', re.UNICODE)
+        def record(path):
+            eml = path.group()
+            index = eml.index('<')
+            eml = eml[index:-1].replace('<', '').replace('>', '')
+            return eml
+
+        bits = _email.sub(record, text)
+        return bits
+    
+    def history(self, cr, uid, model, new_id, msg, attach, server_id=None, server_type=None):
+        try:
+            thread_id = self.pool.get(model).read(cr, uid, new_id, ['thread_id'])['thread_id'][0]
+        except Exception, e:
+            thread_id = None
+        msg_data = {
+                    'name': msg.get('subject', 'No subject'), 
+                    'date': msg.get('date') , # or time.strftime('%Y-%m-%d %H:%M:%S')??
+                    'description': msg.get('body', msg.get('from')), 
+                    'history': True,
+                    'model': model, 
+                    'email_cc': msg.get('cc'), 
+                    'email_from': msg.get('from'), 
+                    'email_to': msg.get('to'), 
+                    'message_id': msg.get('message-id'), 
+                    'ref_id': msg.get('references', msg.get('id')), 
+                    'res_id': new_id, 
+                    'server_id': server_id, 
+                    'thread_id': thread_id, 
+                    'type': server_type, 
+                    'user_id': uid, 
+                    'attachment_ids': [(6, 0, attach)]
+                    }
+        msg_id = self.pool.get('mailgate.message').create(cr, uid, msg_data)
+        return True
+
+    def process_email(self, cr, uid, model, message, attach=True, server_id=None, server_type=None, context=None):
+        if not context:
+            context = {}
+        context.update({
+            'server_id': server_id
+        })
+        res_id = False
+        def create_record(msg):
+            model_pool = self.pool.get(model)
+            if hasattr(model_pool, 'message_new'):
+                res_id = model_pool.message_new(cr, uid, msg, context)
+            else:
+                data = {
+                    'name': msg.get('subject'), 
+                    'email_from': msg.get('from'), 
+                    'email_cc': msg.get('cc'), 
+                    'user_id': False, 
+                    'description': msg.get('body'), 
+                    'state' : 'draft', 
+                }
+                data.update(self.get_partner(cr, uid, msg.get('from'), context=context))
+                res_id = model_pool.create(cr, uid, data, context=context)
+                logger.notifyChannel('imap', netsvc.LOG_WARNING, 'method def message_new is not define in model %s. Using default method' % (model_pool._name))
+            att_ids = []
+            if attach:
+                for attachment in msg.get('attachments', []):
+                    data_attach = {
+                        'name': attachment, 
+                        'datas': binascii.b2a_base64(str(attachments.get(attachment))), 
+                        'datas_fname': attachment, 
+                        'description': 'Mail attachment', 
+                        'res_model': model, 
+                        'res_id': res_id, 
+                    }
+                    att_ids.append(self.pool.get('ir.attachment').create(cr, uid, data_attach))
+
+            if hasattr(model_pool, 'history'):
+                model_pool.history(cr, uid, [res_id], 'Receive', True, msg.get('to'), msg.get('body'), msg.get('from'), False, {'model' : model})
+            else:
+                self.history(cr, uid, model, res_id, msg, att_ids, server_id=server_id, server_type=server_type)
+            
+            return res_id
+
+        history_pool = self.pool.get('mailgate.message')
+        msg_txt = email.message_from_string(message)
+        message_id = msg_txt.get('Message-ID', False)
+
+        msg = {}
+        if not message_id:
+            return False
+
+        fields = msg_txt.keys()
+        msg['id'] = message_id
+        msg['message-id'] = message_id
+
+        def _decode_header(txt):
+            txt = txt.replace('\r', '')
+            return ' '.join(map(lambda (x, y): unicode(x, y or 'ascii'), decode_header(txt)))
+
+        if 'Subject' in fields:
+            msg['subject'] = _decode_header(msg_txt.get('Subject'))
+
+        if 'Content-Type' in fields:
+            msg['content-type'] = msg_txt.get('Content-Type')
+
+        if 'From' in fields:
+            msg['from'] = _decode_header(msg_txt.get('From'))
+
+        if 'Delivered-To' in fields:
+            msg['to'] = _decode_header(msg_txt.get('Delivered-To'))
+
+        if 'Cc' in fields:
+            msg['cc'] = _decode_header(msg_txt.get('Cc'))
+
+        if 'Reply-To' in fields:
+            msg['reply'] = _decode_header(msg_txt.get('Reply-To'))
+
+        if 'Date' in fields:
+            msg['date'] = msg_txt.get('Date')
+
+        if 'Content-Transfer-Encoding' in fields:
+            msg['encoding'] = msg_txt.get('Content-Transfer-Encoding')
+
+        if 'References' in fields:
+            msg['references'] = msg_txt.get('References')
+
+        if 'X-openerp-caseid' in fields:
+            msg['caseid'] = msg_txt.get('X-openerp-caseid')
+
+        if 'X-Priority' in fields:
+            msg['priority'] = msg_txt.get('X-priority', '3 (Normal)').split(' ')[0]
+
+        if not msg_txt.is_multipart() or 'text/plain' in msg.get('content-type', None):
+            encoding = msg_txt.get_content_charset()
+            msg['body'] = msg_txt.get_payload(decode=True)
+            if encoding:
+                msg['body'] = msg['body'].decode(encoding).encode('utf-8')
+
+        attachments = {}
+        if msg_txt.is_multipart() or 'multipart/alternative' in msg.get('content-type', None):
+            body = ""
+            counter = 1
+            for part in msg_txt.walk():
+                if part.get_content_maintype() == 'multipart':
+                    continue
+
+                encoding = part.get_content_charset()
+
+                if part.get_content_maintype()=='text':
+                    content = part.get_payload(decode=True)
+                    filename = part.get_filename()
+                    if filename :
+                        attachments[filename] = content
+                    else:
+                        if encoding:
+                            content = unicode(content, encoding)
+                        if part.get_content_subtype() == 'html':
+                            body = tools.html2plaintext(content)
+                        elif part.get_content_subtype() == 'plain':
+                            body = content
+                elif part.get_content_maintype()=='application' or part.get_content_maintype()=='image' or part.get_content_maintype()=='text':
+                    filename = part.get_filename();
+                    if filename :
+                        attachments[filename] = part.get_payload(decode=True)
+                    else:
+                        res = part.get_payload(decode=True)
+                        if encoding:
+                            res = res.decode(encoding).encode('utf-8')
+
+                        body += res
+
+            msg['body'] = body
+            msg['attachments'] = attachments
+
+        if msg.get('references', False):
+            id = False
+            ref = msg.get('references')
+            if '\r\n' in ref:
+                ref = msg.get('references').split('\r\n')
+            else:
+                ref = msg.get('references').split(' ')
+            if ref:
+                hids = history_pool.search(cr, uid, [('name', '=', ref[0].strip())])
+                if hids:
+                    id = hids[0]
+                    history = history_pool.browse(cr, uid, id)
+                    model_pool = self.pool.get(model)
+                    context.update({
+                        'references_id':ref[0]
+                    })
+                    vals = {}
+                    if hasattr(model_pool, 'message_update'):
+                        model_pool.message_update(cr, uid, [history.res_id], vals, msg, context=context)
+                    else:
+                        logger.notifyChannel('imap', netsvc.LOG_WARNING, 'method def message_update is not define in model %s' % (model_pool._name))
+                        return False
+                else:
+                    res_id = create_record(msg)
+
+        else:
+            res_id = create_record(msg)
+
+        return res_id
+
+    def get_partner(self, cr, uid, from_email, context=None):
+        """This function returns partner Id based on email passed
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks
+        @param from_email: email address based on that function will search for the correct
+        """
+        res = {
+            'partner_address_id': False, 
+            'partner_id': False
+        }
+        from_email = self.to_email(cr, uid, from_email)
+        address_ids = self.pool.get('res.partner.address').search(cr, uid, [('email', '=', from_email)])
+        if address_ids:
+            address = self.pool.get('res.partner.address').browse(cr, uid, address_ids[0])
+            res['partner_address_id'] = address_ids[0]
+            res['partner_id'] = address.partner_id.id
+
+        return res
+
+mailgate_tool()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py b/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
index de49ddfaccb..f77fccadaee 100755
--- a/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
+++ b/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
@@ -20,15 +20,12 @@
 #
 ###########################################################################################
 
+from email.header import decode_header
+import email as EMAIL
 import re
 import smtplib
-import email, mimetypes
-from email.Header import decode_header
-from email.MIMEText import MIMEText
-import xmlrpclib
-import os
-import binascii
 import time, socket
+import xmlrpclib
 
 
 email_re = re.compile(r"([A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6})")
@@ -44,84 +41,9 @@ priorities = {
     '5': '5 (Lowest)', 
 }
 
-def html2plaintext(html, body_id=None, encoding='utf-8'):
-    ## (c) Fry-IT, www.fry-it.com, 2007
-    ## <peter@fry-it.com>
-    ## download here: http://www.peterbe.com/plog/html2plaintext
-    
-    
-    """ from an HTML text, convert the HTML to plain text.
-    If @body_id is provided then this is the tag where the 
-    body (not necessarily <body>) starts.
-    """
-    try:
-        from BeautifulSoup import BeautifulSoup, SoupStrainer, Comment
-    except:
-        return html
-            
-    urls = []
-    if body_id is not None:
-        strainer = SoupStrainer(id=body_id)
-    else:
-        strainer = SoupStrainer('body')
-    
-    soup = BeautifulSoup(html, parseOnlyThese=strainer, fromEncoding=encoding)
-    for link in soup.findAll('a'):
-        title = unicode(link)
-        for url in [x[1] for x in link.attrs if x[0]=='href']:
-            urls.append(dict(url=url, tag=unicode(link), title=title))
-
-    html = unicode(soup)
-            
-    url_index = []
-    i = 0
-    for d in urls:
-        if d['title'] == d['url'] or 'http://'+d['title'] == d['url']:
-            html = html.replace(d['tag'], d['url'])
-        else:
-            i += 1
-            html = html.replace(d['tag'], '%s [%s]' % (d['title'], i))
-            url_index.append(d['url'])
-
-    html = html.replace('<strong>', '*').replace('</strong>', '*')
-    html = html.replace('<b>', '*').replace('</b>', '*')
-    html = html.replace('<h3>', '*').replace('</h3>', '*')
-    html = html.replace('<h2>', '**').replace('</h2>', '**')
-    html = html.replace('<h1>', '**').replace('</h1>', '**')
-    html = html.replace('<em>', '/').replace('</em>', '/')
-    
-
-    # the only line breaks we respect is those of ending tags and 
-    # breaks
-    
-    html = html.replace('\n', ' ')
-    html = html.replace('<br>', '\n')
-    html = html.replace('<tr>', '\n')
-    html = html.replace('</p>', '\n\n')
-    html = re.sub('<br\s*/>', '\n', html)
-    html = html.replace(' ' * 2, ' ')
-
-
-    # for all other tags we failed to clean up, just remove then and 
-    # complain about them on the stderr
-    def desperate_fixer(g):
-        #print >>sys.stderr, "failed to clean up %s" % str(g.group())
-        return ' '
-
-    html = re.sub('<.*?>', desperate_fixer, html)
-
-    # lstrip all lines
-    html = '\n'.join([x.lstrip() for x in html.splitlines()])
-
-    for i, url in enumerate(url_index):
-        if i == 0:
-            html += '\n\n'
-        html += '[%s] %s\n' % (i+1, url)       
-    return html
-
 class rpc_proxy(object):
-    def __init__(self, uid, passwd, host='localhost', port=8069, path='object', dbname='terp'):        
-        self.rpc = xmlrpclib.ServerProxy('http://%s:%s/xmlrpc/%s' % (host, port, path))
+    def __init__(self, uid, passwd, host='localhost', port=8069, path='object', dbname='terp'):
+        self.rpc = xmlrpclib.ServerProxy('http://%s:%s/xmlrpc/%s' % (host, port, path), allow_none=True)
         self.user_id = uid
         self.passwd = passwd
         self.dbname = dbname
@@ -149,162 +71,32 @@ class email_parser(object):
         
         
     def email_get(self, email_from):
-        res = email_re.search(email_from)
-        return res and res.group(1)
-
-    def partner_get(self, email):
-        mail = self.email_get(email)
-        adr_ids = self.rpc('res.partner.address', 'search', [('email', '=', mail)])
-        if not adr_ids:
-            return {}
-        adr = self.rpc('res.partner.address', 'read', adr_ids, ['partner_id'])
-        return {
-            'partner_address_id': adr[0]['id'], 
-            'partner_id': adr[0].get('partner_id', False) and adr[0]['partner_id'][0] or False
-        }
+        return self.rpc('email.server.tools', 'to_email', email_from)
 
     def _to_decode(self, s, charsets):
-       for charset in charsets:
-           if charset:
-               try:
-                   return s.decode(charset)
-               except UnicodeError:
+        for charset in charsets:
+            if charset:
+                try:
+                    return s.decode(charset)
+                except UnicodeError:
                     pass
-       return s.decode('latin1')
+        return s.decode('latin1')
 
     def _decode_header(self, s):
-        from email.Header import decode_header
-        s = decode_header(s.replace('\r', '')) 
+        if s:
+            s = decode_header(s.replace('\r', '')) 
         return ''.join(map(lambda x:self._to_decode(x[0], [x[1]]), s or []))
-    
-    def history(self, model, new_id, msg_id, ref_id, subject, msg_to, msg_from, body, attach):
-        try:
-            thread_id = self.rpc(model, 'read', new_id, ['thread_id'])['thread_id'][0]
-        except Exception, e:
-            thread_id = None
-        msg_data = {
-                    'name': subject, 
-                    'history': True, 
-                    'model': model, 
-                    'res_id': new_id, 
-                    'thread_id': thread_id, 
-                    'message_id': msg_id, 
-                    'ref_id': ref_id or '', 
-                    'user_id': self.rpc.user_id, 
-                    'date': time.strftime('%Y-%m-%d %H:%M:%S'), 
-                    'email_from': msg_from, 
-                    'email_to': msg_to, 
-                    'description': body, 
-                    'attachment_ids': [(6, 0, attach)]
-        }
-        msg_id = self.rpc('mailgate.message', 'create', msg_data)
-        return True
-    
-    def msg_new(self, msg):
-        message = self.msg_body_get(msg)
-        msg_subject = self._decode_header(msg['Subject'])
-        msg_from = self._decode_header(msg['From'])
-        msg_to = self._decode_header(msg['To'])
-        msg_cc = self._decode_header(msg['Cc'] or '')
-        
-        data = {
-            'name': msg_subject, 
-            'email_from': msg_from, 
-            'email_cc': msg_cc,             
-            'user_id': False, 
-            'description': message['body'], 
-            'state' : 'draft',
-        }
-        data.update(self.partner_get(msg_from))
-
-        try:
-            att_ids = []
-            new_id = self.rpc(self.model, 'create', data)
-            attachments = message['attachment']        
-            for attach in attachments or []:
-                data_attach = {
-                    'name': str(attach), 
-                    'datas': binascii.b2a_base64(str(attachments[attach])), 
-                    'datas_fname': str(attach), 
-                    'description': 'Mail attachment', 
-                    'res_model': self.model, 
-                    'res_id': new_id
-                }
-                att_ids.append(self.rpc('ir.attachment', 'create', data_attach))
-            try:
-                self.rpc(self.model, 'history', [new_id], 'Receive', True, msg_to, message['body'], msg_from, False, {'model' : self.model})
-            except Exception, e:
-                self.history(self.model, new_id, msg['Message-Id'], msg['References'], msg_subject, msg_to, msg_from, message['body'], att_ids)
-        except Exception, e:
-            if getattr(e, 'faultCode', '') and 'AccessError' in e.faultCode:
-                e = '\n\nThe Specified user does not have an access to the Model.'
-            print e
-        
-
-        return new_id
-
-#   #change the return type format to dictionary
-#   {
-#       'body':'body part',
-#       'attachment':{
-#                       'file_name':'file data',
-#                       'file_name':'file data',
-#                       'file_name':'file data',
-#                   }
-#   }
-
-    def msg_body_get(self, msg):
-        message = {};
-        message['body'] = '';
-        message['attachment'] = {};
-        attachment = message['attachment'];
-        counter = 1;
-        def replace(match):
-            return ''
-
-        for part in msg.walk():
-            if part.get_content_maintype() == 'multipart':
-                continue
-
-            if part.get_content_maintype()=='text':
-                buf = part.get_payload(decode=True)
-                if buf:
-                    txt = self._to_decode(buf, part.get_charsets())
-                    txt = re.sub("<(\w)>", replace, txt)
-                    txt = re.sub("<\/(\w)>", replace, txt)
-                if txt and part.get_content_subtype() == 'plain':
-                    message['body'] += txt 
-                elif txt and part.get_content_subtype() == 'html':                                                               
-                    message['body'] += html2plaintext(txt)  
-                
-                filename = part.get_filename();
-                if filename :
-                    attachment[filename] = part.get_payload(decode=True);
-                    
-            elif part.get_content_maintype()=='application' or part.get_content_maintype()=='image' or part.get_content_maintype()=='text':
-                filename = part.get_filename();
-                if filename :
-                    attachment[filename] = part.get_payload(decode=True);
-                else:
-                    filename = 'attach_file'+str(counter);
-                    counter += 1;
-                    attachment[filename] = part.get_payload(decode=True);
-                #end if
-            #end if
-            message['attachment'] = attachment
-        #end for        
-        return message
 
     def msg_send(self, msg, emails, priority=None):
         if not len(emails):
             return False
         del msg['To']
         msg['To'] = emails[0]
-        msg['Subject'] = 'OpenERP Record-id:' + msg['Subject']
         if len(emails)>1:
             if 'Cc' in msg:
                 del msg['Cc']
             msg['Cc'] = ','.join(emails[1:])
+
         del msg['Reply-To']
         msg['Reply-To'] = self.email
         if self.smtp_user and self.smtp_password:
@@ -319,17 +111,25 @@ class email_parser(object):
         return False
 
 
-    def parse(self, msg):
-        #TODO: Something with Message hierarchy 
-        res_id = self.msg_new(msg)
-        subject = self._decode_header(msg['subject'])
+    def parse(self, message):
+        try:
+            res_id = self.rpc('email.server.tools', 'process_email', self.model, message)
+        except Exception, e:
+            res_id = False
+
+        msg = EMAIL.message_from_string(str(message))
+        subject = self._decode_header(msg['Subject'])
         if msg.get('Subject', ''):
             del msg['Subject']
-        msg['Subject'] = '['+str(res_id)+'] '+subject
-#        msg['Message-Id'] = '<'+str(time.time())+'-openerpcrm-'+str(res_id)+'@'+socket.gethostname()+'>'
+
+       #Changed for sending reply mail
+        if res_id:
+            msg['Subject'] = '['+str(res_id)+'] '+subject
+            msg['Message-Id'] = '<'+str(time.time())+'-openerpcrm-'+str(res_id)+'@'+socket.gethostname()+'>'
 
         mm = [self._decode_header(msg['From']), self._decode_header(msg['To'])]+self._decode_header(msg.get('Cc', '')).split(',')
         msg_mails = map(self.email_get, filter(None, mm))
+
         try:
             self.msg_send(msg, msg_mails)
         except Exception, e:
@@ -364,7 +164,7 @@ if __name__ == '__main__':
     (options, args) = parser.parse_args()
     parser = email_parser(options.userid, options.password, options.model, options.email, options.default, dbname=options.dbname, host=options.host, port=options.port, smtp_server=options.smtp_server, smtp_port=options.smtp_port, smtp_ssl=options.smtp_ssl, smtp_user=options.smtp_user, smtp_password=options.smtp_password)
 
-    msg_txt = email.message_from_file(sys.stdin)
+    msg_txt = sys.stdin.read().decode('utf8')
 
     parser.parse(msg_txt)
  

From befeed957cf6c22e1ebe91bf62ae62b4f8aab1f0 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 11 Jun 2010 17:54:59 +0530
Subject: [PATCH 063/121] [IMP]: fetchmail: * Used common class and script of
 mail_gateway that are used for mail processing, * Optimized code

bzr revid: rpa@tinyerp.com-20100611122459-msu7t9o2651m3q9h
---
 addons/fetchmail/fetchmail.py                 | 415 +++---------------
 addons/fetchmail/security/ir.model.access.csv |   1 -
 2 files changed, 64 insertions(+), 352 deletions(-)

diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index a96f1bf9af9..a61d4f50031 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -2,7 +2,7 @@
 #-*- coding:utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution    
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    mga@tinyerp.com
 #
@@ -21,140 +21,57 @@
 #
 ##############################################################################
 
-import os
-import re
 import time
 
-import email
-import binascii
-import mimetypes
-
 from imaplib import IMAP4
-from imaplib import IMAP4_SSL   
-
+from imaplib import IMAP4_SSL
 from poplib import POP3
 from poplib import POP3_SSL
 
-from email.header import Header
-from email.header import decode_header
-
 import netsvc
-from osv import osv
-from osv import fields
-from tools.translate import _
+from osv import osv, fields
 
 logger = netsvc.Logger()
 
-def html2plaintext(html, body_id=None, encoding='utf-8'):
-    ## (c) Fry-IT, www.fry-it.com, 2007
-    ## <peter@fry-it.com>
-    ## download here: http://www.peterbe.com/plog/html2plaintext
 
-    """ from an HTML text, convert the HTML to plain text.
-    If @body_id is provided then this is the tag where the
-    body (not necessarily <body>) starts.
-    """
-    try:
-        from BeautifulSoup import BeautifulSoup, SoupStrainer, Comment
-    except:
-        return html
-
-    urls = []
-    if body_id is not None:
-        strainer = SoupStrainer(id=body_id)
-    else:
-        strainer = SoupStrainer('body')
-
-    soup = BeautifulSoup(html, parseOnlyThese=strainer, fromEncoding=encoding)
-    for link in soup.findAll('a'):
-        title = link.renderContents()
-        for url in [x[1] for x in link.attrs if x[0]=='href']:
-            urls.append(dict(url=url, tag=str(link), title=title))
-
-    html = soup.__str__()
-
-    url_index = []
-    i = 0
-    for d in urls:
-        if d['title'] == d['url'] or 'http://'+d['title'] == d['url']:
-            html = html.replace(d['tag'], d['url'])
-        else:
-            i += 1
-            html = html.replace(d['tag'], '%s [%s]' % (d['title'], i))
-            url_index.append(d['url'])
-
-    html = html.replace('<strong>','*').replace('</strong>','*')
-    html = html.replace('<b>','*').replace('</b>','*')
-    html = html.replace('<h3>','*').replace('</h3>','*')
-    html = html.replace('<h2>','**').replace('</h2>','**')
-    html = html.replace('<h1>','**').replace('</h1>','**')
-    html = html.replace('<em>','/').replace('</em>','/')
-
-    # the only line breaks we respect is those of ending tags and
-    # breaks
-
-    html = html.replace('\n',' ')
-    html = html.replace('<br>', '\n')
-    html = html.replace('<tr>', '\n')
-    html = html.replace('</p>', '\n\n')
-    html = re.sub('<br\s*/>', '\n', html)
-    html = html.replace(' ' * 2, ' ')
-
-    # for all other tags we failed to clean up, just remove then and
-    # complain about them on the stderr
-    def desperate_fixer(g):
-        #print >>sys.stderr, "failed to clean up %s" % str(g.group())
-        return ' '
-
-    html = re.sub('<.*?>', desperate_fixer, html)
-
-    # lstrip all lines
-    html = '\n'.join([x.lstrip() for x in html.splitlines()])
-
-    for i, url in enumerate(url_index):
-        if i == 0:
-            html += '\n\n'
-        html += '[%s] %s\n' % (i+1, url)
-    return html
-    
 class email_server(osv.osv):
-    
+
     _name = 'email.server'
     _description = "POP/IMAP Server"
-    
+
     _columns = {
-        'name':fields.char('Name', size=256, required=True, readonly=False),
-        'active':fields.boolean('Active', required=False),
+        'name':fields.char('Name', size=256, required=True, readonly=False), 
+        'active':fields.boolean('Active', required=False), 
         'state':fields.selection([
-            ('draft','Not Confirmed'),
-            ('wating','Waiting for Verification'),
-            ('done','Confirmed'),
-        ],'State', select=True, readonly=True),
-        'server' : fields.char('Server', size=256, required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'port' : fields.integer('Port', required=True, readonly=True, states={'draft':[('readonly',False)]}),
+            ('draft', 'Not Confirmed'), 
+            ('wating', 'Waiting for Verification'), 
+            ('done', 'Confirmed'), 
+        ], 'State', select=True, readonly=True), 
+        'server' : fields.char('Server', size=256, required=True, readonly=True, states={'draft':[('readonly', False)]}), 
+        'port' : fields.integer('Port', required=True, readonly=True, states={'draft':[('readonly', False)]}), 
         'type':fields.selection([
-            ('pop','POP Server'),
-            ('imap','IMAP Server'),
-        ],'State', select=True, readonly=False),
-        'is_ssl':fields.boolean('SSL ?', required=False),
-        'attach':fields.boolean('Add Attachments ?', required=False),
-        'date': fields.date('Date', readonly=True, states={'draft':[('readonly',False)]}),
-        'user' : fields.char('User Name', size=256, required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'password' : fields.char('Password', size=1024, invisible=True, required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'note': fields.text('Description'),
-        'action_id':fields.many2one('ir.actions.server', 'Reply Email', required=False, domain="[('state','=','email')]"),
-        'object_id': fields.many2one('ir.model',"Model", required=True),
-        'priority': fields.integer('Server Priority', readonly=True, states={'draft':[('readonly',False)]}, help="Priority between 0 to 10, select define the order of Processing"),
-        'user_id':fields.many2one('res.users', 'User', required=False),
+            ('pop', 'POP Server'), 
+            ('imap', 'IMAP Server'), 
+        ], 'State', select=True, readonly=False), 
+        'is_ssl':fields.boolean('SSL ?', required=False), 
+        'attach':fields.boolean('Add Attachments ?', required=False), 
+        'date': fields.date('Date', readonly=True, states={'draft':[('readonly', False)]}), 
+        'user' : fields.char('User Name', size=256, required=True, readonly=True, states={'draft':[('readonly', False)]}), 
+        'password' : fields.char('Password', size=1024, invisible=True, required=True, readonly=True, states={'draft':[('readonly', False)]}), 
+        'note': fields.text('Description'), 
+        'action_id':fields.many2one('ir.actions.server', 'Reply Email', required=False, domain="[('state','=','email')]"), 
+        'object_id': fields.many2one('ir.model', "Model", required=True), 
+        'priority': fields.integer('Server Priority', readonly=True, states={'draft':[('readonly', False)]}, help="Priority between 0 to 10, select define the order of Processing"), 
+        'user_id':fields.many2one('res.users', 'User', required=False), 
     }
     _defaults = {
-        'state': lambda *a: "draft",
-        'active': lambda *a: True,
-        'priority': lambda *a: 5,
-        'date': lambda *a: time.strftime('%Y-%m-%d'),
-        'user_id': lambda self, cr, uid, ctx: uid,
+        'state': lambda *a: "draft", 
+        'active': lambda *a: True, 
+        'priority': lambda *a: 5, 
+        'date': lambda *a: time.strftime('%Y-%m-%d'), 
+        'user_id': lambda self, cr, uid, ctx: uid, 
     }
-    
+
     def check_duplicate(self, cr, uid, ids):
         vals = self.read(cr, uid, ids, ['user', 'password'])[0]
         cr.execute("select count(id) from email_server where user='%s' and password='%s'" % (vals['user'], vals['password']))
@@ -162,215 +79,41 @@ class email_server(osv.osv):
         if res:
             if res[0] > 1:
                 return False
-        return True 
+        return True
 
     _constraints = [
         (check_duplicate, 'Warning! Can\'t have duplicate server configuration!', ['user', 'password'])
     ]
-    
+
     def onchange_server_type(self, cr, uid, ids, server_type=False, ssl=False):
         port = 0
         if server_type == 'pop':
             port = ssl and 995 or 110
         elif server_type == 'imap':
             port = ssl and 993 or 143
-        
+
         return {'value':{'port':port}}
-    
-    def _process_email(self, cr, uid, server, message, context={}):
-        context.update({
-            'server_id':server.id
-        })
-        history_pool = self.pool.get('mailgate.message')
-        msg_txt = email.message_from_string(message)
-        message_id = msg_txt.get('Message-ID', False)
-
-        msg = {}
-        if not message_id:
-            return False
-        
-        fields = msg_txt.keys()
-        
-        msg['id'] = message_id
-        msg['message-id'] = message_id
-
-        def _decode_header(txt):
-            txt = txt.replace('\r', '')
-            return ' '.join(map(lambda (x, y): unicode(x, y or 'ascii'), decode_header(txt)))
-        
-        if 'Subject' in fields:
-            msg['subject'] = _decode_header(msg_txt.get('Subject'))
-        
-        if 'Content-Type' in fields:
-            msg['content-type'] = msg_txt.get('Content-Type')
-        
-        if 'From' in fields:
-            msg['from'] = _decode_header(msg_txt.get('From'))
-        
-        if 'Delivered-To' in fields:
-            msg['to'] = _decode_header(msg_txt.get('Delivered-To'))
-        
-        if 'Cc' in fields:
-            msg['cc'] = _decode_header(msg_txt.get('Cc'))
-        
-        if 'Reply-To' in fields:
-            msg['reply'] = _decode_header(msg_txt.get('Reply-To'))
-        
-        if 'Date' in fields:
-            msg['date'] = msg_txt.get('Date')
-        
-        if 'Content-Transfer-Encoding' in fields:
-            msg['encoding'] = msg_txt.get('Content-Transfer-Encoding')
-        
-        if 'References' in fields:
-            msg['references'] = msg_txt.get('References')
-
-        if 'X-openerp-caseid' in fields:
-            msg['caseid'] = msg_txt.get('X-openerp-caseid')
-        
-        if 'X-Priority' in fields:
-            msg['priority'] = msg_txt.get('X-priority', '3 (Normal)').split(' ')[0]
-        
-        if not msg_txt.is_multipart() or 'text/plain' in msg.get('content-type', None):
-            encoding = msg_txt.get_content_charset()
-            msg['body'] = msg_txt.get_payload(decode=True)
-            if encoding:
-                msg['body'] = msg['body'].decode(encoding).encode('utf-8')
-        
-        attachents = {}
-        if msg_txt.is_multipart() or 'multipart/alternative' in msg.get('content-type', None):
-            body = ""
-            counter = 1
-            for part in msg_txt.walk():
-                if part.get_content_maintype() == 'multipart':
-                    continue
-                
-                encoding = part.get_content_charset()
-
-                if part.get_content_maintype()=='text':
-                    content = part.get_payload(decode=True)
-                    filename = part.get_filename()
-                    if filename :
-                        attachents[filename] = content
-                    else:
-                        if encoding:
-                            content = unicode(content, encoding)
-                        if part.get_content_subtype() == 'html':
-                            body = html2plaintext(content)
-                        elif part.get_content_subtype() == 'plain':
-                            body = content
-                elif part.get_content_maintype()=='application' or part.get_content_maintype()=='image' or part.get_content_maintype()=='text':
-                    filename = part.get_filename();
-                    if filename :
-                        attachents[filename] = part.get_payload(decode=True)
-                    else:
-                        res = part.get_payload(decode=True)
-                        if encoding:
-                            res = res.decode(encoding).encode('utf-8')
-
-                        body += res
-
-            msg['body'] = body
-            msg['attachments'] = attachents
-
-
-        res_id = False
-        if msg.get('references', False):
-            id = False
-            ref = msg.get('references')
-            if '\r\n' in ref:
-                ref = msg.get('references').split('\r\n')
-            else:
-                ref = msg.get('references').split(' ')
-            if ref:
-                hids = history_pool.search(cr, uid, [('name','=',ref[0].strip())])
-                if hids:
-                    id = hids[0]
-                    history = history_pool.browse(cr, uid, id)
-                    model_pool = self.pool.get(server.object_id.model)
-                    context.update({
-                        'references_id':ref[0]
-                    })
-                    vals = {
-                    
-                    }
-                    if hasattr(model_pool, 'message_update'):
-                        model_pool.message_update(cr, uid, [history.res_id], vals, msg, context=context)
-                    else:
-                        logger.notifyChannel('imap', netsvc.LOG_WARNING, 'method def message_update is not define in model %s' % (model_pool._name))
-                        return False
-            res_id = id
-        else:
-            model_pool = self.pool.get(server.object_id.model)
-            if hasattr(model_pool, 'message_new'):
-                res_id = model_pool.message_new(cr, uid, msg, context)
-            else:
-                data = {
-                    'name': msg.get('subject'), 
-                    'email_from': msg.get('from'), 
-                    'email_cc': msg.get('cc'),
-                    'user_id': False, 
-                    'description': msg.get('body'), 
-                    'state' : 'draft',
-                }
-                res_id = model_pool.create(cr, uid, data, context=context)
-                logger.notifyChannel('imap', netsvc.LOG_WARNING, 'method def message_new is not define in model %s. Using default method' % (model_pool._name))
-
-            att_ids = []
-            if server.attach:
-                for attactment in attachents or []:
-                    data_attach = {
-                        'name': attactment,
-                        'datas':binascii.b2a_base64(str(attachents.get(attactment))),
-                        'datas_fname': attactment,
-                        'description': 'Mail attachment',
-                        'res_model': server.object_id.model,
-                        'res_id': res_id,
-                    }
-                    att_ids.append(self.pool.get('ir.attachment').create(cr, uid, data_attach))
-            
-            if server.action_id:
-                action_pool = self.pool.get('ir.actions.server')
-                action_pool.run(cr, uid, [server.action_id.id], {'active_id':res_id, 'active_ids':[res_id]})
-            res = {
-                'name': msg.get('subject', 'No subject'), 
-                'message_id': message_id,
-                'date': msg.get('date'),
-                'res_id': res_id, 
-                'email_from': msg.get('from'), 
-                'email_to': msg.get('to'), 
-                'email_cc': msg.get('cc'), 
-                'model': server.object_id.model, 
-                'server_id': server.id, 
-                'description': msg.get('body', msg.get('from')),
-                'ref_id':msg.get('references', msg.get('id')),
-                'type':server.type, 
-                'attachment_ids': [(6, 0, att_ids)]
-            }
-            his_id = history_pool.create(cr, uid, res)
-            
-        return res_id
 
     def set_draft(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids , {'state':'draft'})
         return True
-        
+
     def button_fetch_mail(self, cr, uid, ids, context={}):
         self.fetch_mail(cr, uid, ids)
 #        sendmail_thread = threading.Thread(target=self.fetch_mail, args=(cr, uid, ids))
 #        sendmail_thread.start()
         return True
-        
+
     def _fetch_mails(self, cr, uid, ids=False, context={}):
         if not ids:
             ids = self.search(cr, uid, [])
         return self.fetch_mail(cr, uid, ids, context)
-    
-    def fetch_mail(self, cr, uid, ids, context={}):
 
+    def fetch_mail(self, cr, uid, ids, context={}):
+        email_tool = self.pool.get('email.server.tools')
         for server in self.browse(cr, uid, ids, context):
             logger.notifyChannel('imap', netsvc.LOG_INFO, 'fetchmail start checking for new emails on %s' % (server.name))
-            
+
             count = 0
             try:
                 if server.type == 'imap':
@@ -379,17 +122,21 @@ class email_server(osv.osv):
                         imap_server = IMAP4_SSL(server.server, int(server.port))
                     else:
                         imap_server = IMAP4(server.server, int(server.port))
-                    
+
                     imap_server.login(server.user, server.password)
                     imap_server.select()
                     result, data = imap_server.search(None, '(UNSEEN)')
                     for num in data[0].split():
                         result, data = imap_server.fetch(num, '(RFC822)')
-                        if self._process_email(cr, uid, server, data[0][1], context):
+                        res_id = email_tool.process_email(cr, uid, server.object_id.model, data[0][1], attach=server.attach, server_id=server.id, server_type=server.type, context=context)
+                        if res_id and server.action_id:
+                            action_pool = self.pool.get('ir.actions.server')
+                            action_pool.run(cr, uid, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id]})
+
                             imap_server.store(num, '+FLAGS', '\\Seen')
                             count += 1
                     logger.notifyChannel('imap', netsvc.LOG_INFO, 'fetchmail fetch/process %s email(s) from %s' % (count, server.name))
-                    
+
                     imap_server.close()
                     imap_server.logout()
                 elif server.type == 'pop':
@@ -398,7 +145,7 @@ class email_server(osv.osv):
                         pop_server = POP3_SSL(server.server, int(server.port))
                     else:
                         pop_server = POP3(server.server, int(server.port))
-                   
+
                     #TODO: use this to remove only unread messages
                     #pop_server.user("recent:"+server.user)
                     pop_server.user(server.user)
@@ -409,72 +156,38 @@ class email_server(osv.osv):
                     for num in range(1, numMsgs + 1):
                         (header, msges, octets) = pop_server.retr(num)
                         msg = '\n'.join(msges)
-                        self._process_email(cr, uid, server, msg, context)
+                        res_id = email_tool.process_email(cr, uid, server.object_id.model, data[0][1], attach=server.attach, server_id=server.id, server_type=server.type, context=context)
+                        if res_id and server.action_id:
+                            action_pool = self.pool.get('ir.actions.server')
+                            action_pool.run(cr, uid, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id]})
+
                         pop_server.dele(num)
 
                     pop_server.quit()
-                    
+
                     logger.notifyChannel('imap', netsvc.LOG_INFO, 'fetchmail fetch %s email(s) from %s' % (numMsgs, server.name))
-                
+
                 self.write(cr, uid, [server.id], {'state':'done'})
             except Exception, e:
                 logger.notifyChannel(server.type, netsvc.LOG_WARNING, '%s' % (e))
-                
+
         return True
 
 email_server()
 
-class mail_server_history(osv.osv):
+class mailgate_message(osv.osv):
 
     _inherit = "mailgate.message"
-    
+
     _columns = {
-        'server_id': fields.many2one('email.server',"Mail Server", readonly=True, select=True),
+        'server_id': fields.many2one('email.server', "Mail Server", readonly=True, select=True), 
         'type':fields.selection([
-            ('pop','POP Server'),
-            ('imap','IMAP Server'),
-        ],'State', select=True, readonly=True),
+            ('pop', 'POP Server'), 
+            ('imap', 'IMAP Server'), 
+        ], 'State', select=True, readonly=True), 
     }
     _order = 'id desc'
-    
-mail_server_history()
 
-class fetchmail_tool(osv.osv):
+mailgate_message()
 
-    _name = 'email.server.tools'
-    _description = "Email Tools"
-    _auto = False
-    
-    def to_email(self, text):
-        _email = re.compile(r'.*<.*@.*\..*>', re.UNICODE)
-        def record(path):
-            eml = path.group()
-            index = eml.index('<')
-            eml = eml[index:-1].replace('<','').replace('>','')
-            return eml
-
-        bits = _email.sub(record, text)
-        return bits
-    
-    def get_partner(self, cr, uid, from_email, context=None):
-        """
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks
-        @param from_email: email address based on that function will search for the correct 
-        """
-        
-        res = {
-            'partner_address_id': False,
-            'partner_id': False
-        }
-        from_email = self.to_email(from_email)
-        address_ids = self.pool.get('res.partner.address').search(cr, uid, [('email', '=', from_email)])
-        if address_ids:
-            address = self.pool.get('res.partner.address').browse(cr, uid, address_ids[0])
-            res['partner_address_id'] = address_ids[0]
-            res['partner_id'] = address.partner_id.id
-        
-        return res
-        
-fetchmail_tool()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/fetchmail/security/ir.model.access.csv b/addons/fetchmail/security/ir.model.access.csv
index d31fd067485..7aa6c84d22b 100644
--- a/addons/fetchmail/security/ir.model.access.csv
+++ b/addons/fetchmail/security/ir.model.access.csv
@@ -1,3 +1,2 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_email_server","email.server","model_email_server",,1,1,1,1
-"access_email_server_tools","email.server.tools","model_email_server_tools",,1,1,1,1

From 258f1a7729ba96b94a0ee1ce50ff34afb1c8cfcb Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 11 Jun 2010 17:58:06 +0530
Subject: [PATCH 064/121] [IMP]: mail_gateway: Minor improvement in menu

bzr revid: rpa@tinyerp.com-20100611122806-j2jyee0zbrb4wuo2
---
 addons/mail_gateway/mail_gateway_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
index fbec97e6a17..0ce1af446e9 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -181,6 +181,7 @@
             <field name="res_model">mailgate.message</field>
             <field name="view_mode">tree,form</field>
             <field name="view_type">form</field>
+            <field name="view_type">[('history', '=', True)]</field>
             <field name="view_id" ref="view_mailgate_message_tree"/>
         </record>
         

From acf23616b71c94d20f7d0001b77a78b92f1f1bbd Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Fri, 11 Jun 2010 19:42:11 +0530
Subject: [PATCH 065/121] [IMP] Improvement for delete the recrod

bzr revid: ksa@tinyerp.co.in-20100611141211-1wi39kn5up15309v
---
 addons/audittrail/audittrail.py | 110 +++++++++++++++++++-------------
 1 file changed, 66 insertions(+), 44 deletions(-)

diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index 1a72a26ea5f..0233f2fb624 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -131,8 +131,22 @@ class audittrail_log(osv.osv):
     _name = 'audittrail.log'
     _description = "Audittrail Log"
 
+#    def _name_get_resname(self, cr, uid, ids, *args):
+#        data = {}
+#        for resname in self.browse(cr, uid, ids,[]):
+#            model_object = resname.object_id.name
+#            res_id = resname.res_id
+#            if model_object and res_id:
+#            #    model_pool = self.pool.get(model_object)
+#                res = model_object.name_get(cr,uid,[res_id])
+#                data[resname.id] = res and res[0][1]
+#            else:
+#                 data[resname.id] = False
+#        return data
+
     _columns = {
         "name": fields.char("Name", size=32),
+     #   'name': fields.function(_name_get_resname, type='char', string='Resource Name', method=True),
         "object_id": fields.many2one('ir.model', 'Object'),
         "user_id": fields.many2one('res.users', 'User'),
         "method": fields.char("Method", size=64),
@@ -187,14 +201,20 @@ class audittrail_objects_proxy(osv_pool):
             context = {}
         pool = pooler.get_pool(cr.dbname)
         field_pool = pool.get('ir.model.fields')
-        field_ids = field_pool.search(cr, uid, [('name', '=', field_name), ('model_id', '=', model.id)])
+        model_pool = pool.get('ir.model')
+        obj_pool = pool.get(model.model)
+        if obj_pool._inherits:
+            inherits_ids = model_pool.search(cr, uid, [('model', '=', obj_pool._inherits.keys()[0])])
+            field_ids = field_pool.search(cr, uid, [('name', '=', field_name), ('model_id', 'in', (model.id, inherits_ids[0]))])
+        else:
+            field_ids = field_pool.search(cr, uid, [('name', '=', field_name), ('model_id', '=', model.id)])
         field_id = field_ids and field_ids[0] or False
         assert field_id, _("'%s' field is not exits in '%s' model" %(field_name, model.model))
-        
+
         field = field_pool.read(cr, uid, field_id)
         relation_model = field['relation']
         relation_model_pool = relation_model and pool.get(relation_model) or False
-       
+
         if field['ttype'] == 'many2one':
             res = False
             relation_id = False
@@ -206,11 +226,11 @@ class audittrail_objects_proxy(osv_pool):
             return res
 
         elif field['ttype'] in ('many2many','one2many'):
-            res = []            
-            for relation_model_object in relation_model_pool.read(cr, uid, values, [relation_model_pool._rec_name]):                    
+            res = []
+            for relation_model_object in relation_model_pool.read(cr, uid, values, [relation_model_pool._rec_name]):
                 res.append(relation_model_object[relation_model_pool._rec_name])
             return res
-       
+
         return values
 
     def create_log_line(self, cr, uid, log_id, model, lines=[]):
@@ -236,7 +256,7 @@ class audittrail_objects_proxy(osv_pool):
                 field_ids = field_pool.search(cr, uid, [('name', '=', line['name']), ('model_id', '=', model.id)])
             field_id = field_ids and field_ids[0] or False
             assert field_id, _("'%s' field is not exits in '%s' model" %(line['name'], model.model))
-            
+
             field = field_pool.read(cr, uid, field_id)
             old_value = 'old_value' in line and  line['old_value'] or ''
             new_value = 'new_value' in line and  line['new_value'] or ''
@@ -259,7 +279,7 @@ class audittrail_objects_proxy(osv_pool):
                     "new_value_text": new_value_text,
                     "field_description": field['field_description']
                     }
-            line_id = log_line_pool.create(cr, uid, vals)            
+            line_id = log_line_pool.create(cr, uid, vals)
         #End Loop
         return True
 
@@ -281,43 +301,43 @@ class audittrail_objects_proxy(osv_pool):
         resource_pool = pool.get(model)
         log_pool = pool.get('audittrail.log')
         model_pool = pool.get('ir.model')
-        
-        model_ids = model_pool.search(cr, uid, [('model', '=', model)])        
-        model_id = model_ids and model_ids[0] or False 
+
+        model_ids = model_pool.search(cr, uid, [('model', '=', model)])
+        model_id = model_ids and model_ids[0] or False
         assert model_id, _("'%s' Model is not exits..." %(model))
         model = model_pool.browse(cr, uid, model_id)
 
         if method in ('create'):
             res_id = fct_src(db, uid, model.model, method, *args)
-            cr.commit()            
+            cr.commit()
             resource = resource_pool.read(cr, uid, res_id, args[0].keys())
             vals = {
                     "method": method,
                     "object_id": model.id,
-                    "user_id": uid, 
+                    "user_id": uid,
                     "res_id": resource['id'],
             }
             if 'id' in resource:
                 del resource['id']
             log_id = log_pool.create(cr, uid, vals)
             lines = []
-            for field in resource:                
+            for field in resource:
                 line = {
                       'name': field,
                       'new_value': resource[field],
                       'new_value_text': self.get_value_text(cr, uid, field, resource[field], model)
                       }
                 lines.append(line)
-            self.create_log_line(cr, uid, log_id, model, lines)       
+            self.create_log_line(cr, uid, log_id, model, lines)
 
             cr.commit()
             cr.close()
-            return res_id        
+            return res_id
 
         elif method in ('read'):
             res_ids = args[0]
             old_values = {}
-            res = fct_src(db, uid, model, method, *args)
+            res = fct_src(db, uid, model.model, method, *args)
             if type(res) == list:
                 for v in res:
                     old_values[v['id']] = v
@@ -327,22 +347,22 @@ class audittrail_objects_proxy(osv_pool):
                 vals = {
                     "method": method,
                     "object_id": model.id,
-                    "user_id": uid, 
+                    "user_id": uid,
                     "res_id": res_id,
-                    
+
                 }
                 log_id = log_pool.create(cr, uid, vals)
                 lines = []
-                for field in old_values[res_id]:                    
+                for field in old_values[res_id]:
                     line = {
                               'name': field,
                               'old_value': old_values[res_id][field],
                               'old_value_text': self.get_value_text(cr, uid, field, old_values[res_id][field], model)
                               }
                     lines.append(line)
-            
+
                 self.create_log_line(cr, uid, log_id, model, lines)
-            
+
             cr.close()
             return res
 
@@ -356,27 +376,29 @@ class audittrail_objects_proxy(osv_pool):
                 vals = {
                     "method": method,
                     "object_id": model.id,
-                    "user_id": uid, 
+                    "user_id": uid,
                     "res_id": res_id,
-                    
+
                 }
-                log_id = log_pool.create(cr, uid, vals)                    
+                log_id = log_pool.create(cr, uid, vals)
                 lines = []
-                for field in old_values[res_id]:                   
+                for field in old_values[res_id]:
+                    if field in ('id'):
+                        continue
                     line = {
                           'name': field,
                           'old_value': old_values[res_id][field],
                           'old_value_text': self.get_value_text(cr, uid, field, old_values[res_id][field], model)
                           }
                     lines.append(line)
-                   
+
                 self.create_log_line(cr, uid, log_id, model, lines)
-            res = fct_src(db, uid, model, method, *args)
+            res = fct_src(db, uid, model.model, method, *args)
             cr.commit()
             cr.close()
             return res
         else:
-            res_ids = args[0]            
+            res_ids = args[0]
             old_values = {}
             fields = []
             if len(args)>1 and type(args[1]) == dict:
@@ -384,10 +406,10 @@ class audittrail_objects_proxy(osv_pool):
             if type(res_ids) in (long, int):
                 res_ids = [res_ids]
             if res_ids:
-                for resource in resource_pool.read(cr, uid, res_ids, fields): 
-                    resource_id = resource['id']                  
+                for resource in resource_pool.read(cr, uid, res_ids, fields):
+                    resource_id = resource['id']
                     if 'id' in resource:
-                        del resource['id']       
+                        del resource['id']
                     old_values_text = {}
                     old_value = {}
                     for field in resource.keys():
@@ -406,14 +428,14 @@ class audittrail_objects_proxy(osv_pool):
                     vals = {
                         "method": method,
                         "object_id": model.id,
-                        "user_id": uid, 
-                        "res_id": resource_id,                    
+                        "user_id": uid,
+                        "res_id": resource_id,
                     }
-                
-                    
+
+
                     log_id = log_pool.create(cr, uid, vals)
                     lines = []
-                    for field in resource.keys():                    
+                    for field in resource.keys():
                         line = {
                               'name': field,
                               'new_value': resource[field],
@@ -422,14 +444,14 @@ class audittrail_objects_proxy(osv_pool):
                               'old_value_text': old_values[resource_id]['text'][field]
                               }
                         lines.append(line)
-                    
+
                     self.create_log_line(cr, uid, log_id, model, lines)
                 cr.commit()
             cr.close()
             return res
         return True
 
-    
+
 
     def execute(self, db, uid, model, method, *args, **kw):
         """
@@ -449,11 +471,11 @@ class audittrail_objects_proxy(osv_pool):
         logged_uids = []
         fct_src = super(audittrail_objects_proxy, self).execute
 
-        def my_fct(db, uid, model, method, *args):            
+        def my_fct(db, uid, model, method, *args):
             rule = False
-            model_ids = model_pool.search(cr, uid, [('model', '=', model)])        
-            model_id = model_ids and model_ids[0] or False 
-            
+            model_ids = model_pool.search(cr, uid, [('model', '=', model)])
+            model_id = model_ids and model_ids[0] or False
+
             for model_name in pool.obj_list():
                 if model_name == 'audittrail.rule':
                     rule = True
@@ -481,7 +503,7 @@ class audittrail_objects_proxy(osv_pool):
                 return fct_src(db, uid, model, method, *args)
         res = my_fct(db, uid, model, method, *args)
         cr.close()
-        return res   
+        return res
 
 
     def exec_workflow(self, db, uid, model, method, *args, **argv):

From a9c60d6bdc4c729e159d9613077967a0c19448a2 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Sat, 12 Jun 2010 08:02:36 +0530
Subject: [PATCH 066/121] [IMP] document_ftp * Browse FTP Wizard * Auto
 Directory Configuration Wizard

bzr revid: hmo@tinyerp.com-20100612023236-h54w0256v89irxgh
---
 addons/document_ftp/__init__.py               |   2 +-
 addons/document_ftp/__openerp__.py            |   3 +-
 addons/document_ftp/doc_conf_wizard.py        | 149 ------------------
 addons/document_ftp/wizard/__init__.py        |  24 +++
 .../wizard/document_configuration.py          | 121 ++++++++++++++
 .../document_configuration_view.xml}          |  28 ++--
 addons/document_ftp/wizard/ftp_browse.py      |  53 +++++++
 .../document_ftp/wizard/ftp_browse_view.xml   |  40 +++++
 8 files changed, 250 insertions(+), 170 deletions(-)
 delete mode 100644 addons/document_ftp/doc_conf_wizard.py
 create mode 100644 addons/document_ftp/wizard/__init__.py
 create mode 100644 addons/document_ftp/wizard/document_configuration.py
 rename addons/document_ftp/{document_ftp_view.xml => wizard/document_configuration_view.xml} (67%)
 create mode 100644 addons/document_ftp/wizard/ftp_browse.py
 create mode 100644 addons/document_ftp/wizard/ftp_browse_view.xml

diff --git a/addons/document_ftp/__init__.py b/addons/document_ftp/__init__.py
index 45ec4a6b67f..af514df8985 100644
--- a/addons/document_ftp/__init__.py
+++ b/addons/document_ftp/__init__.py
@@ -18,7 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
-import doc_conf_wizard
 import ftpserver
+import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_ftp/__openerp__.py b/addons/document_ftp/__openerp__.py
index 18042dabf93..92ecac1d4ed 100644
--- a/addons/document_ftp/__openerp__.py
+++ b/addons/document_ftp/__openerp__.py
@@ -33,7 +33,8 @@
     'depends': ['base', 'document'],
     'init_xml': [],
     'update_xml': [
-        'document_ftp_view.xml',
+        'wizard/ftp_browse_view.xml',
+        'wizard/document_configuration_view.xml',
         'security/ir.model.access.csv'
     ],
     'demo_xml': [],
diff --git a/addons/document_ftp/doc_conf_wizard.py b/addons/document_ftp/doc_conf_wizard.py
deleted file mode 100644
index 1399bc276b5..00000000000
--- a/addons/document_ftp/doc_conf_wizard.py
+++ /dev/null
@@ -1,149 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import base64
-
-from osv import osv, fields
-from osv.orm import except_orm
-import urlparse
-
-import os
-
-class document_configuration_wizard(osv.osv_memory):
-
-    _name='document.configuration.wizard'
-    _description = 'Auto Directory Configuration'
-    _inherit = 'res.config'
-    _rec_name = 'host'
-    _columns = {
-        'host': fields.char('Address', size=64,
-                            help="Server address or IP.", required=True),
-    }
-
-    def detect_ip_addr(self, cr, uid, context=None):
-        def _detect_ip_addr(self, cr, uid, context=None):
-            from array import array
-            import socket
-            from struct import pack, unpack
-
-            try:
-                import fcntl
-            except ImportError:
-                fcntl = None
-
-            if not fcntl: # not UNIX:
-                host = socket.gethostname()
-                ip_addr = socket.gethostbyname(host)
-            else: # UNIX:
-                # get all interfaces:
-                nbytes = 128 * 32
-                s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-                names = array('B', '\0' * nbytes)
-                outbytes = unpack('iL', fcntl.ioctl( s.fileno(), 0x8912, pack('iL', nbytes, names.buffer_info()[0])))[0]
-                namestr = names.tostring()
-                ifaces = [namestr[i:i+32].split('\0', 1)[0] for i in range(0, outbytes, 32)]
-
-                for ifname in [iface for iface in ifaces if iface != 'lo']:
-                    ip_addr = socket.inet_ntoa(fcntl.ioctl(s.fileno(), 0x8915, pack('256s', ifname[:15]))[20:24])
-                    break
-            return ip_addr
-
-        try:
-            ip_addr = _detect_ip_addr(self, cr, uid, context)
-        except:
-            ip_addr = 'localhost'
-        return ip_addr
-
-    _defaults = {
-        'host': detect_ip_addr,
-    }
-
-    def execute(self, cr, uid, ids, context=None):
-        conf = self.browse(cr, uid, ids[0], context)
-        obj=self.pool.get('document.directory')
-        objid=self.pool.get('ir.model.data')
-
-        if self.pool.get('sale.order'):
-            id = objid._get_id(cr, uid, 'document', 'dir_sale_order_all')
-            id = objid.browse(cr, uid, id, context=context).res_id
-            mid = self.pool.get('ir.model').search(cr, uid, [('model','=','sale.order')])
-            obj.write(cr, uid, [id], {
-                'type':'ressource',
-                'ressource_type_id': mid[0],
-                'domain': '[]',
-            })
-            aid = objid._get_id(cr, uid, 'sale', 'report_sale_order')
-            aid = objid.browse(cr, uid, aid, context=context).res_id
-
-            self.pool.get('document.directory.content').create(cr, uid, {
-                'name': "Print Order",
-                'suffix': "_print",
-                'report_id': aid,
-                'extension': '.pdf',
-                'include_name': 1,
-                'directory_id': id,
-            })
-            id = objid._get_id(cr, uid, 'document', 'dir_sale_order_quote')
-            id = objid.browse(cr, uid, id, context=context).res_id
-            obj.write(cr, uid, [id], {
-                'type':'ressource',
-                'ressource_type_id': mid[0],
-                'domain': "[('state','=','draft')]",
-            })
-
-        if self.pool.get('product.product'):
-            id = objid._get_id(cr, uid, 'document', 'dir_product')
-            id = objid.browse(cr, uid, id, context=context).res_id
-            mid = self.pool.get('ir.model').search(cr, uid, [('model','=','product.product')])
-            obj.write(cr, uid, [id], {
-                'type':'ressource',
-                'ressource_type_id': mid[0],
-            })
-
-        if self.pool.get('stock.location'):
-            aid = objid._get_id(cr, uid, 'stock', 'report_product_history')
-            aid = objid.browse(cr, uid, aid, context=context).res_id
-
-            self.pool.get('document.directory.content').create(cr, uid, {
-                'name': "Product Stock",
-                'suffix': "_stock_forecast",
-                'report_id': aid,
-                'extension': '.pdf',
-                'include_name': 1,
-                'directory_id': id,
-            })
-
-        if self.pool.get('account.analytic.account'):
-            id = objid._get_id(cr, uid, 'document', 'dir_project')
-            id = objid.browse(cr, uid, id, context=context).res_id
-            mid = self.pool.get('ir.model').search(cr, uid, [('model','=','account.analytic.account')])
-            obj.write(cr, uid, [id], {
-                'type':'ressource',
-                'ressource_type_id': mid[0],
-                'domain': '[]',
-                'ressource_tree': 1
-        })
-
-        # Update the action for FTP browse.
-        aid = objid._get_id(cr, uid, 'document_ftp', 'action_document_browse')
-        aid = objid.browse(cr, uid, aid, context=context).res_id
-        self.pool.get('ir.actions.url').write(cr, uid, [aid], {'url': 'ftp://'+(conf.host or 'localhost')+':8021/'})
-document_configuration_wizard()
diff --git a/addons/document_ftp/wizard/__init__.py b/addons/document_ftp/wizard/__init__.py
new file mode 100644
index 00000000000..22971249113
--- /dev/null
+++ b/addons/document_ftp/wizard/__init__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+import ftp_browse
+import document_configuration
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_ftp/wizard/document_configuration.py b/addons/document_ftp/wizard/document_configuration.py
new file mode 100644
index 00000000000..e7966c2e3a4
--- /dev/null
+++ b/addons/document_ftp/wizard/document_configuration.py
@@ -0,0 +1,121 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+from osv import osv, fields
+from document_ftp import ftpserver
+class document_configuration(osv.osv_memory):
+
+    _name='document.configuration'
+    _description = 'Auto Directory Configuration'
+    _inherit = 'res.config'   
+
+    _columns = {
+        'sale_order' : fields.boolean('Sale Order', help="Auto directory configuration for Sale Orders and Quotation with report."),
+        'product' : fields.boolean('Product', help="Auto directory configuration for Products."),
+        'project': fields.boolean('Project', help="Auto directory configuration for Projects."),
+    }
+    
+
+    def execute(self, cr, uid, ids, context=None):
+        conf_id = ids and ids[0] or False
+        conf = self.browse(cr, uid, conf_id, context)
+        dir_pool = self.pool.get('document.directory')
+        data_pool = self.pool.get('ir.model.data')
+        model_pool = self.pool.get('ir.model')
+        content_pool = self.pool.get('document.directory.content')
+        if conf.sale_order and self.pool.get('sale.order'):
+            # Sale order
+            dir_data_id = data_pool._get_id(cr, uid, 'document', 'dir_sale_order_all')
+            if dir_data_id:
+                sale_dir_id = data_pool.browse(cr, uid, dir_data_id, context=context).res_id
+            else:
+                sale_dir_id = data_pool.create(cr, uid, {'name': 'Sale Orders'})
+            mid = model_pool.search(cr, uid, [('model','=','sale.order')])
+            dir_pool.write(cr, uid, [sale_dir_id], {
+                'type':'ressource',
+                'ressource_type_id': mid[0],
+                'domain': '[]',
+            })
+            # Qutation
+            dir_data_id = data_pool._get_id(cr, uid, 'document', 'dir_sale_order_quote')
+            if dir_data_id:
+                quta_dir_id = data_pool.browse(cr, uid, dir_data_id, context=context).res_id
+            else:
+                quta_dir_id = data_pool.create(cr, uid, {'name': 'Sale Quotations'})
+            
+            dir_pool.write(cr, uid, [quta_dir_id], {
+                'type':'ressource',
+                'ressource_type_id': mid[0],
+                'domain': "[('state','=','draft')]",
+            })
+            # Sale Order Report
+            order_report_data_id = data_pool._get_id(cr, uid, 'sale', 'report_sale_order')
+            if order_report_data_id:
+                order_report_id = data_pool.browse(cr, uid, order_report_data_id, context=context).res_id
+
+                content_pool.create(cr, uid, {
+                    'name': "Print Order",
+                    'suffix': "_print",
+                    'report_id': order_report_id,
+                    'extension': '.pdf',
+                    'include_name': 1,
+                    'directory_id': sale_dir_id,
+                })
+
+                content_pool.create(cr, uid, {
+                    'name': "Print Qutation",
+                    'suffix': "_print",
+                    'report_id': order_report_id,
+                    'extension': '.pdf',
+                    'include_name': 1,
+                    'directory_id': quta_dir_id,
+                })
+            
+
+        if conf.product and self.pool.get('product.product'):
+            # Product
+            dir_data_id = data_pool._get_id(cr, uid, 'document', 'dir_product')
+            if dir_data_id:
+                product_dir_id = data_pool.browse(cr, uid, dir_data_id, context=context).res_id
+            else:
+                product_dir_id = data_pool.create(cr, uid, {'name': 'Products'})
+            
+            mid = model_pool.search(cr, uid, [('model','=','product.product')])
+            dir_pool.write(cr, uid, [product_dir_id], {
+                'type':'ressource',
+                'ressource_type_id': mid[0],
+            })           
+
+        if conf.project and self.pool.get('account.analytic.account'):
+            # Project
+            dir_data_id = data_pool._get_id(cr, uid, 'document', 'dir_project')
+            if dir_data_id:
+                project_dir_id = data_pool.browse(cr, uid, dir_data_id, context=context).res_id
+            else:
+                project_dir_id = data_pool.create(cr, uid, {'name': 'Projects'})
+            
+            mid = model_pool.search(cr, uid, [('model','=','account.analytic.account')])
+            dir_pool.write(cr, uid, [project_dir_id], {
+                'type':'ressource',
+                'ressource_type_id': mid[0],
+                'domain': '[]',
+                'ressource_tree': 1
+        })        
+document_configuration()
diff --git a/addons/document_ftp/document_ftp_view.xml b/addons/document_ftp/wizard/document_configuration_view.xml
similarity index 67%
rename from addons/document_ftp/document_ftp_view.xml
rename to addons/document_ftp/wizard/document_configuration_view.xml
index d3f4c09498c..c6f40deb429 100644
--- a/addons/document_ftp/document_ftp_view.xml
+++ b/addons/document_ftp/wizard/document_configuration_view.xml
@@ -1,22 +1,8 @@
 <openerp>
   <data>
-    <record model="ir.actions.url" id="action_document_browse">
-        <field name="name">Browse Files</field>
-        <field name="url">ftp://localhost:8021/</field>
-    </record>
-    <menuitem
-        name="Shared Repository (FTP)"
-        action="action_document_browse"
-        id="menu_document_browse"
-        type="url"
-        icon="STOCK_EXECUTE"
-        parent="document.menu_document_doc" sequence="1"/>
-
-
-
     <record id="view_auto_config_form" model="ir.ui.view">
         <field name="name">Auto Configure Directory</field>
-        <field name="model">document.configuration.wizard</field>
+        <field name="model">document.configuration</field>
         <field name="type">form</field>
         <field name="inherit_id" ref="base.res_config_view_base"/>
         <field name="arch" type="xml">
@@ -25,17 +11,21 @@
               <attribute name="string">Auto Configure</attribute>
             </form>
              <separator string="title" position="attributes">
-            	<attribute name="string">FTP Server Configuration</attribute>
+            	<attribute name="string">Resource Directory Configuration </attribute>
           	</separator>
           	<xpath expr="//label[@string='description']" position="attributes">
-            <attribute name="string">Choose the address for the Document Management System's FTP server.</attribute>
+            <attribute name="string">Choose the following Resouces to auto directory configuration.</attribute>
           </xpath>
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
   				<attribute name='rowspan'>12</attribute>
       			<attribute name='string'></attribute>
 	      	</xpath>
             <group string="res_config_contents" position="replace">
-                <field name="host"/>
+                <group col="6" colspan="4">
+                    <field name="sale_order"/>
+                    <field name="product"/>
+                    <field name="project"/>
+                </group>
             </group>
             <xpath expr="//button[@name='action_skip']" position="replace"/>
           </data>
@@ -45,7 +35,7 @@
     <record id="action_config_auto_directory" model="ir.actions.act_window">
         <field name="name">Auto Configure Directory</field>
         <field name="type">ir.actions.act_window</field>
-        <field name="res_model">document.configuration.wizard</field>
+        <field name="res_model">document.configuration</field>
         <field name="view_id" ref="view_auto_config_form"/>
         <field name="view_type">form</field>
         <field name="view_mode">form</field>
diff --git a/addons/document_ftp/wizard/ftp_browse.py b/addons/document_ftp/wizard/ftp_browse.py
new file mode 100644
index 00000000000..06c9766997b
--- /dev/null
+++ b/addons/document_ftp/wizard/ftp_browse.py
@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import osv, fields
+from tools.translate import _
+
+from document_ftp import ftpserver
+class document_ftp_browse(osv.osv_memory):
+    _name = 'document.ftp.browse'
+    _description = 'Document FTP Browse'
+
+    _columns = {
+        'url' : fields.char('FTP Server', size=64, required=True),
+    }
+
+    def default_get(self, cr, uid, fields, context=None):
+        res = {}
+        if 'url' in fields:
+            user_pool = self.pool.get('res.users')
+            current_user = user_pool.browse(cr, uid, uid, context=context)
+            res['url'] = '%s@%s:%d'%(current_user.login, ftpserver.HOST, ftpserver.PORT)
+        return res
+
+    def browse_ftp(self, cr, uid, ids, context):
+        data_id = ids and ids[0] or False
+        data = self.browse(cr, uid, data_id, context)
+        ftp_url = 'ftp://'
+        final_url = ftp_url + data.url
+        return {
+        'type': 'ir.actions.act_url',
+        'url':final_url,
+        'target': 'new'
+        }
+document_ftp_browse()
+    
diff --git a/addons/document_ftp/wizard/ftp_browse_view.xml b/addons/document_ftp/wizard/ftp_browse_view.xml
new file mode 100644
index 00000000000..a32f93e096f
--- /dev/null
+++ b/addons/document_ftp/wizard/ftp_browse_view.xml
@@ -0,0 +1,40 @@
+<openerp>
+  <data>
+
+    <record id="ftp_browse_form" model="ir.ui.view">
+            <field name="name">Document FTP Browse</field>
+            <field name="model">document.ftp.browse</field>
+            <field name="type">form</field>           
+            <field name="arch" type="xml">
+                <form string="Browse Document">
+                    <separator string="Browse Document" colspan="4"/>
+                    <field name="url" widget="url" colspan="4"/>
+                    <separator colspan="4"/>
+                    <group col="4" colspan="4">
+                        <label string="" colspan="2"/>
+                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="browse_ftp" string="Browse" type="object" icon="gtk-ok"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_ftp_browse" model="ir.actions.act_window">
+            <field name="name">Document Browse</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">document.ftp.browse</field>
+            <field name="view_id" ref="ftp_browse_form"/>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+        <menuitem
+        name="Shared Repository (FTP)"
+        action="action_ftp_browse"
+        id="menu_document_browse"        
+        icon="STOCK_EXECUTE"
+        parent="document.menu_document_doc" sequence="1"/>
+
+</data>
+</openerp>

From c530aadd1b8af7de55e36d888788e6daf74e9762 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 14 Jun 2010 12:17:58 +0530
Subject: [PATCH 067/121] [IMP]: mail_gateway: Remaining changes in merge

bzr revid: rpa@tinyerp.com-20100614064758-g538d3wxy8b2q68z
---
 addons/mail_gateway/mail_gateway.py | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index 49fcfc8bd5e..4f7962f988e 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -32,24 +32,7 @@ import netsvc
 
 logger = netsvc.Logger()
 
-class one2many_domain(fields.one2many):
-    def set(self, cr, obj, id, field, values, user=None, context=None):
-        if not values:
-            return
-        return super(one2many_domain, self).set(cr, obj, id, field, values, 
-                                            user=user, context=context)
 
-    def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
-        if context is None:
-            context = {}
-        res = {}
-        msg_obj = obj.pool.get('mailgate.message')
-        for thread in obj.browse(cr, user, ids, context=context):
-            final = msg_obj.search(cr, user, self._domain + [('thread_id', '=', thread.id)], context=context)
-            res[thread.id] = final
-        return res
-        
-        
 class mailgate_thread(osv.osv):
     '''
     Mailgateway Thread
@@ -59,9 +42,9 @@ class mailgate_thread(osv.osv):
     _rec_name = 'thread' 
 
     _columns = {
-        'thread': fields.char('Thread', size=124, required=False), 
-        'message_ids': one2many_domain('mailgate.message', 'thread_id', 'Messages', domain=[('history', '=', True)], required=False), 
-        'log_ids': one2many_domain('mailgate.message', 'thread_id', 'Logs', domain=[('history', '=', False)], required=False),
+        'thread': fields.char('Thread', size=32, required=False), 
+        'message_ids': fields.one2many('mailgate.message', 'thread_id', 'Messages', domain=[('history', '=', True)], required=False), 
+        'log_ids': fields.one2many('mailgate.message', 'thread_id', 'Logs', domain=[('history', '=', False)], required=False), 
         'model': fields.char('Model Name', size=64, required=False),  
         'res_id': fields.integer('Resource ID'), 
         }

From cc6e6d5853210284b1a93ef6d9cc72eb40872c9f Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Mon, 14 Jun 2010 12:30:43 +0530
Subject: [PATCH 068/121] [IMP] Apply function for resource name

bzr revid: ksa@tinyerp.co.in-20100614070043-t7zfy1y6gvryyc54
---
 addons/audittrail/audittrail.py | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index 0233f2fb624..d5b0761b65a 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -131,22 +131,21 @@ class audittrail_log(osv.osv):
     _name = 'audittrail.log'
     _description = "Audittrail Log"
 
-#    def _name_get_resname(self, cr, uid, ids, *args):
-#        data = {}
-#        for resname in self.browse(cr, uid, ids,[]):
-#            model_object = resname.object_id.name
-#            res_id = resname.res_id
-#            if model_object and res_id:
-#            #    model_pool = self.pool.get(model_object)
-#                res = model_object.name_get(cr,uid,[res_id])
-#                data[resname.id] = res and res[0][1]
-#            else:
-#                 data[resname.id] = False
-#        return data
+    def _name_get_resname(self, cr, uid, ids, *args):
+        data = {}
+        for resname in self.browse(cr, uid, ids,[]):
+            model_object = resname.object_id
+            res_id = resname.res_id
+            if model_object and res_id:
+                model_pool = self.pool.get(model_object.model)
+                res = model_pool.read(cr, uid, res_id, ['name'])
+                data[resname.id] = res['name']
+            else:
+                 data[resname.id] = False
+        return data
 
     _columns = {
-        "name": fields.char("Name", size=32),
-     #   'name': fields.function(_name_get_resname, type='char', string='Resource Name', method=True),
+        "name": fields.function(_name_get_resname, type='char', string='Resource Name', method=True),
         "object_id": fields.many2one('ir.model', 'Object'),
         "user_id": fields.many2one('res.users', 'User'),
         "method": fields.char("Method", size=64),

From f4902078eab2c39db2756a27393fed1860f7ddb4 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Mon, 14 Jun 2010 12:53:13 +0530
Subject: [PATCH 069/121] [FIX] mail_gate: wrong view_type in messages action

bzr revid: hmo@tinyerp.com-20100614072313-ehhkmyfynamtjqau
---
 addons/mail_gateway/mail_gateway_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
index 0ce1af446e9..bd286875e7a 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -181,7 +181,7 @@
             <field name="res_model">mailgate.message</field>
             <field name="view_mode">tree,form</field>
             <field name="view_type">form</field>
-            <field name="view_type">[('history', '=', True)]</field>
+            <field name="domain">[('history', '=', True)]</field>
             <field name="view_id" ref="view_mailgate_message_tree"/>
         </record>
         

From dc9f82b88c734836b4114ee543dc64ecf826236d Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 14 Jun 2010 15:24:41 +0530
Subject: [PATCH 070/121] [IMP]: mail_gateway: Improvement for sending reply
 mail

bzr revid: rpa@tinyerp.com-20100614095441-d6d74jd8a0idkq3e
---
 addons/fetchmail/fetchmail.py                 |   2 +-
 addons/mail_gateway/mail_gateway.py           |  44 +++++++-
 addons/mail_gateway/mail_gateway_view.xml     |   2 +-
 .../openerp_mailgate/openerp_mailgate.py      | 106 +++---------------
 4 files changed, 57 insertions(+), 97 deletions(-)

diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index a61d4f50031..450362b80a5 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -134,7 +134,7 @@ class email_server(osv.osv):
                             action_pool.run(cr, uid, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id]})
 
                             imap_server.store(num, '+FLAGS', '\\Seen')
-                            count += 1
+                        count += 1
                     logger.notifyChannel('imap', netsvc.LOG_INFO, 'fetchmail fetch/process %s email(s) from %s' % (count, server.name))
 
                     imap_server.close()
diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index 4f7962f988e..b4de38b1471 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -25,7 +25,7 @@ import  base64
 import re
 import tools
 import binascii
-
+import socket
 import email
 from email.header import decode_header
 import netsvc
@@ -154,7 +154,21 @@ class mailgate_tool(osv.osv):
     _name = 'email.server.tools'
     _description = "Email Tools"
     _auto = False
+    
+    def _to_decode(self, s, charsets):
+        for charset in charsets:
+            if charset:
+                try:
+                    return s.decode(charset)
+                except UnicodeError:
+                    pass
+        return s.decode('latin1')
 
+    def _decode_header(self, text):
+        if text:
+            text = decode_header(text.replace('\r', '')) 
+        return ''.join(map(lambda x:self._to_decode(x[0], [x[1]]), text or []))
+ 
     def to_email(self, cr, uid, text):
         _email = re.compile(r'.*<.*@.*\..*>', re.UNICODE)
         def record(path):
@@ -191,6 +205,31 @@ class mailgate_tool(osv.osv):
                     }
         msg_id = self.pool.get('mailgate.message').create(cr, uid, msg_data)
         return True
+    
+    def email_send(self, cr, uid, model, res_id, msg, email_default ):
+        message = email.message_from_string(str(msg))
+        subject = '['+str(res_id)+'] '+ self._decode_header(message['Subject'])
+        message['Message-Id'] = '<' + str(time.time()) + '-openerp-' + \
+                model + '-' + str(res_id) + '@'+socket.gethostname() + '>'
+        msg_mails = []
+        mails = [self._decode_header(message['From']), self._decode_header(message['To'])]+self._decode_header(message.get('Cc', '')).split(',')
+        for mail in mails:
+            if mail:
+                msg_mails.append(self.to_email(cr, uid, mail))
+        encoding = message.get_content_charset()
+        message['body'] = message.get_payload(decode=True)
+        if encoding:
+            message['body'] = message['body'].decode(encoding).encode('utf-8')
+
+        try:
+            tools.email_send(email_default or tools.config.get('email_from', None), msg_mails, subject, message.get('body'))
+        except Exception, e:
+            if email_default:
+                temp_msg = '['+str(res_id)+'] ' + self._decode_header(message['Subject'])
+                del message['Subject']
+                message['Subject'] = '[OpenERP-FetchError] ' + temp_msg
+                tools.email_send(email_default, email_default, message.get('Subject'), message.get('body'))
+        return True
 
     def process_email(self, cr, uid, model, message, attach=True, server_id=None, server_type=None, context=None):
         if not context:
@@ -229,7 +268,8 @@ class mailgate_tool(osv.osv):
                     att_ids.append(self.pool.get('ir.attachment').create(cr, uid, data_attach))
 
             if hasattr(model_pool, 'history'):
-                model_pool.history(cr, uid, [res_id], 'Receive', True, msg.get('to'), msg.get('body'), msg.get('from'), False, {'model' : model})
+                res = model_pool.browse(cr, uid, [res_id])
+                model_pool._history(cr, uid, res, 'Receive', True, msg.get('to'), msg.get('body'), msg.get('from'), False, {'model' : model})
             else:
                 self.history(cr, uid, model, res_id, msg, att_ids, server_id=server_id, server_type=server_type)
             
diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
index 0ce1af446e9..bd286875e7a 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -181,7 +181,7 @@
             <field name="res_model">mailgate.message</field>
             <field name="view_mode">tree,form</field>
             <field name="view_type">form</field>
-            <field name="view_type">[('history', '=', True)]</field>
+            <field name="domain">[('history', '=', True)]</field>
             <field name="view_id" ref="view_mailgate_message_tree"/>
         </record>
         
diff --git a/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py b/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
index 0698be88eaf..e0ea723c75f 100755
--- a/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
+++ b/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
@@ -23,25 +23,11 @@
 
 from email.header import decode_header
 import email as EMAIL
-import re
-import smtplib
-import time, socket
+import logging
+import optparse
+import sys
 import xmlrpclib
 
-
-email_re = re.compile(r"([A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6})")
-case_re = re.compile(r"\[([0-9]+)\]", re.UNICODE)
-command_re = re.compile("^Set-([a-z]+) *: *(.+)$", re.I + re.UNICODE)
-reference_re = re.compile("<.*-openobject-(\\d+)@(.*)>", re.UNICODE)
-
-priorities = {
-    '1': '1 (Highest)', 
-    '2': '2 (High)', 
-    '3': '3 (Normal)', 
-    '4': '4 (Low)', 
-    '5': '5 (Lowest)', 
-}
-
 class rpc_proxy(object):
     def __init__(self, uid, passwd, host='localhost', port=8069, path='object', dbname='terp'):
         self.rpc = xmlrpclib.ServerProxy('http://%s:%s/xmlrpc/%s' % (host, port, path), allow_none=True)
@@ -53,7 +39,7 @@ class rpc_proxy(object):
         return self.rpc.execute(self.dbname, self.user_id, self.passwd, *request, **kwargs)
 
 class email_parser(object):
-    def __init__(self, uid, password, model, email, email_default, dbname, host, port, smtp_server=None, smtp_port=None, smtp_ssl=None, smtp_user=None, smtp_password=None):
+    def __init__(self, uid, password, model, email, email_default, dbname, host, port):
         self.rpc = rpc_proxy(uid, password, host=host, port=port, dbname=dbname)
         try:
             self.model_id = int(model)
@@ -64,53 +50,8 @@ class email_parser(object):
         self.email = email
         self.email_default = email_default
         self.canal_id = False
-        self.smtp_server = smtp_server
-        self.smtp_port = smtp_port
-        self.smtp_ssl = smtp_ssl
-        self.smtp_user = smtp_user
-        self.smtp_password = smtp_password
         
         
-    def email_get(self, email_from):
-        return self.rpc('email.server.tools', 'to_email', email_from)
-
-    def _to_decode(self, s, charsets):
-        for charset in charsets:
-            if charset:
-                try:
-                    return s.decode(charset)
-                except UnicodeError:
-                    pass
-        return s.decode('latin1')
-
-    def _decode_header(self, s):
-        if s:
-            s = decode_header(s.replace('\r', '')) 
-        return ''.join(map(lambda x:self._to_decode(x[0], [x[1]]), s or []))
-
-    def msg_send(self, msg, emails, priority=None):
-        if not emails:
-            return False
-
-        msg['To'] = emails[0]
-        if len(emails)>1:
-            if 'Cc' in msg:
-                del msg['Cc']
-            msg['Cc'] = ','.join(emails[1:])
-
-        del msg['Reply-To']
-        msg['Reply-To'] = self.email
-        if self.smtp_user and self.smtp_password:
-            s = smtplib.SMTP(self.smtp_server, self.smtp_port)
-            s.ehlo()
-            s.starttls()
-            s.ehlo()
-            s.login(self.smtp_user, self.smtp_password)
-            s.sendmail(self.email, emails, msg.as_string())
-            s.close()
-            return True
-        return False
-
 
     def parse(self, message):
         try:
@@ -118,34 +59,16 @@ class email_parser(object):
         except Exception, e:
             res_id = False
 
-        msg = EMAIL.message_from_string(str(message))
-        subject = self._decode_header(msg['Subject'])
-        if msg.get('Subject', ''):
-            del msg['Subject']
-
-       #Changed for sending reply mail
+#    Reply mail
         if res_id:
-            msg['Subject'] = '['+str(res_id)+'] '+subject
-            msg['Message-Id'] = '<'+str(time.time())+'-openerpcrm-'+str(res_id)+'@'+socket.gethostname()+'>'
-
-        mm = [self._decode_header(msg['From']), self._decode_header(msg['To'])]+self._decode_header(msg.get('Cc', '')).split(',')
-        msg_mails = map(self.email_get, filter(None, mm))
-
-        try:
-            self.msg_send(msg, msg_mails)
-        except Exception, e:
-            if self.email_default:
-                a = self._decode_header(msg['Subject'])
-                del msg['Subject']
-                msg['Subject'] = '[OpenERP-FetchError] ' + a
-                self.msg_send(msg, self.email_default.split(','))
-        return res_id, msg_mails
+            self.rpc('email.server.tools', 'email_send', self.model, res_id, message, self.email_default)
+        
+        return res_id
 
 if __name__ == '__main__':
     parser = optparse.OptionParser(usage='usage: %prog [options]', version='%prog v1.0')
     group = optparse.OptionGroup(parser, "Note", 
-        "This program parse a mail from standard input and communicate "
-        "with the Open ERP server for case management in the CRM module.")
+        "This program parse a mail from standard input and communicate  with the Open ERP server")
     parser.add_option_group(group)
     parser.add_option("-u", "--user", dest="userid", help="ID of the user in Open ERP", default=1, type='int')
     parser.add_option("-p", "--password", dest="password", help="Password of the user in Open ERP", default='admin')
@@ -155,16 +78,13 @@ if __name__ == '__main__':
     parser.add_option("-d", "--dbname", dest="dbname", help="Database name (default: terp)", default='terp')
     parser.add_option("--host", dest="host", help="Hostname of the Open ERP Server", default="localhost")
     parser.add_option("--port", dest="port", help="Port of the Open ERP Server", default="8069")
-    parser.add_option('--smtp', dest='smtp_server', default='', help='specify the SMTP server for sending email')
-    parser.add_option('--smtp-port', dest='smtp_port', default='25', help='specify the SMTP port', type="int")
-    parser.add_option('--smtp-ssl', dest='smtp_ssl', default='', help='specify the SMTP server support SSL or not')
-    parser.add_option('--smtp-user', dest='smtp_user', default='', help='specify the SMTP username for sending email')
-    parser.add_option('--smtp-password', dest='smtp_password', default='', help='specify the SMTP password for sending email')
 
     (options, args) = parser.parse_args()
-    parser = email_parser(options.userid, options.password, options.model, options.email, options.default, dbname=options.dbname, host=options.host, port=options.port, smtp_server=options.smtp_server, smtp_port=options.smtp_port, smtp_ssl=options.smtp_ssl, smtp_user=options.smtp_user, smtp_password=options.smtp_password)
 
-    msg_txt = sys.stdin.read().decode('utf8')
+    logging.basicConfig(level=logging.DEBUG, format="%(asctime)s %(levelname)s %(message)s")
+    
+    parser = email_parser(options.userid, options.password, options.model, options.email, options.default, dbname=options.dbname, host=options.host, port=options.port)
+    msg_txt = sys.stdin.read()
 
     parser.parse(msg_txt)
  

From 80d0f5dfc97d97fb6af681eefa9aee6b28945009 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 14 Jun 2010 16:54:22 +0530
Subject: [PATCH 071/121] [IMP]: mail_gateway: Improvement for history

bzr revid: rpa@tinyerp.com-20100614112422-yj34kne5fibi5iop
---
 addons/mail_gateway/mail_gateway.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index b4de38b1471..d92ee16905c 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -267,9 +267,15 @@ class mailgate_tool(osv.osv):
                     }
                     att_ids.append(self.pool.get('ir.attachment').create(cr, uid, data_attach))
 
-            if hasattr(model_pool, 'history'):
+            if hasattr(model_pool, '_history'):
                 res = model_pool.browse(cr, uid, [res_id])
-                model_pool._history(cr, uid, res, 'Receive', True, msg.get('to'), msg.get('body'), msg.get('from'), False, {'model' : model})
+                model_pool._history(cr, uid, res, 'Receive', True, 
+                                subject=msg.get('subject'), 
+                                email=msg.get('to'), details=msg.get('body'), 
+                                email_from=msg.get('from'), 
+                                message_id=msg.get('message-id'), 
+                                attach=msg.get('attachments', {}).items(), 
+                                context={'model' : model})
             else:
                 self.history(cr, uid, model, res_id, msg, att_ids, server_id=server_id, server_type=server_type)
             

From 1eb6c48afad34dcea61ea00c85159a469e6422c9 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 14 Jun 2010 17:40:22 +0530
Subject: [PATCH 072/121] [IMP]: mail_gateway: Docstring updated

bzr revid: rpa@tinyerp.com-20100614121022-kwapy94qqlgci1i6
---
 addons/mail_gateway/mail_gateway.py | 31 ++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index d92ee16905c..809c9310768 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -181,13 +181,23 @@ class mailgate_tool(osv.osv):
         return bits
     
     def history(self, cr, uid, model, new_id, msg, attach, server_id=None, server_type=None):
+        """This function creates history for mails fetched
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param model: OpenObject Model
+        @param new_id: Id of the record of OpenObject model created from the Email details 
+        @param msg: Email details
+        @param attach: Email attachments
+        @param server_id: Id of the POP/IMAP Server if the mail is fetched using OpenERP interface 
+        @param server_type: Type of Fetchmail server"""
         try:
             thread_id = self.pool.get(model).read(cr, uid, new_id, ['thread_id'])['thread_id'][0]
         except Exception, e:
             thread_id = None
         msg_data = {
                     'name': msg.get('subject', 'No subject'), 
-                    'date': msg.get('date') , # or time.strftime('%Y-%m-%d %H:%M:%S')??
+                    'date': msg.get('date') , 
                     'description': msg.get('body', msg.get('from')), 
                     'history': True,
                     'model': model, 
@@ -207,6 +217,15 @@ class mailgate_tool(osv.osv):
         return True
     
     def email_send(self, cr, uid, model, res_id, msg, email_default ):
+        """This function Sends return email on submission of  Fetched email in OpenERP database
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param model: OpenObject Model
+        @param res_id: Id of the record of OpenObject model created from the Email details 
+        @param msg: Email details
+        @param email_default: Default Email address in case of any Problem
+        """
         message = email.message_from_string(str(msg))
         subject = '['+str(res_id)+'] '+ self._decode_header(message['Subject'])
         message['Message-Id'] = '<' + str(time.time()) + '-openerp-' + \
@@ -232,6 +251,16 @@ class mailgate_tool(osv.osv):
         return True
 
     def process_email(self, cr, uid, model, message, attach=True, server_id=None, server_type=None, context=None):
+        """This function Processes email and create record for given OpenERP model 
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param model: OpenObject Model
+        @param message: Email details
+        @param attach: Email attachments
+        @param server_id: Id of the POP/IMAP Server if the mail is fetched using OpenERP interface 
+        @param server_type: Type of Fetchmail server
+        @param context: A standard dictionary for contextual values"""
         if not context:
             context = {}
         context.update({

From da49bdd33df26f292674bc5360e89853c6494b57 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Mon, 14 Jun 2010 18:18:37 +0530
Subject: [PATCH 073/121] [IMP] solve problem related with osv memory object

bzr revid: ksa@tinyerp.co.in-20100614124837-zjod15jf112bkrso
---
 addons/audittrail/audittrail.py | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index d5b0761b65a..11ec8cb7a1e 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -131,21 +131,22 @@ class audittrail_log(osv.osv):
     _name = 'audittrail.log'
     _description = "Audittrail Log"
 
-    def _name_get_resname(self, cr, uid, ids, *args):
-        data = {}
-        for resname in self.browse(cr, uid, ids,[]):
-            model_object = resname.object_id
-            res_id = resname.res_id
-            if model_object and res_id:
-                model_pool = self.pool.get(model_object.model)
-                res = model_pool.read(cr, uid, res_id, ['name'])
-                data[resname.id] = res['name']
-            else:
-                 data[resname.id] = False
-        return data
+#    def _name_get_resname(self, cr, uid, ids, *args):
+#        data = {}
+#        for resname in self.browse(cr, uid, ids,[]):
+#            model_object = resname.object_id
+#            res_id = resname.res_id
+#            if model_object and res_id:
+#                model_pool = self.pool.get(model_object.model)
+#                res = model_pool.read(cr, uid, res_id, ['name'])
+#                data[resname.id] = res['name']
+#            else:
+#                 data[resname.id] = False
+#        return data
 
     _columns = {
-        "name": fields.function(_name_get_resname, type='char', string='Resource Name', method=True),
+        "name": fields.char("Resource Name",size=64),
+   #     "name": fields.function(_name_get_resname, type='char', string='Resource Name', method=True),
         "object_id": fields.many2one('ir.model', 'Object'),
         "user_id": fields.many2one('res.users', 'User'),
         "method": fields.char("Method", size=64),
@@ -405,7 +406,7 @@ class audittrail_objects_proxy(osv_pool):
             if type(res_ids) in (long, int):
                 res_ids = [res_ids]
             if res_ids:
-                for resource in resource_pool.read(cr, uid, res_ids, fields):
+                for resource in resource_pool.read(cr, uid, res_ids):
                     resource_id = resource['id']
                     if 'id' in resource:
                         del resource['id']
@@ -414,13 +415,13 @@ class audittrail_objects_proxy(osv_pool):
                     for field in resource.keys():
                         old_value[field] = resource[field]
                         old_values_text[field] = self.get_value_text(cr, uid, field, resource[field], model)
-                    old_values[resource_id] = {'text':old_values_text, 'value': old_value}
+                        old_values[resource_id] = {'text':old_values_text, 'value': old_value}
 
             res = fct_src(db, uid, model.model, method, *args)
             cr.commit()
 
             if res_ids:
-                for resource in resource_pool.read(cr, uid, res_ids, fields):
+                for resource in resource_pool.read(cr, uid, res_ids):
                     resource_id = resource['id']
                     if 'id' in resource:
                         del resource['id']

From 9ca086f69c2487dd01095e8f30827c46809e8546 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 15 Jun 2010 10:37:30 +0530
Subject: [PATCH 074/121] [IMP]: mail_gateway: Improvement in mail gateway for
 message id

bzr revid: rpa@tinyerp.com-20100615050730-6s83d2hit3z8lnp6
---
 addons/crm/wizard/crm_forward_to_partner.py |  2 +-
 addons/crm/wizard/crm_send_email.py         | 10 ++++------
 addons/mail_gateway/mail_gateway.py         | 19 ++++++++-----------
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/addons/crm/wizard/crm_forward_to_partner.py b/addons/crm/wizard/crm_forward_to_partner.py
index 945066506d7..24aa7b7182e 100644
--- a/addons/crm/wizard/crm_forward_to_partner.py
+++ b/addons/crm/wizard/crm_forward_to_partner.py
@@ -210,7 +210,7 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         message = []
         lead_proxy = self.pool.get('crm.lead')
         lead = lead_proxy.browse(cr, uid, lead_id, context=context)
-        if lead.type == 'lead':
+        if not lead.type or lead.type == 'lead':
                 field_names = [
                     'partner_name', 'title', 'function', 'street', 'street2', 
                     'zip', 'city', 'country_id', 'state_id', 'email_from', 
diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index 8d394ddcf9e..b0e5bfecad4 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -94,8 +94,6 @@ class crm_send_new_email(osv.osv_memory):
             if context.get('mail', 'new') == 'new':
                 if len(case.message_ids):
                     message_id = case.message_ids[0].message_id
-                else:
-                    message_id = "<%s-openerp-@%s-%s-%d>" % (time.time(), cr.dbname, model, res_id)
             else:
                 hist = hist_obj.browse(cr, uid, res_id)
                 message_id = hist.message_id
@@ -116,10 +114,10 @@ class crm_send_new_email(osv.osv_memory):
                                 subject=obj.subject, email_from=email_from, \
                                 message_id=message_id, attach=attach)
 
-            x_headers = dict()
-            #x_headers = {
-            #    'Reply-To':"%s" % case.section_id.reply_to,
-            #}
+            x_headers = {
+                     'model': model, 
+                     'resource-id': res_id
+                     }
             if message_id:
                 x_headers['References'] = "%s" % (message_id)
 
diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index 8f51b627ef6..76b35c630ee 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -23,12 +23,8 @@ from osv import osv, fields
 import time
 import tools
 import binascii
-import socket
 import email
 from email.header import decode_header
-import netsvc
-
-logger = netsvc.Logger()
 import base64
 import re
 
@@ -228,8 +224,6 @@ class mailgate_tool(osv.osv):
         """
         message = email.message_from_string(str(msg))
         subject = '['+str(res_id)+'] '+ self._decode_header(message['Subject'])
-        message['Message-Id'] = '<' + str(time.time()) + '-openerp-' + \
-                model + '-' + str(res_id) + '@'+socket.gethostname() + '>'
         msg_mails = []
         mails = [self._decode_header(message['From']), self._decode_header(message['To'])]+self._decode_header(message.get('Cc', '')).split(',')
         for mail in mails:
@@ -239,15 +233,19 @@ class mailgate_tool(osv.osv):
         message['body'] = message.get_payload(decode=True)
         if encoding:
             message['body'] = message['body'].decode(encoding).encode('utf-8')
-
+        
+        x_headers = {
+                     'model': model, 
+                     'resource-id': res_id
+                     }
         try:
-            tools.email_send(email_default or tools.config.get('email_from', None), msg_mails, subject, message.get('body'))
+            tools.email_send(email_default or tools.config.get('email_from', None), msg_mails, subject, message.get('body'), x_headers=x_headers)
         except Exception, e:
             if email_default:
                 temp_msg = '['+str(res_id)+'] ' + self._decode_header(message['Subject'])
                 del message['Subject']
                 message['Subject'] = '[OpenERP-FetchError] ' + temp_msg
-                tools.email_send(email_default, email_default, message.get('Subject'), message.get('body'))
+                tools.email_send(email_default, email_default, message.get('Subject'), message.get('body'), x_headers=x_headers)
         return True
 
     def process_email(self, cr, uid, model, message, attach=True, server_id=None, server_type=None, context=None):
@@ -282,7 +280,7 @@ class mailgate_tool(osv.osv):
                 }
                 data.update(self.get_partner(cr, uid, msg.get('from'), context=context))
                 res_id = model_pool.create(cr, uid, data, context=context)
-                logger.notifyChannel('imap', netsvc.LOG_WARNING, 'method def message_new is not define in model %s. Using default method' % (model_pool._name))
+
             att_ids = []
             if attach:
                 for attachment in msg.get('attachments', []):
@@ -421,7 +419,6 @@ class mailgate_tool(osv.osv):
                     if hasattr(model_pool, 'message_update'):
                         model_pool.message_update(cr, uid, [history.res_id], vals, msg, context=context)
                     else:
-                        logger.notifyChannel('imap', netsvc.LOG_WARNING, 'method def message_update is not define in model %s' % (model_pool._name))
                         return False
                 else:
                     res_id = create_record(msg)

From 23a57fc7f45d0e2377a758d298e83a3818b66fcb Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 15 Jun 2010 10:54:29 +0530
Subject: [PATCH 075/121] [REVERT] account: log message put wrong place

bzr revid: hmo@tinyerp.com-20100615052429-ki2knnkrhpqks3bg
---
 addons/account/invoice.py | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index b15b4e94ad6..cf0a6760481 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -863,6 +863,7 @@ class account_invoice(osv.osv):
             # make the invoice point to that move
             self.write(cr, uid, [inv.id], {'move_id': move_id,'period_id':period_id, 'move_name':new_move_name})
             self.pool.get('account.move').post(cr, uid, [move_id])
+            self._log_event(cr, uid, ids)
         return True
 
     def line_get_convert(self, cr, uid, x, part, date, context=None):
@@ -916,7 +917,6 @@ class account_invoice(osv.osv):
                         'WHERE account_move_line.move_id = %s ' \
                             'AND account_analytic_line.move_id = account_move_line.id',
                             (ref, move_id))
-                self._log_event(cr, uid, ids)
         return True
 
     def action_cancel(self, cr, uid, ids, *args):
@@ -952,17 +952,7 @@ class account_invoice(osv.osv):
         return taxes.values()
 
     def _log_event(self, cr, uid, ids, factor=1.0, name='Open Invoice'):
-        for (invoice_id,number) in self.name_get(cr, uid, ids):
-                invoice = self.browse(cr,uid,invoice_id)
-                message = ("%s %s %s %s %s %s %s") % (
-                    _('Invoice'),
-                    _("INV/"),
-                    number.split('/')[-1],
-                    _("Opened,"),
-                    _('journal entries'),
-                    invoice.move_id.name,
-                    _("Created"))
-                self.log(cr, uid, invoice_id, message)
+        #TODO: implement messages system        
         return True
 
     def name_get(self, cr, uid, ids, context=None):

From f5487a188e4dc3e584d7c09124e582eea416adca Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 15 Jun 2010 15:43:48 +0530
Subject: [PATCH 076/121] [FIX] document_webdav: missing import osv

bzr revid: hmo@tinyerp.com-20100615101348-8778waohibz0cb30
---
 addons/document_webdav/webdav.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/document_webdav/webdav.py b/addons/document_webdav/webdav.py
index b9b1a1f8a65..eec6c69ae16 100644
--- a/addons/document_webdav/webdav.py
+++ b/addons/document_webdav/webdav.py
@@ -23,13 +23,15 @@ import xml.dom.minidom
 domimpl = xml.dom.minidom.getDOMImplementation()
 import urlparse
 import urllib
+from osv import osv
+import tools
 try:
     from DAV import utils
     from DAV.propfind import PROPFIND
 except ImportError:
     raise osv.except_osv('PyWebDAV Import Error!','Please install pywebdav \
-                     from http://pywebdav.googlecode.com/files/PyWebDAV-0.9.3.tar.gz/')
-import tools
+from http://pywebdav.googlecode.com')
+
 
 
 super_mk_prop_response = PROPFIND.mk_prop_response

From 10fc6a567deaa0be8f87eead0dd969985104bbbd Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Wed, 16 Jun 2010 15:29:53 +0530
Subject: [PATCH 077/121] [REVERT] mrp: multi_level_bom related work

bzr revid: hmo@tinyerp.com-20100616095953-7nle1e9207q5n8k0
---
 addons/mrp/mrp_demo.xml | 13 -------------
 addons/mrp/mrp_view.xml |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/addons/mrp/mrp_demo.xml b/addons/mrp/mrp_demo.xml
index 21415ad56f9..581cc04c05e 100644
--- a/addons/mrp/mrp_demo.xml
+++ b/addons/mrp/mrp_demo.xml
@@ -171,7 +171,6 @@
             <field name="routing_id" ref="mrp_routing_2"/>
             <field name="type">normal</field>
             <field model="product.product" name="product_id" ref="product.product_product_cpu_gen"/>
-            <field name="multi_level_bom">True</field>
         </record>
 
         <record id="mrp_bom_1" model="mrp.bom">
@@ -181,7 +180,6 @@
             <field name="product_qty">1.0</field>
             <field name="routing_id" ref="mrp_routing_0"/>
             <field model="product.product" name="product_id" ref="product.product_product_pc2" />
-            <field name="multi_level_bom">True</field>
         </record>
         <record id="mrp_bom_2" model="mrp.bom">
             <field name="name">Assembly Medium PC</field>
@@ -189,7 +187,6 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field model="product.product" name="product_id" ref="product.product_product_pc3"/>
-            <field name="multi_level_bom">True</field>
         </record>
         <record id="mrp_bom_3" model="mrp.bom">
             <field name="name">Assembly Customizable PC</field>
@@ -197,7 +194,6 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field model="product.product" name="product_id" ref="product.product_product_pc4"/>
-            <field name="multi_level_bom">True</field>
         </record>
         <record id="mrp_bom_4" model="mrp.bom">
             <field name="name">HDD on demand</field>
@@ -206,7 +202,6 @@
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
             <field model="product.product" name="product_id" ref="product.product_product_20"/>
-            <field name="multi_level_bom">True</field>
         </record>
         <record id="mrp_bom_5" model="mrp.bom">
             <field name="name">RAM on demand</field>
@@ -215,7 +210,6 @@
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
             <field model="product.product" name="product_id" ref="product.product_product_21"/>
-            <field name="multi_level_bom">True</field>
         </record>
         <record id="mrp_bom_6" model="mrp.bom">
             <field name="name">HDD on demand</field>
@@ -224,7 +218,6 @@
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
             <field model="product.product" name="product_id" ref="product.product_product_20"/>
-            <field name="multi_level_bom">True</field>
         </record>
         <record id="mrp_bom_7" model="mrp.bom">
             <field name="name">HDD on demand</field>
@@ -233,7 +226,6 @@
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
             <field model="product.product" name="product_id" ref="product.product_product_20"/>
-            <field name="multi_level_bom">True</field>
         </record>
         <record id="mrp_bom_8" model="mrp.bom">
             <field name="name">HDD Seagate</field>
@@ -242,7 +234,6 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field model="product.product" name="product_id" ref="product.product_product_hdd1"/>
-            <field name="multi_level_bom">True</field>
         </record>
         <record id="mrp_bom_9" model="mrp.bom">
             <field name="name">Assembly Basic PC</field>
@@ -252,7 +243,6 @@
             <field name="routing_id" ref="mrp_routing_0"/>
             <field name="type">normal</field>
             <field model="product.product" name="product_id" ref="product.product_product_pc1"/>
-            <field name="multi_level_bom">True</field>
         </record>
         <record id="mrp_bom_10" model="mrp.bom">
             <field name="name">Complete PC with peripherals</field>
@@ -260,7 +250,6 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field model="product.product" name="product_id" ref="product.product_product_23"/>
-            <field name="multi_level_bom">True</field>
         </record>
         <record id="mrp_bom_11" model="mrp.bom">
             <field name="name">RAM on demand</field>
@@ -269,7 +258,6 @@
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
             <field model="product.product" name="product_id" ref="product.product_product_23"/>
-            <field name="multi_level_bom">True</field>
         </record>
 
         <record id="mrp_bom_13" model="mrp.bom">
@@ -278,7 +266,6 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field model="product.product" name="product_id" ref="product.product_product_cpu3"/>
-            <field name="multi_level_bom">True</field>
         </record>
 
         <record id="mrp_bom_kit" model="mrp.bom">
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 8b14158637f..3837588035e 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -337,7 +337,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.bom</field>
             <field name="view_type">form</field>
-            <field name="domain">[('bom_id','=',False),('multi_level_bom','=',True)]</field>
+            <field name="domain">[('bom_id','=',False)]</field>
             <field name="search_view_id" ref="view_mrp_bom_filter"/>
         </record>
         <record id="mrp_bom_form_action2" model="ir.actions.act_window">

From 5a8aab4ce043cc7eb12291a8af0848bc290c5dcd Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Mon, 21 Jun 2010 11:32:20 +0530
Subject: [PATCH 078/121] [IMP]: event: usability Improvement and Improve make
 invoice wizard.

bzr revid: atp@tinyerp.co.in-20100621060220-anjgndsm1jyhykl2
---
 addons/event/__openerp__.py                   |   1 -
 addons/event/event.py                         | 293 ++++++++++++++----
 addons/event/event_data.xml                   |   7 -
 addons/event/event_demo.xml                   |   3 -
 addons/event/event_view.xml                   | 188 ++++++-----
 .../report/report_event_registration_view.xml |  31 +-
 addons/event/security/ir.model.access.csv     |   1 -
 addons/event/test/test_event.yml              |  48 ++-
 addons/event/wizard/__init__.py               |   1 -
 .../wizard/event_confirm_registration.py      |   8 +-
 addons/event/wizard/event_make_invoice.py     | 155 +++------
 .../event/wizard/event_make_invoice_view.xml  |  20 +-
 .../wizard/event_registrations_partner.xml    |   6 +-
 13 files changed, 435 insertions(+), 327 deletions(-)

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 61cb62ee600..184a034f05b 100755
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -47,7 +47,6 @@
         'event_sequence.xml',
         'security/event_security.xml',
         'security/ir.model.access.csv',
-        'wizard/event_registration_view.xml',
         'wizard/event_registrations_partner.xml',
         'wizard/event_make_invoice_view.xml',
     ],
diff --git a/addons/event/event.py b/addons/event/event.py
index 73cab202df6..a5364174f23 100755
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -83,6 +83,11 @@ class event(osv.osv):
                     self.pool.get('event.registration').mail_user_confirm(cr, uid, reg_ids)
                     
         return self.write(cr, uid, ids, {'state': 'confirm'})
+    
+    
+    
+    
+    
 
     def _get_register(self, cr, uid, ids, name, args, context=None):
         
@@ -126,9 +131,10 @@ class event(osv.osv):
         @param vals: dictionary with values to update.
         @return: True
         """
-        
         res = super(event, self).write(cr, uid, ids, vals, *args, **kwargs)
+        
         if 'date_begin' in vals and vals['date_begin']:
+            
             for eve in self.browse(cr, uid, ids):
                 #change the deadlines of the registration linked to this event
                 reg_ids = self.pool.get('event.registration').search(cr, uid, 
@@ -169,12 +175,13 @@ class event(osv.osv):
         'mail_auto_confirm': fields.boolean('Mail Auto Confirm', help='Check this box if you want ot use the automatic confirmation emailing or the reminder'), 
         'mail_registr': fields.text('Registration Email', help='This email will be sent when someone subscribes to the event.'), 
         'mail_confirm': fields.text('Confirmation Email', help="This email will be sent when the event gets confimed or when someone subscribes to a confirmed event. This is also the email sent to remind someone about the event."), 
-        'product_id': fields.many2one('product.product', 'Product', required=True), 
+        'product_id': fields.many2one('product.product', 'Product', required=True),
+        'note': fields.text('Notes')
     }
 
     _defaults = {
         'state': lambda *args: 'draft', 
-        'code': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'event.event'), 
+#        'code': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'event.event'), 
         'user_id': lambda self, cr, uid, ctx: uid, 
     }
 
@@ -184,6 +191,98 @@ class event_registration(osv.osv):
     
     """Event Registration"""
 
+    def _make_invoice(self, cr, uid, reg, lines, context=None):
+        
+        if context is None:
+            context = {}
+        inv_obj = self.pool.get('account.invoice')
+
+        obj_lines = self.pool.get('account.invoice.line')
+        
+        val_invoice = inv_obj.onchange_partner_id(cr, uid, [], 'out_invoice', reg.partner_invoice_id.id, False, False)
+            
+        val_invoice['value'].update({'partner_id': reg.partner_invoice_id.id})
+        partner_address_id = val_invoice['value']['address_invoice_id']
+        value = obj_lines.product_id_change(cr, uid, [], reg.event_id.product_id.id, uom =False, partner_id=reg.partner_invoice_id.id, fposition_id=reg.partner_invoice_id.property_account_position.id)
+        
+        l = obj_lines.read(cr, uid, lines)
+        
+        val_invoice['value'].update({
+                'origin': reg.event_product, 
+                'reference': False, 
+                'invoice_line': [(6, 0, lines)], 
+                'comment': "", 
+            })
+        inv_id = inv_obj.create(cr, uid, val_invoice['value'])
+        
+        self._history(cr, uid, [reg], _('Invoiced'))
+#
+        inv_obj.button_compute(cr, uid, [inv_id])
+        return inv_id
+
+    def action_invoice_create(self, cr, uid, ids, grouped=False, date_inv = False):
+
+        res = False
+        invoices = {}
+        tax_ids=[]
+        
+        obj_reg = self.pool.get('event.registration')
+        obj_lines = self.pool.get('account.invoice.line')
+        inv_obj = self.pool.get('account.invoice')
+
+        context = {}
+        # If date was specified, use it as date invoiced, usefull when invoices are generated this month and put the
+        # last day of the last month as invoice date
+        if date_inv:
+            context['date_inv'] = date_inv
+       
+        obj_event_reg = self.pool.get('event.registration')
+        obj_lines = self.pool.get('account.invoice.line')
+        inv_obj = self.pool.get('account.invoice')
+        data_event_reg = obj_event_reg.browse(cr, uid, ids, context=context)
+
+        for reg in data_event_reg:
+            
+            val_invoice = inv_obj.onchange_partner_id(cr, uid, [], 'out_invoice', reg.partner_invoice_id.id, False, False)
+            
+            val_invoice['value'].update({'partner_id': reg.partner_invoice_id.id})
+            partner_address_id = val_invoice['value']['address_invoice_id']
+                
+            if not partner_address_id:
+               raise osv.except_osv(_('Error !'),
+                        _("Registered partner doesn't have an address to make the invoice."))
+                                
+            value = obj_lines.product_id_change(cr, uid, [], reg.event_id.product_id.id, uom =False, partner_id=reg.partner_invoice_id.id, fposition_id=reg.partner_invoice_id.property_account_position.id)
+            data_product = self.pool.get('product.product').browse(cr, uid, [reg.event_id.product_id.id])
+            for tax in data_product[0].taxes_id:
+                tax_ids.append(tax.id)
+
+            vals = value['value']
+            c_name = reg.contact_id and ('-' + self.pool.get('res.partner.contact').name_get(cr, uid, [reg.contact_id.id])[0][1]) or ''
+            vals.update({
+                'name': reg.event_product + '-' + c_name, 
+                'price_unit': reg.unit_price, 
+                'quantity': reg.nb_register, 
+                'product_id':reg.event_id.product_id.id, 
+                'invoice_line_tax_id': [(6, 0, tax_ids)], 
+            })
+            inv_line_ids = obj_event_reg._create_invoice_lines(cr, uid, [reg.id], vals)
+            invoices.setdefault(reg.partner_id.id, []).append((reg, inv_line_ids))
+           
+        for val in invoices.values():
+            if grouped:
+                res = self._make_invoice(cr, uid, val[0][0], [v for k , v in val], context=context)
+                
+                for k , v in val:
+                    self.write(cr, uid, [k.id], {'state': 'done', 'invoice_id': res})
+                    
+            else:
+               for k , v in val:
+                   res = self._make_invoice(cr, uid, k, [v], context=context)
+                   self.write(cr, uid, [k.id], {'state': 'done', 'invoice_id': res})
+                #res = self._make_invoice(cr, uid, val[0][0], m, context=context)       
+        return res
+
     def check_confirm(self, cr, uid, ids, context):
         
         """
@@ -194,61 +293,56 @@ class event_registration(osv.osv):
         @param context: A standard dictionary for contextual values
         @return: Dictionary value which open Confirm registration form.
         """
-        
+        registration_obj = self.browse(cr, uid, ids)
+        self._history(cr, uid, registration_obj, _('Open'))
         mod_obj = self.pool.get('ir.model.data')
-        current_registration = self.browse(cr, uid, [ids[0]])[0]
-        total_confirmed = current_registration.event_id.register_current + current_registration.nb_register
-        if total_confirmed <= current_registration.event_id.register_max or current_registration.event_id.register_max == 0:
-            self.write(cr, uid, [ids[0]], {'state': 'open'}, context=context)
-            self._history(cr, uid, [ids[0]], 'Open', history=True)
-            self.mail_user(cr, uid, [ids[0]])
-            return True
-        else:
-            model_data_ids = mod_obj.search(cr, uid, [('model', '=', 'ir.ui.view'), ('name', '=', 'view_event_confirm_registration')], context=context)
-            resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-            context.update({'reg_id': ids[0]})
-            return {
-                'name': _('Confirm Registration'), 
-                'context': context, 
-                'view_type': 'form', 
-                'view_mode': 'tree,form', 
-                'res_model': 'event.confirm.registration', 
-                'views': [(resource_id, 'form')], 
-                'type': 'ir.actions.act_window', 
-                'target': 'new', 
-                'nodestroy': True
-            }
+        
+        for current_registration in registration_obj: 
+            
+            total_confirmed = current_registration.event_id.register_current + current_registration.nb_register
+            if total_confirmed <= current_registration.event_id.register_max or current_registration.event_id.register_max == 0:
+                self.write(cr, uid, ids, {'state': 'open'}, context=context)
+                self.mail_user(cr, uid, ids)
+            
+                return True
+            else:
+                model_data_ids = mod_obj.search(cr, uid, [('model', '=', 'ir.ui.view'), ('name', '=', 'view_event_confirm_registration')], context=context)
+                resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+                for id in ids:
+                    context.update({'reg_id': id})
+                
+                return {
+                    'name': _('Confirm Registration'), 
+                    'context': context, 
+                    'view_type': 'form', 
+                    'view_mode': 'tree,form', 
+                    'res_model': 'event.confirm.registration', 
+                    'views': [(resource_id, 'form')], 
+                    'type': 'ir.actions.act_window', 
+                    'target': 'new', 
+                    'nodestroy': True
+                }
 
-    def _history(self, cr, uid, ids, keyword, history=False, email=False, context={}):
-        
-        """
-        Create value in mailgateway.message model.
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of Event registration's IDs
-        @param context: A standard dictionary for contextual values
-        @return: True
-        """
-        
-        for case in self.browse(cr, uid, ids):
-            data = {
-                'name': keyword, 
-                'som': case.som.id, 
-                'canal_id': case.canal_id.id, 
-                'user_id': uid, 
-            }
-            obj = self.pool.get('mailgate.message')
-            obj.create(cr, uid, data, context=context)
-        return True
+    def _history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, email_from=False, message_id=False, attach=[], context={}):
+        mailgate_pool = self.pool.get('mailgate.thread')
+        return mailgate_pool._history(cr, uid, cases, keyword, history=history,\
+                                       subject=subject, email=email, \
+                                       details=details, email_from=email_from,\
+                                       message_id=message_id, attach=attach, \
+                                       context=context)
 
     def button_reg_close(self, cr, uid, ids, *args):
-        self.write(cr, uid, ids, {'state': 'done', })
-        self._history(cr, uid, ids, 'Done', history=True)
+        
+        cases = self.browse(cr, uid, ids) 
+        self._history(cr, uid, cases, _('Done'))
+        self.write(cr, uid, ids, {'state': 'done', 'date_closed': time.strftime('%Y-%m-%d %H:%M:%S')})
         return True
-
+    
     def button_reg_cancel(self, cr, uid, ids, *args):
-        self.write(cr, uid, ids, {'state': 'cancel', })
-        self._history(cr, uid, ids, 'Cancel', history=True)
+        
+        cases = self.browse(cr, uid, ids)
+        self._history(cr, uid, cases, _('Cancel'))
+        self.write(cr, uid, ids, {'state': 'cancel'})
         return True
 
     def create(self, cr, uid, *args, **argv):
@@ -265,9 +359,8 @@ class event_registration(osv.osv):
         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, [res], 'Created', history=True)
-        
+        cases = self.browse(cr, uid, [res])
+        self._history(cr, uid, cases, _('Created'))
         return res
 
     def write(self, cr, uid, *args, **argv):
@@ -278,6 +371,75 @@ class event_registration(osv.osv):
             args[1]['date_deadline']= event.date_begin
             args[1]['description']= event.mail_confirm
         return super(event_registration, self).write(cr, uid, *args, **argv)
+    
+
+    def remind_partner(self, cr, uid, ids, context={}, attach=False):
+
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Remind Partner's IDs
+        @param context: A standard dictionary for contextual values
+
+        """
+        return self.remind_user(cr, uid, ids, context, attach,
+                destination=False)
+        
+            
+    def remind_user(self, cr, uid, ids, context={}, attach=False,destination=True):
+
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Remind user's IDs
+        @param context: A standard dictionary for contextual values
+        """
+        
+        for case in self.browse(cr, uid, ids):
+            
+            if not case.event_id.reply_to:
+                raise osv.except_osv(_('Error!'), ("Reply To is not specified for selected Event"))
+            if not case.email_from:
+                raise osv.except_osv(_('Error!'), ("Partner Email is not specified in Registration"))
+            if case.event_id.reply_to and case.email_from:
+                src = case.email_from
+                dest = case.event_id.reply_to
+                body = ""
+                body = case.description
+                if not destination:
+                    src, dest = dest, src
+                    if body and case.user_id.signature:
+                        body += '\n\n%s' % (case.user_id.signature)
+
+                body = self.format_body(body)
+                dest = [dest]
+
+                attach_to_send = None
+
+                if attach:
+                    attach_ids = self.pool.get('ir.attachment').search(cr, uid, [('res_model', '=', 'mailgate.thread'), ('res_id', '=', case.id)])
+                    attach_to_send = self.pool.get('ir.attachment').read(cr, uid, attach_ids, ['datas_fname','datas'])
+                    attach_to_send = map(lambda x: (x['datas_fname'], base64.decodestring(x['datas'])), attach_to_send)
+
+                # Send an email
+                flag = tools.email_send(
+                    src,
+                    dest,
+                    "Reminder: [%s] %s" % (str(case.id), case.name,),
+                    body,
+                    reply_to = case.event_id.reply_to,
+                    openobject_id=str(case.id),
+                    attach=attach_to_send
+                )
+                self._history(cr, uid, [case], _('Send'), history=True, email=dest, details=body, email_from=src)
+                
+                #if flag:
+                #    raise osv.except_osv(_('Email!'),("Email Successfully Sent"))
+                #else:
+                #    raise osv.except_osv(_('Email Fail!'),("Email is not sent successfully"))
+        return True     
 
     def mail_user_confirm(self, cr, uid, ids):
         """
@@ -287,7 +449,6 @@ class event_registration(osv.osv):
         @param ids: List of Event Registration's Id.
         @return : False
         """
-       
         reg_ids = self.browse(cr, uid, ids)
         for reg_id in reg_ids:
             src = reg_id.event_id.reply_to or False
@@ -297,9 +458,10 @@ class event_registration(osv.osv):
             if reg_id.email_cc:
                 dest += [reg_id.email_cc]
             if dest and src:
-                tools.email_send(src, dest, 'Auto Confirmation: '+'['+str(reg_id.id)+']'+' '+reg_id.name, reg_id.event_id.mail_confirm, openobject_id = str(reg_id.id))
+                    tools.email_send(src, dest, 'Auto Confirmation: '+'['+str(reg_id.id)+']'+' '+reg_id.name, reg_id.event_id.mail_confirm, openobject_id = str(reg_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
 
     def mail_user(self, cr, uid, ids):
@@ -347,7 +509,7 @@ class event_registration(osv.osv):
     _inherit = 'crm.meeting'
 
     _columns = {
-        'email_cc': fields.text('Watchers Emails', size=252 , help="These \
+        'email_cc': fields.text('CC', size=252 , help="These \
 people will receive a copy of the future communication between partner \
 and users by email"), 
         'nb_register': fields.integer('Number of Registration', readonly=True, states={'draft': [('readonly', False)]}), 
@@ -358,7 +520,7 @@ and users by email"),
         "badge_title": fields.char('Badge Title', size=128), 
         "badge_name": fields.char('Badge Name', size=128), 
         "badge_partner": fields.char('Badge Partner', size=128), 
-        "invoice_label": fields.char("Label Invoice", size=128, required=True), 
+        "event_product": fields.char("Product Name", size=128, required=True), 
         "tobe_invoiced": fields.boolean("To be Invoiced"), 
         "invoice_id": fields.many2one("account.invoice", "Invoice"), 
         'date_closed': fields.datetime('Closed', readonly=True), 
@@ -390,7 +552,7 @@ and users by email"),
         data ={}
         if not contact:
             return data
-        
+
         contact_id = self.pool.get('res.partner.contact').browse(cr, uid, contact)
         data['badge_name'] = contact_id.name
         data['badge_title'] = contact_id.title
@@ -401,26 +563,24 @@ and users by email"),
                 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'])
-
         return {'value': data}
 
     def onchange_event(self, cr, uid, ids, event_id, partner_invoice_id):
         context={}
         if not event_id:
-            return {'value': {'unit_price': False, 'invoice_label': False}}
+            return {'value': {'unit_price': False, 'event_product': False}}
         data_event =  self.pool.get('event.event').browse(cr, uid, event_id)
         
         if data_event.product_id:
             if not partner_invoice_id:
                 unit_price=self.pool.get('product.product').price_get(cr, uid, [data_event.product_id.id], context=context)[data_event.product_id.id]
-                return {'value': {'unit_price': unit_price, 'invoice_label': data_event.product_id.name}}
+                return {'value': {'unit_price': unit_price, 'event_product': data_event.product_id.name}}
             data_partner = self.pool.get('res.partner').browse(cr, uid, partner_invoice_id)
             context.update({'partner_id': data_partner})
             unit_price = self.pool.get('product.product')._product_price(cr, uid, [data_event.product_id.id], False, False, {'pricelist': data_partner.property_product_pricelist.id})[data_event.product_id.id]
-            return {'value': {'unit_price': unit_price, 'invoice_label': data_event.product_id.name}}
+            return {'value': {'unit_price': unit_price, 'event_product': data_event.product_id.name}}
         
-        return {'value': {'unit_price': False, 'invoice_label': False}}
-
+        return {'value': {'unit_price': False, 'event_product': False}}
 
     def onchange_partner_id(self, cr, uid, ids, part, event_id, email=False):
         
@@ -464,7 +624,6 @@ and users by email"),
             return {'value': data}
         return {'value': data}
 
-
 event_registration()
 
 
diff --git a/addons/event/event_data.xml b/addons/event/event_data.xml
index 37da989e12d..ebfe70e4c50 100755
--- a/addons/event/event_data.xml
+++ b/addons/event/event_data.xml
@@ -2,12 +2,5 @@
 <openerp>
 	<data>
 
-<!-- The base section for all events -->
-
-		<record model="crm.case.section" id="case_section_event">
-			<field name="name">Events</field>
-		</record>
-
-
 	</data>
 </openerp>
diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml
index ad25a1dbfc1..1611febcf5e 100755
--- a/addons/event/event_demo.xml
+++ b/addons/event/event_demo.xml
@@ -58,7 +58,6 @@
 		<field name="date_begin">2008-01-01 19:00:00</field>
 		<field name="date_end">2008-01-01 23:00:00</field>
 		<field name="product_id" ref="event_product_0"/>
-		<field name="parent_id" ref="case_section_event"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="register_max">500</field>
 		<field name="type" ref="event_type_1"/>
@@ -94,7 +93,6 @@
 		<field name="product_id" ref="event_product_1"/>
 		<field name="type" ref="event_type_1"/>
 		<field name="user_id" ref="base.user_root"/>
-		<field name="parent_id" ref="case_section_event"/>
 		<field name="register_max">350</field>
 		<field name="state">confirm</field>
 	</record>
@@ -107,7 +105,6 @@
 		<field name="type" ref="event_type_2"/>
 		<field name="register_max">200</field>
 		<field name="user_id" ref="base.user_root"/>
-		<field name="parent_id" ref="case_section_event"/>
 		<field name="mail_auto_registr">True</field>
 		<field name="mail_auto_confirm">True</field>
 		<field name="state">done</field>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 9815094e571..019f596e49a 100755
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -48,7 +48,7 @@
         <menuitem name="Events by Categories" id="menu_action_event_categories" action="action_event_categories" parent="menu_event_main"/>
 
 
-    <!-- Events Organisation/CONFIGURATION/EVENTS  -->
+    <!-- Events Organisation/CONFIGURATION/EVENTS -->
 
         <record model="ir.ui.view" id="view_event_form">
             <field name="name">Events</field>
@@ -67,11 +67,12 @@
                     <notebook colspan="4">
                     <page string="General">
                         <separator string="Event description" colspan="4"/>
-                        <field name="parent_id" domain="[('parent_id','child_of','Event')]" string="Parent Category"/>
+                        <field name="parent_id" domain="[('parent_id','child_of','Event')]"/>
                         <field name="active"/>
                         <field name="register_min"/>
                         <field name="register_max"/>
-                        <separator string="Status" colspan="4"/>
+                        <separator string="Notes" colspan="4"/>
+                        <field name="note" colspan="4" nolabel="1"/>
                         <field name="state" select="1"/>
                         <group col="4" colspan="2">
                            <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
@@ -87,11 +88,9 @@
                         <group col="3" colspan="2">
                             <separator string="Auto Registration Email" colspan="2"/>
                             <newline/>
-
                             <field name="mail_auto_registr"/>
                             <separator string="Registration Email" colspan="2"/>
                             <field name="mail_registr" colspan="2" nolabel="1"/>
-
                         </group>
                         <group col="2" colspan="2">
                             <separator string="Auto Confirmation Email" colspan="2"/>
@@ -121,6 +120,7 @@
                 <tree string="Events" colors="red:register_min>register_current;black:register_min&lt;=register_current">
                     <field name="name" string="Name"/>
                     <field name="user_id"/>
+                    <field name="type"/>
                     <field name="date_begin"/>
                     <field name="register_min"/>
                     <field name="register_current"/>
@@ -140,24 +140,24 @@
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed Events"/>
                         <separator orientation="vertical"/>
                         <field name="name" string="Event" select="1"/>
+                        <field name="state" select="1"/>
                         <field name="user_id" widget="selection">
-
-                               <filter icon="terp-partner"
+                               <filter icon="terp-personal"
                                     string="My Events"
                                     help="My Events"
                                     domain="[('user_id','=',uid)]"/>
-                        </field>            
+                        </field>
                         <field name="date_begin" select="1"/>
-                        <field name="state" select="1"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="12">
-                        <filter string="Responsible" name="user" icon="terp-partner" context="{'group_by': 'user_id'}"/>
+                    <group expand="0" string="Group By..." colspan="4" col="12">
                         <filter string="Event Type" icon="terp-crm"  context="{'group_by':'type'}"/>
-                        <filter string="state" icon="terp-crm" context="{'group_by':'state'}"/>
+                        <filter string="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical"/> 
+                        <filter string="Responsible" name="user" icon="terp-personal" context="{'group_by': 'user_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Creation" icon="terp-project"
-                            domain="[]" context="{'group_by':'date_begin'}" />
+                        <filter string="Creation" icon="terp-go-month"
+                            domain="[]" context="{'group_by':'date_begin'}"/>
                     </group>
                 </search>
             </field>
@@ -174,6 +174,15 @@
            <field name="context">{"search_default_user_id":uid}</field>
            <field name="search_view_id" ref="view_event_search"/>
        </record>
+       
+      <act_window
+            id="act_event_list_register_event"
+            name="Registration"
+            res_model="event.registration"
+            src_model="event.event"
+            view_mode="tree,form"
+            domain="[('event_id', '=', active_id)]"
+            view_type="form"/>
 
        <menuitem name="Events" id="menu_event_event" action="action_event_view" parent="menu_event_main" />
 
@@ -228,77 +237,83 @@
                             <separator string="Status" colspan="4"/>
                             <group col="8" colspan="4">
                                 <field name="state" select="1" colspan="2"/>
-                                <button name="button_reg_close" string="Registration Invoiced" states="open" type="object" icon="gtk-print"/>
+                                <button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
                                 <button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
                                 <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
                             </group>
                         </page>
                         <page string="Payments">
-                            <field name="invoice_label" select="1"/>
+                            <field name="event_product" select="1"/>
                             <field name="tobe_invoiced" select="1"/>
                             <field name="invoice_id"/>
                         </page>
-                        <page string="History">
-                            <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
-                                <form string="Communication history">
-                                        <group col="6" colspan="4">
-                                            <field name="date"/>
-                                            <field name="email_to"/>
-                                            <field name="email_from"/>
-                                        </group>
-                                        <notebook colspan="4">
-                                            <page string="Details">
-                                                <field name="description" colspan="4" nolabel="1"/>
-                                            </page>
-                                            <page string="Attachments">
-                                                <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
-                                            </page>
-                                        </notebook>
-                                        <button colspan="4"
-                                        string="Reply to Last Email"
-                                        name="%(crm.action_crm_send_mail)d"
-                                        context="{'mail':'reply', 'model': 'event.registration'}"
-                                        icon="gtk-undo" type="action" />
-                                    </form>
-                                    <tree string="Communication history">
-                                        <field name="date"/>
-                                        <field name="email_from" />
-                                        <field name="email_to"/>
-                                        <field name="description"/>
-                                    </tree>
-                                </field>
-                            <field name="log_ids" nolabel="1" colspan="4" mode="tree,form" readonly="1">
-                                <tree string="Actions">
-                                    <separator string="Action Information" colspan="4"/>
-                                    <field name="name"/>
-                                    <field name="date"/>
-                                    <field name="user_id"/>
-                                </tree>
-                                <form string="Actions">
-                                    <separator string="Action Information" colspan="4"/>
-                                    <field name="name" colspan="4"/>
-                                    <field name="date"/>
-                                    <field name="user_id"/>
-                                </form>
-                            </field>
-                        </page>
-                        <page string="Extra Info">
-                            <group col="6" colspan="4">
-                                <field name="name" select="1" colspan="6"/>
-                                <newline/>
-                                <field name="categ_id"/>
-                                <field name="id" select="1"/>
-                                <field name="active"/>
-                                <separator colspan="6" string="Watchers Emails" />
-                                <field name="email_cc" colspan="6" nolabel="1"/>
+                        <page string="Emails" groups="base.group_extended">
+                            <group colspan="4">
+                                <field colspan="4" name="email_cc" string="CC"/>
                             </group>
-                            <separator colspan="4" string="Dates"/>
-                            <field name="create_date"/>
-                            <field name="date_closed"/>
-                            <separator colspan="4" string="References"/>
-                            <field name="ref" colspan="4"/>
-                            <field name="ref2" colspan="4"/>
-                        </page>
+	                        <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
+		                        <form string="Communication history">
+		                            <group col="6" colspan="4">
+		                                <field name="date"/>
+		                                <field name="email_to"/>
+		                                <field name="email_from"/>
+		                            </group>
+		                            <notebook colspan="4">
+		                                <page string="Details">
+		                                    <field name="description" colspan="4" nolabel="1"/>
+		                                </page>
+		                                <page string="Attachments">
+		                                    <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
+		                                </page>
+		                            </notebook>
+		                            <button colspan="4"
+		                            string="Reply to Last Email"
+		                            name="%(crm.action_crm_send_mail)d"
+		                            context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
+		                            icon="gtk-undo" type="action" />
+		                        </form>
+		                        <tree string="Communication history">
+		                            <field name="date"/>
+		                            <field name="email_from" />
+		                            <field name="email_to"/>
+		                            <field name="description"/>
+		                        </tree>
+	                           </field>
+	                       </page>
+	                       <page string="History">
+	                            <group colspan="4"> 
+	                               <field name="name" select="1" colspan="4"/>
+	                            </group>   
+	                            <group col="2" colspan="2">
+	                               <separator string="Dates" colspan="2"/>
+	                               <field name="create_date"/>
+	                               <field name="date_closed"/>
+	                            </group>
+	                            <group col="2" colspan="2">
+                                   <separator string="Misc" colspan="2"/>
+                                   <field name="id"/>
+                                   <field name="active"/>
+                                </group>
+	                            <group col="3" colspan="4">
+	                                <separator colspan="4" string="References"/>
+	                                <field name="ref" />
+	                                <field name="ref2" />
+	                            </group>
+	                            <!-- TODO-->
+	                           <field name="log_ids" nolabel="1" colspan="4">
+	                                <tree string="Logs">
+	                                    <field name="name" colspan="4"/>
+	                                    <field name="date"/>
+	                                    <field name="user_id"/>
+	                                </tree>
+	                                <form string="Logs">
+	                                    <separator string="Action Information" colspan="4"/>
+	                                    <field name="name" colspan="4"/>
+	                                    <field name="date"/>
+	                                    <field name="user_id"/>
+	                                </form>
+	                            </field>
+	                        </page>
                     </notebook>
                 </form>
             </field>
@@ -313,21 +328,27 @@
             <field name="arch" type="xml">
                 <search string="Event Registration">
                     <group col="12" colspan="4">
-                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Registrations"/>
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','in',('open','done'))]" help="Confirmed Registrations"/>
                         <separator orientation="vertical"/>
+                        <field name="partner_id" />
                         <field name="event_id" widget="selection"/>
-                        <field name="user_id" widget="selection"/>
                         <field name="state" select="1"/>
+                        
+                        <field name="user_id" widget="selection">
+                              <filter icon="terp-personal"
+                                    string="My Registration"
+                                    help="My Registration"
+                                    domain="[('user_id','=',uid)]"/>
+                        </field>
                     </group>
                     <newline/>    
-                    <group expand="1" string="Group By...">
-                        <filter string="Event" icon="terp-crm" domain="[]" context="{'group_by':'event_id'}"/> 
-                        <filter string="State" icon="terp-crm" domain="[]" context="{'group_by':'state'}"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Event" icon="terp-crm" domain="[]" context="{'group_by':'event_id'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Partner" icon="terp-crm" domain="[]" context="{'group_by':'partner_id'}"/>                        
-                        <filter string="Responsible" name="uid" icon="terp-partner" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>                        
+                        <filter string="Responsible" name="uid" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                    </group>
                 </search>
             </field>
@@ -342,6 +363,7 @@
           <field name="context">{"search_default_user_id":uid}</field>
           <field name="search_view_id" ref="view_registration_search"/>
         </record>
+        
         <menuitem
             name="Registrations"
             id="menu_action_registration" parent="menu_event_main"
diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index f7a2009020c..d4674436faa 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -49,50 +49,51 @@
             <field name="arch" type="xml">
                 <search string="Event on Registration">
                     <group col="8" colspan="4">
-                    <filter icon="gtk-media-rewind" string="  365 Days  "
+                    <filter icon="terp-go-year" string="Last 365 Days"
                         domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
                         help="Tasks performed in last 365 days"/>
-                    <filter icon="gtk-media-rewind" string="   30 Days   "
+                    <filter icon="terp-go-month" string="Last 30 Days"
                         name="month"
                         domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
                         help="Tasks performed in last 30 days"/>
-                    <filter icon="gtk-media-rewind"
-                         string="    7 Days    "
+                    <filter icon="terp-go-week"
+                         string="Last 7 Days"
                          separator="1"
                          domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                          help="Tasks during last 7 days"/>
                          
                     <separator orientation="vertical"/>
-                      <filter icon="terp-crm"
+                      <filter icon="terp-document-new"
                         string="Draft"
                         domain="[('state','=','draft')]"/>
-                    <filter icon="terp-crm"
+                    <filter icon="terp-camera_test"
                         string="Confirm"
                         domain="[('state', '=', 'confirm')]"/>
                     <separator orientation="vertical"/>    
                         <field name="event_id" widget="selection"/>
-
                          <field name="type" widget="selection"/>
                          <field name="user_id" widget="selection">
-                            <filter icon="terp-partner"
+                            <filter icon="terp-personal"
                                 string="My Events"
                                 help="My Events"
                                 domain="[('user_id','=',uid)]"/>
                         </field>
-                         <field name="date" />
+                         <field name="date"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="12">
-                        <filter string="User" name="user" icon="terp-partner" context="{'group_by': 'user_id'}"/>
+                    <group expand="0" string="Group By..." colspan="4" col="12">
                         <filter string="Event" name="event" icon="terp-crm" context="{'group_by':'event_id'}"/>
                         <filter string="Event Type" icon="terp-crm"  context="{'group_by':'type'}"/>
-                        <filter string="state" icon="terp-crm" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Responsible" name="user" icon="terp-personal" context="{'group_by': 'user_id'}"/>
                         <separator orientation="vertical" />
-                        <filter string="Day" icon="terp-crm"
+                        <filter string="Day" icon="terp-go-month"
                             domain="[]" context="{'group_by':'day'}"/>
-                        <filter string="Month" icon="terp-crm"
+                        <filter string="Month" icon="terp-go-month"
                             domain="[]" context="{'group_by':'month'}"/>
-                        <filter string="Year" icon="terp-crm"
+                        <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'year'}"/>
                     </group>
                 </search>
diff --git a/addons/event/security/ir.model.access.csv b/addons/event/security/ir.model.access.csv
index 6a5f00e2846..ea7548c0a95 100755
--- a/addons/event/security/ir.model.access.csv
+++ b/addons/event/security/ir.model.access.csv
@@ -8,4 +8,3 @@
 "access_event_confirm_registration_manager","event.confirm.registration manager","model_event_confirm_registration","crm.group_crm_manager",1,1,1,1
 "access_event_make_invoice","event.make.invoice","model_event_make_invoice","crm.group_crm_user",1,1,1,1
 "access_event_partners_list","event.partners.list","model_event_partners_list","crm.group_crm_user",1,0,0,0
-"access_event_registration_list","event.registration.list","model_event_registration_list","crm.group_crm_user",1,0,0,0
diff --git a/addons/event/test/test_event.yml b/addons/event/test/test_event.yml
index 4cf9438cb3d..d1a479535bc 100644
--- a/addons/event/test/test_event.yml
+++ b/addons/event/test/test_event.yml
@@ -51,14 +51,13 @@
     property_account_receivable: account.a_recv
     
 - |
-  we create it with a "Conference on ERP Buisness" event and provide "Beginning date", "Ending Date", "Product" as Concert Ticket.
+  we create it with a "Conference on OpenERP Offshore Business" event and provide "Beginning date", "Ending Date", "Product" as Concert Ticket.
 -
   !record {model: event.event, id: event_event_conference0}:
     code: C/004
     date_begin: '2010-06-07 13:39:00'
     date_end: '2010-06-10 13:39:00'
-    name: Conference on ERP Buisness
-    parent_id: event.case_section_event
+    name: Conference on OpenERP Offshore Business.
     product_id: 'product_product_ticketforconcert0'
     register_max: 0.0
     register_min: 0.0
@@ -91,7 +90,7 @@
      
 - |
   person "Mark Johnson" want to  confirm their registrations. for that 
-  I create New Registration for "Conference on ERP Buisness" event. 
+  I create New Registration for "Conference on OpenERP Offshore Business. 
 - 
   !record {model: event.registration, id: event_registration_registrationjacot0}:
     badge_name: Jacot
@@ -100,13 +99,13 @@
     contact_id: base_contact.res_partner_contact_jacot0
     date_deadline: '2010-06-07 13:39:00'
     event_id: event.event_event_conference0
-    invoice_label: Ticket for Concert
+    event_product: Ticket for Concert
     name: 'Registration: Jacot'
     partner_id: 'res_partner_markjohnson0'
     partner_invoice_id: 'res_partner_markjohnson0'
     unit_price: 68.0
 - |
-  I check that "Number of registration" is less than "Maximum registration" defined in "Conference on ERP Buisness" event.
+  I check that "Number of registration" is less than "Maximum registration" defined in "Conference on OpenERP Offshore Business" event.
   if not then  confirmation will fail because its greater  then the Maximum registration.   
 - 
   !python {model: event.event}: |
@@ -132,7 +131,7 @@
     contact_id: base_contact.res_partner_contact_zen0
     date_deadline: '2010-06-07 13:39:00'
     event_id: event.event_event_conference0
-    invoice_label: Ticket for Concert
+    event_product: Ticket for Concert
     name: 'Registration: Zen'
     partner_id: base.res_partner_3
     partner_invoice_id: base.res_partner_3
@@ -145,7 +144,7 @@
     self.check_confirm(cr, uid, [ref("event_registration_registrationzen0")], {"active_ids": [ref("event.menu_action_registration")]})
 
 - |
-  Third person create New Registration for "Conference on ERP Business" event. 
+  Third person create New Registration for "Conference on OpenERP Offshore Business" event. 
 - 
   !record {model: event.registration, id: event_registration_registrationpassot0}:
     badge_name: Passot
@@ -155,7 +154,7 @@
     date_deadline: '2010-06-07 13:39:00'
     email_from: info@mediapole.net
     event_id: 'event_event_conference0'
-    invoice_label: Ticket for Concert
+    event_product: Ticket for Concert
     name: 'Registration: Passot'
     partner_id: base.res_partner_8
     partner_invoice_id: base.res_partner_8
@@ -185,17 +184,6 @@
   !python {model: event.partners.list}: |
     self.list_partners(cr, uid, [ref("event_partners_list_0")], {"active_ids":
       [ref("event.event_event_conference0")]})
-  
-- | 
-  We check all registrations on current event using the wizard "Registrations"
-- 
-  !record {model: event.registration.list, id: event_registration_list_0}:
-    {}
-- | 
-  I click on "Open Registrations" button of  "Registrations" wizard.  
-- 
-  !python {model: event.registration.list}: |
-    self.open_registration(cr, uid, [ref("event_registration_list_0")], {"active_ids": [ref("event.event_event_conference0")]})
 
 - |
   This event is finished by click on "Event Done" button of this event form.
@@ -211,16 +199,15 @@
 - |
   Now, I will invoice the participant who have address using "Make Invoices". This wizard will also give the number of invoices are created and rejected.
   Create invoice will be linked to Invoice Field available on Payments tab of registrations
+
 - 
   !record {model: event.make.invoice, id: event_make_invoice_0}:
-    inv_created: '0'
-    inv_rej_reason: 'ID 1: Registration already has an invoice linked. \n'
-    inv_rejected: '1'
+    {}
 - |
-  I click on "Open" button of this "Make Invoices" wizard.
+  I click on "Done" button of this "Make Invoices" wizard.
 - 
   !python {model: event.make.invoice}: |
-    self.confirm(cr, uid, [ref("event_make_invoice_0")], {"active_ids": [ref("event_registration_registrationjacot0")]})  
+    self.make_invoice(cr, uid, [ref("event_make_invoice_0")], {"active_ids": [ref("event_registration_registrationzen0")]})  
 - |
   I check  that Invoice for this partner is create or not.
 -
@@ -230,10 +217,11 @@
      inv_obj = self.pool.get('account.invoice')
      data_event_reg = obj_event_reg.browse(cr, uid, [ref('event_registration_registrationzen0')], context=context)[0]
      invoice_ids = inv_obj.search(cr, uid, [('partner_id', '=', data_event_reg.partner_invoice_id.id)])
-     invoice_id = inv_obj.browse(cr, uid, invoice_ids)
-     if invoice_id:
-        line_ids = obj_lines.search(cr, uid, [('product_id', '=', data_event_reg.event_id.product_id), ('invoice_id', '=', invoice_id.id), ('price_unit', '=', data_event_reg.unit_price)])
+     
+     if invoice_ids:
+        invoice_id = inv_obj.browse(cr, uid, invoice_ids)[0]
+        line_ids = obj_lines.search(cr, uid, [('product_id', '=', data_event_reg.event_id.product_id.id), ('invoice_id', '=', invoice_id.id), ('price_unit', '=', data_event_reg.unit_price)])
         line_id = obj_lines.browse(cr, uid, line_ids)[0]
-        assert line_id.product_id == data_event_reg.product_id
+        assert line_id.product_id == data_event_reg.event_id.product_id
         assert data_event_reg.partner_id == invoice_id.partner_id
-        assert invoice_id.address_invoice_id == data_event_reg.partner_address_id
+        assert invoice_id.address_invoice_id == data_event_reg.partner_address_id
\ No newline at end of file
diff --git a/addons/event/wizard/__init__.py b/addons/event/wizard/__init__.py
index 81191b5a2f9..bf8975b1611 100755
--- a/addons/event/wizard/__init__.py
+++ b/addons/event/wizard/__init__.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import event_registration
 import event_make_invoice
 import event_registrations_partner
 import event_confirm_registration
diff --git a/addons/event/wizard/event_confirm_registration.py b/addons/event/wizard/event_confirm_registration.py
index 0e64c0abe53..bb153fb0862 100755
--- a/addons/event/wizard/event_confirm_registration.py
+++ b/addons/event/wizard/event_confirm_registration.py
@@ -20,7 +20,8 @@
 ##############################################################################
 
 from osv import fields, osv
-
+from tools.translate import _
+ 
 class event_confirm_registration(osv.osv_memory):
     """
     Confirm Event Registration
@@ -37,10 +38,13 @@ class event_confirm_registration(osv.osv_memory):
 
     def confirm(self, cr, uid, ids, context):
         registration_obj = self.pool.get('event.registration')
+        
         reg_id = context.get('reg_id', False) or context.get('active_id', False)
+        reg_ids = registration_obj.browse(cr, uid, [reg_id])
+        
         if reg_id:
             registration_obj.write(cr, uid, [reg_id], {'state':'open', })
-            registration_obj._history(cr, uid, [reg_id], 'Open', history=True)
+            registration_obj._history(cr, uid, reg_ids, _('Open'))
             registration_obj.mail_user(cr, uid, [reg_id])
         return {}
 
diff --git a/addons/event/wizard/event_make_invoice.py b/addons/event/wizard/event_make_invoice.py
index 7a8bcfb489b..a334d2e6c36 100755
--- a/addons/event/wizard/event_make_invoice.py
+++ b/addons/event/wizard/event_make_invoice.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 from osv import fields, osv
+from tools.translate import _
 
 class event_make_invoice(osv.osv_memory):
     """
@@ -27,125 +28,69 @@ class event_make_invoice(osv.osv_memory):
     _name = "event.make.invoice"
     _description = "Event Make Invoice"
     _columns = {
-        'inv_created': fields.char('Invoice Created', size=32, readonly=True), 
-        'inv_rejected': fields.char('Invoice Rejected', size=32, readonly=True), 
-        'inv_rej_reason': fields.text('Error Messages', readonly=True), 
+                
+        'grouped': fields.boolean('Group the invoices'),
+        'invoice_date':fields.date('Invoice Date'),
 #        'invoice_ids': fields.char('Invoice Ids', size=128), # Improve me
-               }
+         }
 
-    def _makeInvoices(self, cr, uid, context={}):
+    def view_init(self, cr, uid, fields, context=None):
         """
-        Get default value for  fields
+        This function checks for precondition before wizard executes
+        @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
+        @param fields: List of fields for default value
         @param context: A standard dictionary for contextual values
-        @return: Dictionary of value
         """
-        
-        invoices = {}
-        invoice_ids = []
-        create_ids=[]
-        tax_ids=[]
-        inv_create = 0
-        inv_reject = 0
-        inv_rej_reason = ""
-        list_inv = []
         obj_event_reg = self.pool.get('event.registration')
-        obj_lines = self.pool.get('account.invoice.line')
-        inv_obj = self.pool.get('account.invoice')
-        data_event_reg = obj_event_reg.browse(cr, uid, context['active_ids'], context=context)
+        data = context and context.get('active_ids', [])
+        
+        for event_reg in obj_event_reg.browse(cr, uid, data, context=context):
+            if event_reg.state == 'draft':
+                     raise osv.except_osv(_('Warning !'),
+                        _("Invoice cannot be created if the registration is in draft state."))
+            if (not event_reg.tobe_invoiced):
+                    raise osv.except_osv(_('Warning !'),
+                        _("Registration is set as Cannot be invoiced"))
 
-        for reg in data_event_reg:
-            if reg.state=='draft':
-                inv_reject = inv_reject + 1
-                inv_rej_reason += "ID "+str(reg.id)+": Invoice cannot be created if the registration is in draft state. \n"
-                continue
-            if (not reg.tobe_invoiced):
-                inv_reject = inv_reject + 1
-                inv_rej_reason += "ID "+str(reg.id)+": Registration is set as 'Cannot be invoiced'. \n"
-                continue
-            if reg.invoice_id:
-                inv_reject = inv_reject + 1
-                inv_rej_reason += "ID "+str(reg.id)+": Registration already has an invoice linked. \n"
-                continue
-            if not reg.event_id.product_id:
-                inv_reject = inv_reject + 1
-                inv_rej_reason += "ID "+str(reg.id)+": Event related doesn't have any product defined. \n"
-                continue
-            if not reg.partner_invoice_id:
-                inv_reject = inv_reject + 1
-                inv_rej_reason += "ID "+str(reg.id)+": Registration doesn't have any partner to invoice. \n"
-                continue
-            else:
-                val_invoice = inv_obj.onchange_partner_id(cr, uid, [], 'out_invoice', reg.partner_invoice_id.id, False, False)
-                val_invoice['value'].update({'partner_id': reg.partner_invoice_id.id})
-                partner_address_id = val_invoice['value']['address_invoice_id']
-                
-            if not partner_address_id:
-                inv_reject = inv_reject + 1
-                inv_rej_reason += "ID "+str(reg.id)+": Registered partner doesn't have an address to make the invoice. \n"
-                continue
-
-            inv_create = inv_create + 1
-            value = obj_lines.product_id_change(cr, uid, [], reg.event_id.product_id.id, uom =False, partner_id=reg.partner_invoice_id.id, fposition_id=reg.partner_invoice_id.property_account_position.id)
-            data_product = self.pool.get('product.product').browse(cr, uid, [reg.event_id.product_id.id])
-            for tax in data_product[0].taxes_id:
-                tax_ids.append(tax.id)
-
-            vals = value['value']
-            c_name = reg.contact_id and ('-' + self.pool.get('res.partner.contact').name_get(cr, uid, [reg.contact_id.id])[0][1]) or ''
-            vals.update({
-                'name': reg.invoice_label + '-' + c_name, 
-                'price_unit': reg.unit_price, 
-                'quantity': reg.nb_register, 
-                'product_id':reg.event_id.product_id.id, 
-                'invoice_line_tax_id': [(6, 0, tax_ids)], 
-            })
-            inv_line_ids = obj_event_reg._create_invoice_lines(cr, uid, [reg.id], vals)
-
-            val_invoice['value'].update({
-                'origin': reg.invoice_label, 
-                'reference': False, 
-                'invoice_line': [(6, 0, [inv_line_ids])], 
-                'comment': "", 
-            })
-
-            inv_id = inv_obj.create(cr, uid, val_invoice['value'])
-            list_inv.append(inv_id)
-            obj_event_reg.write(cr, uid, reg.id, {'invoice_id': inv_id, 'state': 'done'})
-            obj_event_reg._history(cr, uid, [reg.id], 'Invoiced', history=True)
-
-#        {'inv_created' : str(inv_create) , 'inv_rejected' : str(inv_reject), 'invoice_ids': str(list_inv), 'inv_rej_reason': inv_rej_reason}
-        return {'inv_created': str(inv_create), 'inv_rejected': str(inv_reject), 'inv_rej_reason': inv_rej_reason}
+            if not event_reg.event_id.product_id:
+                    raise osv.except_osv(_('Warning !'),
+                        _("Event related doesn't have any product defined"))
+            if not event_reg.partner_invoice_id:
+                   raise osv.except_osv(_('Warning !'),
+                        _("Registration doesn't have any partner to invoice.")) 
 
     def default_get(self, cr, uid, fields_list, context=None):
         res = super(event_make_invoice, self).default_get(cr, uid, fields_list, context)
-        res.update(self._makeInvoices(cr, uid, context=context))
         return res
 
-    def confirm(self, cr, uid, ids, context={}):
-        """
-        Open Account invoice form.
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of event make invoice's Id.
-        @param context: A standard dictionary for contextual values
-        @return: Dictionary of value
-        """
-        obj_model = self.pool.get('ir.model.data')
-        data_inv = self.read(cr, uid, ids, [], context)[0]
-        model_data_ids = obj_model.search(cr, uid, [('model', '=', 'ir.ui.view'), ('name', '=', 'invoice_form')])
-        resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'])[0]['res_id']
-        return {
-#            'domain': "[('id','in', ["+','.join(map(str,data_inv['invoice_ids']))+"])]",
-            'name': 'Invoices', 
-            'view_type': 'form', 
-            'view_mode': 'tree,form', 
-            'res_model': 'account.invoice', 
-            'views': [(False, 'tree'), (resource_id, 'form')], 
-            'context': "{'type':'out_invoice'}", 
-            'type': 'ir.actions.act_window'
-        }
+    def make_invoice(self, cr, uid, ids, context={}):
+        
+        reg_obj = self.pool.get('event.registration')
+        newinv = []
+        
+        for data in self.browse(cr, uid, ids):
+            reg_obj.action_invoice_create(cr, uid, context.get(('active_ids'),[]), data.grouped, date_inv = data.invoice_date)
+        
+   #     reg_id =  reg_obj.browse(cr, uid, ids)[0]
 
+        mod_obj =self.pool.get('ir.model.data')
+        result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
+        
+        id = mod_obj.read(cr, uid, result, ['res_id'])  
+                      
+        return {
+           # 'domain': "[('id','in', ["+','.join(map(str,newinv))+"])]",
+            'name': 'Invoices',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'account.invoice',
+            'view_id': False,
+            'context': "{'type':'out_refund'}",
+            'type': 'ir.actions.act_window',
+            'search_view_id': id['id']                
+        }
+        
 event_make_invoice()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/event/wizard/event_make_invoice_view.xml b/addons/event/wizard/event_make_invoice_view.xml
index 0f4c7c9c152..68a07ceeee8 100755
--- a/addons/event/wizard/event_make_invoice_view.xml
+++ b/addons/event/wizard/event_make_invoice_view.xml
@@ -7,15 +7,17 @@
             <field name="model">event.make.invoice</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-              	<form string="Make Invoices">
-              		<field name="inv_created" />
-              		<field name="inv_rejected" />
-              		<field name="inv_rej_reason" colspan="4"/>
-              		<group colspan="4" col="6">
-            			<button  icon="gtk-cancel" special="cancel" string="_Ok"/>
-            			<button icon="gtk-ok" name="confirm" string="Open" type="object"/>
-                	</group>
-				</form>
+             <form string="Create invoices">
+                <separator colspan="4" string="Do you really want to create the invoices ?" />
+                <field name="grouped" />
+                <field name="invoice_date"/>
+                <group colspan="4">
+	                <separator string="" colspan="4" />
+	                <label string="" colspan="2"/>
+	                <button special="cancel" string="Close" icon="gtk-close"/>
+	                <button name="make_invoice" string="Done" type="object" icon="gtk-ok"/>
+                </group>
+             </form>
             </field>
 		</record>
 
diff --git a/addons/event/wizard/event_registrations_partner.xml b/addons/event/wizard/event_registrations_partner.xml
index bc982757435..a1700c3689b 100755
--- a/addons/event/wizard/event_registrations_partner.xml
+++ b/addons/event/wizard/event_registrations_partner.xml
@@ -9,16 +9,16 @@
             <field name="arch" type="xml">
                   <form string="Event Partners">
                       <group colspan="4" col="2">
-                          <separator string="List Registrer Partners" colspan="4"/>
+                          <separator string="Register Partners" colspan="4"/>
                           <button special="cancel" string="Close" icon="gtk-close"/>
-                        <button name="list_partners" string="Open Partners" type="object" icon="gtk-open"/>
+                          <button name="list_partners" string="Open Partners" type="object" icon="gtk-open"/>
                     </group>
                    </form>
             </field>
         </record>
 
         <record id="action_event_partners" model="ir.actions.act_window">
-            <field name="name">List Register Partners</field>
+            <field name="name">Register Partners</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">event.partners.list</field>
             <field name="view_type">form</field>

From 67dc97ce25c8bceae5c4ed8ef4f130745263e6f2 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Mon, 21 Jun 2010 12:28:03 +0530
Subject: [PATCH 079/121] [IMP]: event: Add a send e new mail Button.

bzr revid: atp@tinyerp.co.in-20100621065803-izxnbkd33iluhpet
---
 addons/event/event.py       | 9 ++-------
 addons/event/event_view.xml | 4 ++++
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index a5364174f23..741e021b359 100755
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -83,11 +83,7 @@ class event(osv.osv):
                     self.pool.get('event.registration').mail_user_confirm(cr, uid, reg_ids)
                     
         return self.write(cr, uid, ids, {'state': 'confirm'})
-    
-    
-    
-    
-    
+
 
     def _get_register(self, cr, uid, ids, name, args, context=None):
         
@@ -353,7 +349,6 @@ class event_registration(osv.osv):
         @param *args: Fields value
         @return : New created record Id.
         """
-
         event = self.pool.get('event.event').browse(cr, uid, args[0]['event_id'], None)
         
         args[0]['date_deadline']= event.date_begin
@@ -439,7 +434,7 @@ class event_registration(osv.osv):
                 #    raise osv.except_osv(_('Email!'),("Email Successfully Sent"))
                 #else:
                 #    raise osv.except_osv(_('Email Fail!'),("Email is not sent successfully"))
-        return True     
+        return True  
 
     def mail_user_confirm(self, cr, uid, ids):
         """
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 019f596e49a..c58c1575d3b 100755
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -279,6 +279,10 @@
 		                            <field name="description"/>
 		                        </tree>
 	                           </field>
+	                          <button colspan="4" string="Send New Email"
+                                name="%(crm.action_crm_send_mail)d"
+                                context="{'mail':'new', 'model': 'event.registration'}"
+                                icon="gtk-go-forward" type="action" />
 	                       </page>
 	                       <page string="History">
 	                            <group colspan="4"> 

From 842873c92cf58abcc37357decce8f56a68a44e85 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Mon, 21 Jun 2010 13:37:25 +0530
Subject: [PATCH 080/121] [IMP]: membership: Improvement in membership search
 view

bzr revid: atp@tinyerp.co.in-20100621080725-1zcpfjfqdkrw34gk
---
 addons/membership/membership_view.xml | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index d64c7ae410c..b2e636ca13b 100755
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -118,17 +118,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <field name="category_id" position="after">
-                       <filter icon="terp-partner" domain="[('membership_state', '=', 'paid')]" string="Paid Members" />
-                       <filter icon="terp-partner" domain="[('membership_state', '=', 'invoiced')]" string="Invoiced Members" />
-                       <filter icon="terp-partner" domain="[('membership_state', '=', 'waiting')]" string="Future Members" />
+                       <filter icon="terp-personal" name="old" domain="[('membership_state', '=', 'old')]" string="Old Members" />
+                       <filter icon="terp-personal" name = "invoiced" domain="[('membership_state', '=', 'invoiced')]" string="Invoiced Members"/>
+                       <filter icon="terp-personal" domain="[('membership_state', '=', 'paid')]" string="Paid Members" />
+                       <filter icon="terp-personal" domain="[('membership_state', '=', 'waiting')]" string="Future Members" />
                        <separator orientation="vertical"/>
-                       <field name="membership_state">
+                       <field name="membership_state"/>
                        <field name="membership_start"/>
-                    </field>
-                    <newline/>
-                   <group expand="1" string="Group By..." position="after">
-                       <filter string="Associate Members" icon="terp-personal" domain="[]" context="{'group_by': 'associate_member'}"/>
-                   </group>     
+                       <newline/>
                </field>
             </field>
         </record>
@@ -139,13 +136,14 @@
             <field name="inherit_id" ref="view_res_partner_member_filter"/>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <field name="membership_state" position="after">
+                <field name="membership_start" position="after">
+                <newline/>
 	            <group expand="1" string="Group By" colspan="10" col="8">
-	                <separator orientation="vertical"/>
+	                <filter string="Associate Member" name = "associate" icon="terp-personal" domain="[]" context="{'group_by':'associate_member'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'membership_state'}"/>
+                    <separator orientation="vertical"/>
 	                <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by':'membership_start'}"/>
 	                <filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by':'membership_stop'}"/>
-	                <filter string="Associate Member" icon="terp-personal" domain="[]" context="{'group_by':'associate_member'}"/>
-	                <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'membership_state'}"/>
                 </group>
                 </field>
             </field>
@@ -156,6 +154,7 @@
             <field name="res_model">res.partner</field>
             <field name="domain">[('membership_state','&lt;&gt;','none'),('membership_state','&lt;&gt;','canceled'),('membership_state','&lt;&gt;','old'),('membership_state','&lt;&gt;','waiting')]</field>
             <field name="search_view_id" ref="view_res_partner_member_filter"/>
+            <field name="context">{"search_default_old": 1}</field>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_membership_members_view_tree">

From 2319190c5a20cb8095f85cacca89a33164ba93d7 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Mon, 21 Jun 2010 17:22:19 +0530
Subject: [PATCH 081/121] [FIX] document_webdav: connection problem after login

bzr revid: hmo@tinyerp.com-20100621115219-wagfjnes7l01tul2
---
 addons/document_webdav/webdav_server.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py
index 80b8b6bb898..59ce9c4bdb1 100644
--- a/addons/document_webdav/webdav_server.py
+++ b/addons/document_webdav/webdav_server.py
@@ -43,9 +43,13 @@ def OpenDAVConfig(**kw):
         def __init__(self, **kw):
             self.__dict__.update(**kw)
 
+        def getboolean(self, name):
+            return (str(getattr(self, name, 0)) in ('1', "yes", "true", "on", "True"))
+
     class Config:
         DAV = OpenDAV(**kw)
 
+
     return Config()
 
 

From b3a841111b6f159df88ae2fb27c938711142b9f6 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Mon, 21 Jun 2010 21:24:46 +0530
Subject: [PATCH 082/121] [IMP]: event: Minor Improvement in event module.

bzr revid: atp@tinyerp.co.in-20100621155446-kcw6124yl60yjyau
---
 addons/event/wizard/event_make_invoice.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/event/wizard/event_make_invoice.py b/addons/event/wizard/event_make_invoice.py
index a334d2e6c36..cbf6659acb7 100755
--- a/addons/event/wizard/event_make_invoice.py
+++ b/addons/event/wizard/event_make_invoice.py
@@ -50,6 +50,10 @@ class event_make_invoice(osv.osv_memory):
             if event_reg.state == 'draft':
                      raise osv.except_osv(_('Warning !'),
                         _("Invoice cannot be created if the registration is in draft state."))
+            if event_reg.state == 'done':
+                     raise osv.except_osv(_('Warning !'),
+                        _("Invoice cannot be created if the registration is in done state."))
+                              
             if (not event_reg.tobe_invoiced):
                     raise osv.except_osv(_('Warning !'),
                         _("Registration is set as Cannot be invoiced"))
@@ -71,17 +75,15 @@ class event_make_invoice(osv.osv_memory):
         newinv = []
         
         for data in self.browse(cr, uid, ids):
-            reg_obj.action_invoice_create(cr, uid, context.get(('active_ids'),[]), data.grouped, date_inv = data.invoice_date)
-        
-   #     reg_id =  reg_obj.browse(cr, uid, ids)[0]
+            res = reg_obj.action_invoice_create(cr, uid, context.get(('active_ids'),[]), data.grouped, date_inv = data.invoice_date)
 
         mod_obj =self.pool.get('ir.model.data')
         result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
         
         id = mod_obj.read(cr, uid, result, ['res_id'])  
-                      
+           
         return {
-           # 'domain': "[('id','in', ["+','.join(map(str,newinv))+"])]",
+            'domain': "[('id','=',%s)]" % res, 
             'name': 'Invoices',
             'view_type': 'form',
             'view_mode': 'tree,form',

From 46bb1ea51be702758d68a5f69db32c82dbccf9bd Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Mon, 21 Jun 2010 21:27:13 +0530
Subject: [PATCH 083/121] [IMP]: membership: usability improvement in
 membership module.

bzr revid: atp@tinyerp.co.in-20100621155713-1hs8du994l3at43r
---
 addons/membership/membership.py               |   6 +-
 addons/membership/report.moved/__init__.py    |  22 --
 .../report.moved/report_membership.py         | 175 -------------
 .../report.moved/report_membership_view.xml   | 211 ----------------
 addons/membership/report/report_membership.py | 124 +++-------
 .../report/report_membership_view.xml         | 233 +++++-------------
 .../membership/security/ir.model.access.csv   |   3 +-
 .../membership/test.moved/test_membership.yml | 115 ---------
 .../wizard/membership_invoice_view.xml        |   2 +-
 .../wizard/membership_unpaid_invoice_view.xml |   4 +-
 10 files changed, 110 insertions(+), 785 deletions(-)
 delete mode 100755 addons/membership/report.moved/__init__.py
 delete mode 100755 addons/membership/report.moved/report_membership.py
 delete mode 100755 addons/membership/report.moved/report_membership_view.xml
 delete mode 100644 addons/membership/test.moved/test_membership.yml

diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index ebcaf4cfb83..9ff1c5d5b93 100755
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -201,10 +201,10 @@ class membership_line(osv.osv):
     _name = 'membership.membership_line'
     _columns = {
             'partner': fields.many2one('res.partner', 'Partner', ondelete='cascade', select=1),
-            'date_from': fields.date('From'),
-            'date_to': fields.date('To'),
+            'date_from': fields.date('From', readonly=True),
+            'date_to': fields.date('To', readonly=True),
             'date_cancel' : fields.date('Cancel date'),
-            'account_invoice_line': fields.many2one('account.invoice.line', 'Account Invoice line'),
+            'account_invoice_line': fields.many2one('account.invoice.line', 'Account Invoice line', readonly=True),
             'state': fields.function(_state, method=True, string='State', type='selection', selection=STATE),
             }
     _rec_name = 'partner'
diff --git a/addons/membership/report.moved/__init__.py b/addons/membership/report.moved/__init__.py
deleted file mode 100755
index dd247c52f3a..00000000000
--- a/addons/membership/report.moved/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import report_membership
diff --git a/addons/membership/report.moved/report_membership.py b/addons/membership/report.moved/report_membership.py
deleted file mode 100755
index 50273fbace4..00000000000
--- a/addons/membership/report.moved/report_membership.py
+++ /dev/null
@@ -1,175 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-from osv import fields, osv
-import tools
-
-
-class ReportPartnerMemberYear(osv.osv):
-    '''Membership by Years'''
-
-    _name = 'report.partner_member.year'
-    _description = __doc__
-    _auto = False
-    _rec_name = 'year'
-    _columns = {
-        'year': fields.char('Year', size='4', readonly=True, select=1),
-        'canceled_number': fields.integer('Canceled', readonly=True),
-        'waiting_number': fields.integer('Waiting', readonly=True),
-        'invoiced_number': fields.integer('Invoiced', readonly=True),
-        'paid_number': fields.integer('Paid', readonly=True),
-        'canceled_amount': fields.float('Canceled', digits=(16, 2), readonly=True),
-        'waiting_amount': fields.float('Waiting', digits=(16, 2), readonly=True),
-        'invoiced_amount': fields.float('Invoiced', digits=(16, 2), readonly=True),
-        'paid_amount': fields.float('Paid', digits=(16, 2), readonly=True),
-        'currency': fields.many2one('res.currency', 'Currency', readonly=True,
-            select=2),
-    }
-
-    def init(self, cr):
-        '''Create the view'''
-        cr.execute("""
-    CREATE OR REPLACE VIEW report_partner_member_year AS (
-        SELECT
-        MIN(id) AS id,
-        COUNT(ncanceled) as canceled_number,
-        COUNT(npaid) as paid_number,
-        COUNT(ninvoiced) as invoiced_number,
-        COUNT(nwaiting) as waiting_number,
-        SUM(acanceled) as canceled_amount,
-        SUM(apaid) as paid_amount,
-        SUM(ainvoiced) as invoiced_amount,
-        SUM(awaiting) as waiting_amount,
-        year,
-        currency
-        FROM (SELECT
-            CASE WHEN ai.state = 'cancel' THEN ml.id END AS ncanceled,
-            CASE WHEN ai.state = 'paid' THEN ml.id END AS npaid,
-            CASE WHEN ai.state = 'open' THEN ml.id END AS ninvoiced,
-            CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
-                THEN ml.id END AS nwaiting,
-            CASE WHEN ai.state = 'cancel'
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS acanceled,
-            CASE WHEN ai.state = 'paid'
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS apaid,
-            CASE WHEN ai.state = 'open'
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS ainvoiced,
-            CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS awaiting,
-            TO_CHAR(ml.date_from, 'YYYY') AS year,
-            ai.currency_id AS currency,
-            MIN(ml.id) AS id
-            FROM membership_membership_line ml
-            JOIN (account_invoice_line ail
-                LEFT JOIN account_invoice ai
-                ON (ail.invoice_id = ai.id))
-            ON (ml.account_invoice_line = ail.id)
-            JOIN res_partner p
-            ON (ml.partner = p.id)
-            GROUP BY TO_CHAR(ml.date_from, 'YYYY'), ai.state,
-            ai.currency_id, ml.id) AS foo
-        GROUP BY year, currency)
-                """)
-ReportPartnerMemberYear()
-
-class ReportPartnerMemberYearNew(osv.osv):
-    '''New Membership by Years'''
-
-    _name = 'report.partner_member.year_new'
-    _description = __doc__
-    _auto = False
-    _rec_name = 'year'
-    _columns = {
-        'year': fields.char('Year', size='4', readonly=True, select=1),
-        'canceled_number': fields.integer('Canceled', readonly=True),
-        'waiting_number': fields.integer('Waiting', readonly=True),
-        'invoiced_number': fields.integer('Invoiced', readonly=True),
-        'paid_number': fields.integer('Paid', readonly=True),
-        'canceled_amount': fields.float('Canceled', digits=(16, 2), readonly=True),
-        'waiting_amount': fields.float('Waiting', digits=(16, 2), readonly=True),
-        'invoiced_amount': fields.float('Invoiced', digits=(16, 2), readonly=True),
-        'paid_amount': fields.float('Paid', digits=(16, 2), readonly=True),
-        'currency': fields.many2one('res.currency', 'Currency', readonly=True,
-            select=2),
-    }
-
-    def init(self, cursor):
-        '''Create the view'''
-        cursor.execute("""
-        CREATE OR REPLACE VIEW report_partner_member_year_new AS (
-        SELECT
-        MIN(id) AS id,
-        COUNT(ncanceled) AS canceled_number,
-        COUNT(npaid) AS paid_number,
-        COUNT(ninvoiced) AS invoiced_number,
-        COUNT(nwaiting) AS waiting_number,
-        SUM(acanceled) AS canceled_amount,
-        SUM(apaid) AS paid_amount,
-        SUM(ainvoiced) AS invoiced_amount,
-        SUM(awaiting) AS waiting_amount,
-        year,
-        currency
-        FROM (SELECT
-            CASE WHEN ai.state = 'cancel' THEN ml2.id END AS ncanceled,
-            CASE WHEN ai.state = 'paid' THEN ml2.id END AS npaid,
-            CASE WHEN ai.state = 'open' THEN ml2.id END AS ninvoiced,
-            CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
-                THEN ml2.id END AS nwaiting,
-            CASE WHEN ai.state = 'cancel'
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS acanceled,
-            CASE WHEN ai.state = 'paid'
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS apaid,
-            CASE WHEN ai.state = 'open'
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS ainvoiced,
-            CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS awaiting,
-            TO_CHAR(ml2.date_from, 'YYYY') AS year,
-            ai.currency_id AS currency,
-            MIN(ml2.id) AS id
-            FROM (SELECT
-                    partner AS id,
-                    MIN(date_from) AS date_from
-                    FROM membership_membership_line
-                    GROUP BY partner
-                ) AS ml1
-                JOIN membership_membership_line ml2
-                JOIN (account_invoice_line ail
-                    LEFT JOIN account_invoice ai
-                    ON (ail.invoice_id = ai.id))
-                ON (ml2.account_invoice_line = ail.id)
-                ON (ml1.id = ml2.partner AND ml1.date_from = ml2.date_from)
-            JOIN res_partner p
-            ON (ml2.partner = p.id)
-            GROUP BY TO_CHAR(ml2.date_from, 'YYYY'), ai.state,
-            ai.currency_id, ml2.id) AS foo
-        GROUP BY year, currency
-        )
-    """)
-
-ReportPartnerMemberYearNew()
\ No newline at end of file
diff --git a/addons/membership/report.moved/report_membership_view.xml b/addons/membership/report.moved/report_membership_view.xml
deleted file mode 100755
index 6f15636847b..00000000000
--- a/addons/membership/report.moved/report_membership_view.xml
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-        <!-- REPORTING/MEMBERSHIP BY YEAR  -->
-
-
-        <record model="ir.ui.view" id="view_report_partner_member_year_tree1">
-            <field name="name">report.partner_member.year.tree</field>
-            <field name="model">report.partner_member.year</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Membership by Years">
-                    <field name="canceled_number"/>
-                    <field name="waiting_number"/>
-                    <field name="invoiced_number"/>
-                    <field name="paid_number"/>
-                    <field name="year"/>
-                </tree>
-            </field>
-        </record>
-
-
-        <record model="ir.ui.view" id="view_report_partner_member_year_tree2">
-            <field name="name">report.partner_member.year.tree</field>
-            <field name="model">report.partner_member.year</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Membership by Years">
-                    <field name="canceled_amount"/>
-                    <field name="waiting_amount"/>
-                    <field name="invoiced_amount"/>
-                    <field name="paid_amount"/>
-                    <field name="currency"/>
-                    <field name="year"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_report_partner_member_year_graph1">
-            <field name="name">report.partner_member.year.graph1</field>
-            <field name="model">report.partner_member.year</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Membership by Years" type="bar">
-                    <field name="year"/>
-                    <field name="canceled_number"/>
-                    <field name="waiting_number"/>
-                    <field name="invoiced_number"/>
-                    <field name="paid_number"/>
-                </graph>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_report_partner_member_year_graph2">
-            <field name="name">report.partner_member.year.graph2</field>
-            <field name="model">report.partner_member.year</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Membership by Years" type="bar">
-                    <field name="year"/>
-                    <field name="canceled_amount"/>
-                    <field name="waiting_amount"/>
-                    <field name="invoiced_amount"/>
-                    <field name="paid_amount"/>
-                </graph>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_report_partner_member_year_tree">
-            <field name="res_model">report.partner_member.year</field>
-            <field name="view_type">form</field>
-        </record>
-
-        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_tree_view1">
-            <field name="sequence" eval="3"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_report_partner_member_year_tree1"/>
-            <field name="act_window_id" ref="action_report_partner_member_year_tree"/>
-        </record>
-
-
-        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_tree_view4">
-            <field name="sequence" eval="4"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_report_partner_member_year_tree2"/>
-            <field name="act_window_id" ref="action_report_partner_member_year_tree"/>
-        </record>
-
-        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_tree_view2">
-            <field name="sequence" eval="1"/>
-            <field name="view_mode">graph</field>
-            <field name="view_id" ref="view_report_partner_member_year_graph1"/>
-            <field name="act_window_id" ref="action_report_partner_member_year_tree"/>
-        </record>
-
-        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_tree_view3">
-            <field name="sequence" eval="2"/>
-            <field name="view_mode">graph</field>
-            <field name="view_id" ref="view_report_partner_member_year_graph2"/>
-            <field name="act_window_id" ref="action_report_partner_member_year_tree"/>
-        </record>
-
-        <menuitem name="Membership by Years" parent="menu_reporting"
-            action="action_report_partner_member_year_tree"
-            id="menu_report_partner_member_year"/>
-
-
-        <!-- REPORTING/NEW MEMBERSHIP BY YEAR  -->
-
-
-
-        <record model="ir.ui.view" id="view_report_partner_member_year_new_tree1">
-            <field name="name">report.partner_member.year_new.tree</field>
-            <field name="model">report.partner_member.year_new</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="New Membership by Years">
-                    <field name="canceled_number"/>
-                    <field name="waiting_number"/>
-                    <field name="invoiced_number"/>
-                    <field name="paid_number"/>
-                    <field name="year"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_report_partner_member_year_new_tree2">
-            <field name="name">report.partner_member.year_new.tree</field>
-            <field name="model">report.partner_member.year_new</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="New Membership by Years">
-                    <field name="canceled_amount"/>
-                    <field name="waiting_amount"/>
-                    <field name="invoiced_amount"/>
-                    <field name="paid_amount"/>
-                    <field name="currency"/>
-                    <field name="year"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_report_partner_member_year_new_graph1">
-            <field name="name">report.partner_member.year_new.graph1</field>
-            <field name="model">report.partner_member.year_new</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="New Membership by Years" type="bar">
-                    <field name="year"/>
-                    <field name="canceled_number"/>
-                    <field name="waiting_number"/>
-                    <field name="invoiced_number"/>
-                    <field name="paid_number"/>
-                </graph>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_report_partner_member_year_new_graph2">
-            <field name="name">report.partner_member.year_new.graph2</field>
-            <field name="model">report.partner_member.year_new</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="New Membership by Years" type="bar">
-                    <field name="year"/>
-                    <field name="canceled_amount"/>
-                    <field name="waiting_amount"/>
-                    <field name="invoiced_amount"/>
-                    <field name="paid_amount"/>
-                </graph>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_report_partner_member_year_new_tree">
-            <field name="res_model">report.partner_member.year_new</field>
-            <field name="view_type">form</field>
-        </record>
-
-        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_new_tree_view4">
-            <field name="sequence" eval="4"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_report_partner_member_year_new_tree2"/>
-            <field name="act_window_id" ref="action_report_partner_member_year_new_tree"/>
-        </record>
-
-        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_new_tree_view1">
-            <field name="sequence" eval="3"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_report_partner_member_year_new_tree1"/>
-            <field name="act_window_id" ref="action_report_partner_member_year_new_tree"/>
-        </record>
-
-        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_new_tree_view2">
-            <field name="sequence" eval="1"/>
-            <field name="view_mode">graph</field>
-            <field name="view_id" ref="view_report_partner_member_year_new_graph1"/>
-            <field name="act_window_id" ref="action_report_partner_member_year_new_tree"/>
-        </record>
-
-        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_new_tree_view3">
-            <field name="sequence" eval="2"/>
-            <field name="view_mode">graph</field>
-            <field name="view_id" ref="view_report_partner_member_year_new_graph2"/>
-            <field name="act_window_id" ref="action_report_partner_member_year_new_tree"/>
-        </record>
-
-        <menuitem name="New Membership by Years" parent="menu_reporting"
-            action="action_report_partner_member_year_new_tree"
-            id="menu_report_partner_member_year_new"/>
-
-    </data>
-</openerp>            
\ No newline at end of file
diff --git a/addons/membership/report/report_membership.py b/addons/membership/report/report_membership.py
index 50273fbace4..cd0142f5604 100644
--- a/addons/membership/report/report_membership.py
+++ b/addons/membership/report/report_membership.py
@@ -23,15 +23,22 @@ from osv import fields, osv
 import tools
 
 
-class ReportPartnerMemberYear(osv.osv):
+class report_membership(osv.osv):
     '''Membership by Years'''
 
-    _name = 'report.partner_member.year'
+    _name = 'report.membership'
     _description = __doc__
     _auto = False
     _rec_name = 'year'
     _columns = {
-        'year': fields.char('Year', size='4', readonly=True, select=1),
+        'year': fields.char('Year', size=4, readonly=True, select=1),
+        'month':fields.selection([('01', 'January'), ('02', 'February'), \
+                                  ('03', 'March'), ('04', 'April'),\
+                                  ('05', 'May'), ('06', 'June'), \
+                                  ('07', 'July'), ('08', 'August'),\
+                                  ('09', 'September'), ('10', 'October'),\
+                                  ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
+        'create_date': fields.datetime('Create Date', readonly=True),                          
         'canceled_number': fields.integer('Canceled', readonly=True),
         'waiting_number': fields.integer('Waiting', readonly=True),
         'invoiced_number': fields.integer('Invoiced', readonly=True),
@@ -42,14 +49,23 @@ class ReportPartnerMemberYear(osv.osv):
         'paid_amount': fields.float('Paid', digits=(16, 2), readonly=True),
         'currency': fields.many2one('res.currency', 'Currency', readonly=True,
             select=2),
-    }
+            
+        'state':fields.selection([('draft', 'Non Member'),
+                                  ('cancel', 'Cancelled Member'),
+                                    ('done', 'Old Member'),
+                                   ('open', 'Invoiced Member'),
+                                    ('free', 'Free Member'), ('paid', 'Paid Member')], 'State'),
+        'partner_id': fields.many2one('res.partner', 'Members', readonly=True, select=3) 
+                
+
+}
 
     def init(self, cr):
         '''Create the view'''
         cr.execute("""
-    CREATE OR REPLACE VIEW report_partner_member_year AS (
+    CREATE OR REPLACE VIEW report_membership AS (
         SELECT
-        MIN(id) AS id,
+        MIN(id) as id,
         COUNT(ncanceled) as canceled_number,
         COUNT(npaid) as paid_number,
         COUNT(ninvoiced) as invoiced_number,
@@ -59,7 +75,12 @@ class ReportPartnerMemberYear(osv.osv):
         SUM(ainvoiced) as invoiced_amount,
         SUM(awaiting) as waiting_amount,
         year,
+        month,
+        create_date,
+        partner_id,
+        state,
         currency
+        
         FROM (SELECT
             CASE WHEN ai.state = 'cancel' THEN ml.id END AS ncanceled,
             CASE WHEN ai.state = 'paid' THEN ml.id END AS npaid,
@@ -79,7 +100,11 @@ class ReportPartnerMemberYear(osv.osv):
                 THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
             ELSE 0 END AS awaiting,
             TO_CHAR(ml.date_from, 'YYYY') AS year,
+            TO_CHAR(ml.date_from, 'MM')as month,
+            TO_CHAR(ml.date_from, 'YYYY-MM-DD') as create_date,
+            ai.partner_id AS partner_id,
             ai.currency_id AS currency,
+            ai.state as state,
             MIN(ml.id) AS id
             FROM membership_membership_line ml
             JOIN (account_invoice_line ail
@@ -88,88 +113,11 @@ class ReportPartnerMemberYear(osv.osv):
             ON (ml.account_invoice_line = ail.id)
             JOIN res_partner p
             ON (ml.partner = p.id)
-            GROUP BY TO_CHAR(ml.date_from, 'YYYY'), ai.state,
+            GROUP BY TO_CHAR(ml.date_from, 'YYYY'),  TO_CHAR(ml.date_from, 'MM'), TO_CHAR(ml.date_from, 'YYYY-MM-DD'), ai.state, ai.partner_id,
             ai.currency_id, ml.id) AS foo
-        GROUP BY year, currency)
+        GROUP BY year, month, create_date, currency, partner_id, state)
                 """)
-ReportPartnerMemberYear()
+        
+report_membership()
 
-class ReportPartnerMemberYearNew(osv.osv):
-    '''New Membership by Years'''
-
-    _name = 'report.partner_member.year_new'
-    _description = __doc__
-    _auto = False
-    _rec_name = 'year'
-    _columns = {
-        'year': fields.char('Year', size='4', readonly=True, select=1),
-        'canceled_number': fields.integer('Canceled', readonly=True),
-        'waiting_number': fields.integer('Waiting', readonly=True),
-        'invoiced_number': fields.integer('Invoiced', readonly=True),
-        'paid_number': fields.integer('Paid', readonly=True),
-        'canceled_amount': fields.float('Canceled', digits=(16, 2), readonly=True),
-        'waiting_amount': fields.float('Waiting', digits=(16, 2), readonly=True),
-        'invoiced_amount': fields.float('Invoiced', digits=(16, 2), readonly=True),
-        'paid_amount': fields.float('Paid', digits=(16, 2), readonly=True),
-        'currency': fields.many2one('res.currency', 'Currency', readonly=True,
-            select=2),
-    }
-
-    def init(self, cursor):
-        '''Create the view'''
-        cursor.execute("""
-        CREATE OR REPLACE VIEW report_partner_member_year_new AS (
-        SELECT
-        MIN(id) AS id,
-        COUNT(ncanceled) AS canceled_number,
-        COUNT(npaid) AS paid_number,
-        COUNT(ninvoiced) AS invoiced_number,
-        COUNT(nwaiting) AS waiting_number,
-        SUM(acanceled) AS canceled_amount,
-        SUM(apaid) AS paid_amount,
-        SUM(ainvoiced) AS invoiced_amount,
-        SUM(awaiting) AS waiting_amount,
-        year,
-        currency
-        FROM (SELECT
-            CASE WHEN ai.state = 'cancel' THEN ml2.id END AS ncanceled,
-            CASE WHEN ai.state = 'paid' THEN ml2.id END AS npaid,
-            CASE WHEN ai.state = 'open' THEN ml2.id END AS ninvoiced,
-            CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
-                THEN ml2.id END AS nwaiting,
-            CASE WHEN ai.state = 'cancel'
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS acanceled,
-            CASE WHEN ai.state = 'paid'
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS apaid,
-            CASE WHEN ai.state = 'open'
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS ainvoiced,
-            CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS awaiting,
-            TO_CHAR(ml2.date_from, 'YYYY') AS year,
-            ai.currency_id AS currency,
-            MIN(ml2.id) AS id
-            FROM (SELECT
-                    partner AS id,
-                    MIN(date_from) AS date_from
-                    FROM membership_membership_line
-                    GROUP BY partner
-                ) AS ml1
-                JOIN membership_membership_line ml2
-                JOIN (account_invoice_line ail
-                    LEFT JOIN account_invoice ai
-                    ON (ail.invoice_id = ai.id))
-                ON (ml2.account_invoice_line = ail.id)
-                ON (ml1.id = ml2.partner AND ml1.date_from = ml2.date_from)
-            JOIN res_partner p
-            ON (ml2.partner = p.id)
-            GROUP BY TO_CHAR(ml2.date_from, 'YYYY'), ai.state,
-            ai.currency_id, ml2.id) AS foo
-        GROUP BY year, currency
-        )
-    """)
-
-ReportPartnerMemberYearNew()
\ No newline at end of file
+#
\ No newline at end of file
diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml
index 6f15636847b..76c0dff4404 100644
--- a/addons/membership/report/report_membership_view.xml
+++ b/addons/membership/report/report_membership_view.xml
@@ -4,44 +4,75 @@
         <!-- REPORTING/MEMBERSHIP BY YEAR  -->
 
 
-        <record model="ir.ui.view" id="view_report_partner_member_year_tree1">
-            <field name="name">report.partner_member.year.tree</field>
-            <field name="model">report.partner_member.year</field>
+        <record model="ir.ui.view" id="view_report_membership_tree1">
+            <field name="name">report.membership.tree</field>
+            <field name="model">report.membership</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Membership by Years">
+                <tree string="Membership">
+                    <field name="state"/>
+                    <field name="partner_id"/>
                     <field name="canceled_number"/>
                     <field name="waiting_number"/>
                     <field name="invoiced_number"/>
                     <field name="paid_number"/>
                     <field name="year"/>
+                    <field name="month"/>
                 </tree>
             </field>
         </record>
 
-
-        <record model="ir.ui.view" id="view_report_partner_member_year_tree2">
-            <field name="name">report.partner_member.year.tree</field>
-            <field name="model">report.partner_member.year</field>
-            <field name="type">tree</field>
+        <record model="ir.ui.view" id="view_report_membership_search">
+            <field name="name">report.membership.search</field>
+            <field name="model">report.membership</field>
+            <field name="type">search</field>
             <field name="arch" type="xml">
-                <tree string="Membership by Years">
-                    <field name="canceled_amount"/>
-                    <field name="waiting_amount"/>
-                    <field name="invoiced_amount"/>
-                    <field name="paid_amount"/>
-                    <field name="currency"/>
-                    <field name="year"/>
-                </tree>
+                <search string="Membership">
+                    <group col="8" colspan="4">
+                        <filter string="Last 365 Days" icon="terp-go-year"
+                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
+                        <filter string="Last 30 Days" icon="terp-go-month" name="month"
+                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
+                        <separator orientation="vertical"/>
+		                <filter icon="terp-camera_test"
+		                    string="Invoiced"
+		                    domain="[('state','=','open')]"/>
+		                <filter icon="terp-check"
+                            string="Paid"
+                            domain="[('state','=','paid')]"/>
+                        <filter icon="terp-gtk-media-pause"
+                            string="Waiting"
+                            default="1" name="none"
+                            domain="[('state','=', 'draft')]"/>
+    
+                        <separator orientation="vertical"/>
+                        <field name="partner_id"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By..." colspan="4" col="12">
+                        <filter string="Members" icon="terp-personal" name="member"
+                            domain="[]" context="{'group_by':'partner_id'}"/>
+                            
+                       <filter string="state" icon="terp-stock_effects-object-colorize"
+                            domain="[]" context="{'group_by':'state'}"/>
+                                      
+                        <separator orientation="vertical"/>       
+                        <filter string="Year" name="year" icon="terp-go-year"
+                            domain="[]" context="{'group_by':'year'}"/>
+                        <filter string="Month" name="month" icon="terp-go-month"
+                            domain="[]" context="{'group_by':'month'}"/>    
+
+                    </group>
+                </search>
             </field>
         </record>
-
-        <record model="ir.ui.view" id="view_report_partner_member_year_graph1">
-            <field name="name">report.partner_member.year.graph1</field>
-            <field name="model">report.partner_member.year</field>
+        
+        <record model="ir.ui.view" id="view_report_membership_graph1">
+            <field name="name">report.membership.graph1</field>
+            <field name="model">report.membership</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
-                <graph string="Membership by Years" type="bar">
+                <graph string="Membership" type="bar">
                     <field name="year"/>
                     <field name="canceled_number"/>
                     <field name="waiting_number"/>
@@ -51,161 +82,31 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="view_report_partner_member_year_graph2">
-            <field name="name">report.partner_member.year.graph2</field>
-            <field name="model">report.partner_member.year</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Membership by Years" type="bar">
-                    <field name="year"/>
-                    <field name="canceled_amount"/>
-                    <field name="waiting_amount"/>
-                    <field name="invoiced_amount"/>
-                    <field name="paid_amount"/>
-                </graph>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_report_partner_member_year_tree">
-            <field name="res_model">report.partner_member.year</field>
+        <record model="ir.actions.act_window" id="action_report_membership_tree">
+            <field name="res_model">report.membership</field>
             <field name="view_type">form</field>
+            <field name="search_view_id" ref="view_report_membership_search"/>
+            <field name="context">{"search_default_member":1}</field>
         </record>
 
-        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_tree_view1">
-            <field name="sequence" eval="3"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_report_partner_member_year_tree1"/>
-            <field name="act_window_id" ref="action_report_partner_member_year_tree"/>
-        </record>
-
-
-        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_tree_view4">
-            <field name="sequence" eval="4"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_report_partner_member_year_tree2"/>
-            <field name="act_window_id" ref="action_report_partner_member_year_tree"/>
-        </record>
-
-        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_tree_view2">
+        <record model="ir.actions.act_window.view" id="action_report_membership_tree_view1">
             <field name="sequence" eval="1"/>
-            <field name="view_mode">graph</field>
-            <field name="view_id" ref="view_report_partner_member_year_graph1"/>
-            <field name="act_window_id" ref="action_report_partner_member_year_tree"/>
-        </record>
-
-        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_tree_view3">
-            <field name="sequence" eval="2"/>
-            <field name="view_mode">graph</field>
-            <field name="view_id" ref="view_report_partner_member_year_graph2"/>
-            <field name="act_window_id" ref="action_report_partner_member_year_tree"/>
-        </record>
-
-        <menuitem name="Membership by Years" parent="menu_reporting"
-            action="action_report_partner_member_year_tree"
-            id="menu_report_partner_member_year"/>
-
-
-        <!-- REPORTING/NEW MEMBERSHIP BY YEAR  -->
-
-
-
-        <record model="ir.ui.view" id="view_report_partner_member_year_new_tree1">
-            <field name="name">report.partner_member.year_new.tree</field>
-            <field name="model">report.partner_member.year_new</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="New Membership by Years">
-                    <field name="canceled_number"/>
-                    <field name="waiting_number"/>
-                    <field name="invoiced_number"/>
-                    <field name="paid_number"/>
-                    <field name="year"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_report_partner_member_year_new_tree2">
-            <field name="name">report.partner_member.year_new.tree</field>
-            <field name="model">report.partner_member.year_new</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="New Membership by Years">
-                    <field name="canceled_amount"/>
-                    <field name="waiting_amount"/>
-                    <field name="invoiced_amount"/>
-                    <field name="paid_amount"/>
-                    <field name="currency"/>
-                    <field name="year"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_report_partner_member_year_new_graph1">
-            <field name="name">report.partner_member.year_new.graph1</field>
-            <field name="model">report.partner_member.year_new</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="New Membership by Years" type="bar">
-                    <field name="year"/>
-                    <field name="canceled_number"/>
-                    <field name="waiting_number"/>
-                    <field name="invoiced_number"/>
-                    <field name="paid_number"/>
-                </graph>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_report_partner_member_year_new_graph2">
-            <field name="name">report.partner_member.year_new.graph2</field>
-            <field name="model">report.partner_member.year_new</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="New Membership by Years" type="bar">
-                    <field name="year"/>
-                    <field name="canceled_amount"/>
-                    <field name="waiting_amount"/>
-                    <field name="invoiced_amount"/>
-                    <field name="paid_amount"/>
-                </graph>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_report_partner_member_year_new_tree">
-            <field name="res_model">report.partner_member.year_new</field>
-            <field name="view_type">form</field>
-        </record>
-
-        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_new_tree_view4">
-            <field name="sequence" eval="4"/>
             <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_report_partner_member_year_new_tree2"/>
-            <field name="act_window_id" ref="action_report_partner_member_year_new_tree"/>
+            <field name="view_id" ref="view_report_membership_tree1"/>
+            <field name="act_window_id" ref="action_report_membership_tree"/>
         </record>
 
-        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_new_tree_view1">
+
+        <record model="ir.actions.act_window.view" id="action_report_membership_tree_view2">
             <field name="sequence" eval="3"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_report_partner_member_year_new_tree1"/>
-            <field name="act_window_id" ref="action_report_partner_member_year_new_tree"/>
-        </record>
-
-        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_new_tree_view2">
-            <field name="sequence" eval="1"/>
             <field name="view_mode">graph</field>
-            <field name="view_id" ref="view_report_partner_member_year_new_graph1"/>
-            <field name="act_window_id" ref="action_report_partner_member_year_new_tree"/>
+            <field name="view_id" ref="view_report_membership_graph1"/>
+            <field name="act_window_id" ref="action_report_membership_tree"/>
         </record>
 
-        <record model="ir.actions.act_window.view" id="action_report_partner_member_year_new_tree_view3">
-            <field name="sequence" eval="2"/>
-            <field name="view_mode">graph</field>
-            <field name="view_id" ref="view_report_partner_member_year_new_graph2"/>
-            <field name="act_window_id" ref="action_report_partner_member_year_new_tree"/>
-        </record>
-
-        <menuitem name="New Membership by Years" parent="menu_reporting"
-            action="action_report_partner_member_year_new_tree"
-            id="menu_report_partner_member_year_new"/>
+        <menuitem name="Membership" parent="menu_reporting"
+            action="action_report_membership_tree"
+            id="menu_report_membership"/>
 
     </data>
 </openerp>            
\ No newline at end of file
diff --git a/addons/membership/security/ir.model.access.csv b/addons/membership/security/ir.model.access.csv
index cb722db567a..9f2d1681b0f 100755
--- a/addons/membership/security/ir.model.access.csv
+++ b/addons/membership/security/ir.model.access.csv
@@ -1,7 +1,6 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_membership_membership_line_partner_manager","membership.membership_line partner_manager","model_membership_membership_line","base.group_partner_manager",1,1,1,1
 "access_membership_membership_line","membership.membership_line","model_membership_membership_line",,1,0,0,0
-"access_report_partner_member_year","report.partner_member.year","model_report_partner_member_year","base.group_partner_manager",1,0,0,0
-"access_report_partner_member_year_new","report.partner_member.year_new","model_report_partner_member_year_new","base.group_partner_manager",1,0,0,0
+"access_report_membership","report.membership","model_report_membership","base.group_partner_manager",1,0,0,0
 "access_membership_invoice","membership.invoice","model_membership_invoice",,1,1,1,1
 "access_membership_unpaid_invoice","membership.unpaid.invoice","model_membership_unpaid_invoice",,1,0,0,0
diff --git a/addons/membership/test.moved/test_membership.yml b/addons/membership/test.moved/test_membership.yml
deleted file mode 100644
index 5a67ea7f476..00000000000
--- a/addons/membership/test.moved/test_membership.yml
+++ /dev/null
@@ -1,115 +0,0 @@
-- |  
-  In Order to test the Membership in OpenERP, which allows us to manage all operations for managing memberships.
-- |
-  We have to create "Membership Products" to make it available for partner or customer to make membership with it.
-  select product type   to "service" type and membership field is ticked to visible this product while creating membership for the partner.
-- 
-  !record {model: product.product, id: product_product_membershipproduct0}:
-    categ_id: product.cat1
-    membership: 1
-    membership_date_from: '2009-06-01'
-    membership_date_to: '2010-06-01'
-    name: Membership Products
-    type: service
-    list_price: 80.00
-    
-- |
-  I create new member "Mark Johnson" and I provide an address to this
-  new customer, as well as an email "info@mycustomer.com".
-- 
-  !record {model: res.partner, id: res_partner_markjohnson0}:
-    address:
-      - city: paris
-        country_id: base.fr
-        name: Arthur Grosbonnet
-        street: 1 rue Rockfeller
-        title: M.
-        type: default
-        zip: '75016'
-    credit_limit: 0.0
-    membership_amount: 0.0
-    name: Mark Johnson
-    property_account_payable: account.a_pay
-    property_account_receivable: account.a_recv
-
-- |
-  I check that "Current membership state" is set to "Non Member". 
-- 
-  !assert {model: res.partner, id: res_partner_markjohnson0}:
-      - membership_state == 'none'
-- |  
-  I can make it a Free member by selecting the "Free member" check box.
-- 
-  !record {model: res.partner, id: membership.res_partner_markjohnson0}:
-    free_member: 1
-- |
-  Now, I create Membership Invoices using wizard available on partner and  Select Membership Product.
-- 
-  !record {model: membership.invoice, id: membership_invoice_0}:
-    product_id: membership.product_product_membershipproduct0
-- |
-  I check that address is  defined or not  for this Member.   
-- 
-  !python {model: membership.invoice}: |
-      partner_ids = [ref('res_partner_markjohnson0')]
-      addre_obj = self.pool.get('res.partner.address')
-      ids = addre_obj.search(cr, uid, [('partner_id', '=', partner_ids)])
-         
-      addre_id = addre_obj.browse(cr, uid, ids)[0]
-      assert addre_id.partner_id
-      assert addre_id.id
-      assert addre_id.type    
-    
-- |
-  I click on "Confirm" button of this wizard. 
-- 
-  !python {model: membership.invoice}: |
-    self.membership_invoice(cr, uid, [ref("membership_invoice_0")], {"active_ids": [ref("membership.res_partner_markjohnson0")]})
-
-- |
-  I check that Invoice is created for this members.
--
-  !python {model: res.partner}: |
-        invoice_obj = self.pool.get('account.invoice')
-        partner_obj = self.pool.get('res.partner')
-        product_obj = self.pool.get('product.product')
-        invoice_line_obj = self.pool.get(('account.invoice.line'))
-        
-        partner_id = self.browse(cr, uid, [ref('res_partner_markjohnson0')])[0]
-        ids = invoice_obj.search(cr, uid, [('partner_id', '=', partner_id.id), ('account_id', '=', partner_id.property_account_receivable.id)])
-        invoice_id = invoice_obj.browse(cr, uid, ids)[0]
-        
-        product = product_obj.browse(cr, uid, [ref('product_product_membershipproduct0')], context=context)[0]        
-        line_ids = invoice_line_obj.search(cr, uid, [('product_id', '=', product.id), ('invoice_id', '=', invoice_id.id)])
-        line_id = invoice_line_obj.browse(cr, uid, line_ids)[0]
-         
-        assert line_id.product_id.id == product.id
-        assert  invoice_id.partner_id.id == partner_id.id
-         
-- |
-  I check that the "Current membership state" will remain same untill opening the invoice.
--
-  !assert {model: res.partner, id: res_partner_markjohnson0}:
-     - membership_state == 'free'  
-  
-- |
-  "Current membership state" of any member depends on the state of invoice.
-  So, I check that  invoice is in draft state then the "membership state" of a member is "Waiting member".
--
-  !python {model: membership.membership_line}: |
-        partner_id = self.pool.get('res.partner').browse(cr, uid, [ref('res_partner_markjohnson0')])[0]
-        ids = self.search(cr, uid, [('partner', '=', partner_id.id)])
-        current_id = self.browse(cr, uid, ids)[0]
-              
-        partner_obj = self.pool.get('res.partner')
-        inv_obj = self.pool.get('account.invoice')
-        
-        ids = inv_obj.search(cr, uid, [('partner_id', '=', partner_id.id), ('account_id', '=', partner_id.property_account_receivable.id)])
-        inv_id = inv_obj.browse(cr, uid, ids)[0]
-        if inv_id.state == 'draft':
-            assert current_id == 'waiting'
-- |
-  When the invoice is in open state it become Invoiced Member, When the invoice is in paid state the same "Current membership state" changed to Paid Member. 
-  Now, If we cancel the invoice "Current membership state" changed to Cancel Member.           
-            
-            
\ No newline at end of file
diff --git a/addons/membership/wizard/membership_invoice_view.xml b/addons/membership/wizard/membership_invoice_view.xml
index c18c53d6679..858ac50425c 100755
--- a/addons/membership/wizard/membership_invoice_view.xml
+++ b/addons/membership/wizard/membership_invoice_view.xml
@@ -12,7 +12,7 @@
                      	<field name="product_id" context="{'product':membership_product}" domain="[('membership','=',True)]"/>
                     </group>
                     <group colspan="4" col="6">
-                        <button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button  icon="gtk-close" special="cancel" string="Close"/>
            	            <button  icon="gtk-ok" string="Confirm" name="membership_invoice" type="object"/>
                     </group>
                 </form>
diff --git a/addons/membership/wizard/membership_unpaid_invoice_view.xml b/addons/membership/wizard/membership_unpaid_invoice_view.xml
index 52825386cb7..6b57c49572b 100755
--- a/addons/membership/wizard/membership_unpaid_invoice_view.xml
+++ b/addons/membership/wizard/membership_unpaid_invoice_view.xml
@@ -12,8 +12,8 @@
                            <field name="product" context="{'product':membership_product}" domain="[('membership','=',True)]"/>
                     </group>
                     <group colspan="4" col="6">
-                    	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
-           				<button  icon="gtk-ok" string="Unpaid Partners" name="_invoice_membership" type="object"/>
+                    	<button  icon="gtk-close" special="cancel" string="Close"/>
+           				<button  icon="gtk-ok" string="Unpaid Partners" name="invoice_membership" type="object"/>
                    </group>
                </form>
             </field>

From 8587b64f1707d45279447fe8d5fc10a3b49a9bdb Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Tue, 22 Jun 2010 13:17:52 +0530
Subject: [PATCH 084/121] [IMP]: event: Improvement in report

bzr revid: atp@tinyerp.co.in-20100622074752-lvvhz7ph8r75vx57
---
 .../report/report_event_registration_view.xml | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index d4674436faa..2931bc28aa8 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -29,13 +29,11 @@
             <field name="model">report.event.registration</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
-                <graph  string="Event on Registration" type="bar">
-                    <field name="type"/>
+                <graph orientation="horizontal" string="Event on Registration"  type="bar" >
+                    <field name="event_id"/>
                     <field name="draft_state" operator="+"/>
                     <field name="confirm_state" operator="+"/>
                     <field name="register_max" operator="+"/>
-                    <field group="True"  name="event_id" />
-                    
                 </graph>
             </field>
         </record>
@@ -99,7 +97,6 @@
                 </search>
             </field>
         </record>
-    
 
         <record  model="ir.actions.act_window" id="action_report_event_registration">
             <field name="name">Events On Registrations</field>
@@ -109,7 +106,21 @@
             <field name="search_view_id" ref="view_report_event_registration_search"/>
             <field name="context">{"search_default_user":1,"search_default_month":1,'group_by_no_leaf':1,'group_by':[]}</field>
         </record>
-       
+      
+      <record model="ir.actions.act_window.view" id="action_report_event_registration_tree">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="report_event_registration_tree"/>
+            <field name="act_window_id" ref="action_report_event_registration"/>
+       </record>
+
+       <record model="ir.actions.act_window.view" id="action_report_event_registration_graph">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="report_event_registration_graph"/>
+            <field name="act_window_id" ref="action_report_event_registration"/>
+       </record>
+
         <!--<menuitem parent="menu_report_event" action="action_event_registration" id="menu_report_event_registration"/>-->
         <menuitem parent="menu_report_event" action="action_report_event_registration" id="menu_report_event_registration" />
  

From 6be896b14bdd41e0cb40a96e41c9f2d9b418a34e Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Tue, 22 Jun 2010 16:30:23 +0530
Subject: [PATCH 085/121] [ADD]: event: add new group event/manager,
 event/subscriber.

bzr revid: atp@tinyerp.co.in-20100622110023-5w6fnbtiwqyq7f6u
---
 addons/event/security/event_security.xml  | 25 ++++++++++++++++-------
 addons/event/security/ir.model.access.csv | 18 ++++++++--------
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml
index e80f0eeae0c..6cf4adeb5b9 100755
--- a/addons/event/security/event_security.xml
+++ b/addons/event/security/event_security.xml
@@ -1,13 +1,24 @@
 <?xml version="1.0"?>
 <openerp>
-	<data>
-		<record id="menu_event_config" model="ir.ui.menu">
-			<field name="groups_id" eval="[(6,0,[ref('crm.group_crm_manager'), ref('base.group_extended')])]"/>
-		</record>
+	<data noupdate="0">
+	
+	
+    <record id="group_event_manager" model="res.groups">
+        <field name="name">EVENT / Manager</field>
+    </record>
+
+    <record id="group_event_subscriber" model="res.groups">
+        <field name="name">EVENT / Subscriber</field>
+    </record>
+    
+<!--		<record id="menu_event_config" model="ir.ui.menu">-->
+<!--			<field name="groups_id" eval="[(6,0,[ref('crm.group_crm_manager'), ref('base.group_extended')])]"/>-->
+<!--		</record>-->
+<!---->
+<!--		<record id="menu_report_event" model="ir.ui.menu">-->
+<!--			<field name="groups_id" eval="[(6,0,[ref('crm.group_crm_manager'), ref('base.group_extended')])]"/>-->
+<!--		</record>-->
 
-		<record id="menu_report_event" model="ir.ui.menu">
-			<field name="groups_id" eval="[(6,0,[ref('crm.group_crm_manager'), ref('base.group_extended')])]"/>
-		</record>
 	</data>
 </openerp>
 
diff --git a/addons/event/security/ir.model.access.csv b/addons/event/security/ir.model.access.csv
index ea7548c0a95..d1cb0865607 100755
--- a/addons/event/security/ir.model.access.csv
+++ b/addons/event/security/ir.model.access.csv
@@ -1,10 +1,10 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_event_type","event.type","model_event_type","crm.group_crm_user",1,0,0,0
-"access_event_type_manager","event.type manager","model_event_type","crm.group_crm_manager",1,1,1,1
-"access_event_event","event.event","model_event_event","crm.group_crm_user",1,1,1,1
-"access_event_registration","event.registration","model_event_registration","crm.group_crm_user",1,1,1,1
-"access_report_event_registration","report.event.registration","model_report_event_registration","crm.group_crm_user",1,0,0,0
-"access_event_confirm_registration","event.confirm.registration","model_event_confirm_registration","crm.group_crm_user",1,0,0,0
-"access_event_confirm_registration_manager","event.confirm.registration manager","model_event_confirm_registration","crm.group_crm_manager",1,1,1,1
-"access_event_make_invoice","event.make.invoice","model_event_make_invoice","crm.group_crm_user",1,1,1,1
-"access_event_partners_list","event.partners.list","model_event_partners_list","crm.group_crm_user",1,0,0,0
+"access_event_type","event.type","model_event_type","event.group_event_subscriber",1,0,0,0
+"access_event_type_manager","event.type manager","model_event_type","event.group_event_manager",1,1,1,1
+"access_event_event","event.event","model_event_event","event.group_event_subscriber",1,1,1,1
+"access_event_registration","event.registration","model_event_registration","event.group_event_subscriber",1,1,1,1
+"access_report_event_registration","report.event.registration","model_report_event_registration","event.group_event_subscriber",1,0,0,0
+"access_event_confirm_registration","event.confirm.registration","model_event_confirm_registration","event.group_event_subscriber",1,0,0,0
+"access_event_confirm_registration_manager","event.confirm.registration manager","model_event_confirm_registration","event.group_event_manager",1,1,1,1
+"access_event_make_invoice","event.make.invoice","model_event_make_invoice","event.group_event_subscriber",1,1,1,1
+"access_event_partners_list","event.partners.list","model_event_partners_list","event.group_event_subscriber",1,0,0,0

From 151819d2b0b39cbb7f8a17bd3d8c15da13a11b41 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Tue, 22 Jun 2010 16:37:52 +0530
Subject: [PATCH 086/121] [IMP]: event: Improvement for dashboard in
 board_association_view file.

bzr revid: atp@tinyerp.co.in-20100622110752-3lcg83tjyxf7e4o4
---
 addons/event/board_association_view.xml | 47 ++++++++++++++++++++-----
 addons/event/event_view.xml             | 17 +++++----
 2 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/addons/event/board_association_view.xml b/addons/event/board_association_view.xml
index a1d94c72b87..aba85e420d0 100644
--- a/addons/event/board_association_view.xml
+++ b/addons/event/board_association_view.xml
@@ -12,8 +12,38 @@
       	<action
                 string="New members"
                 name="%(membership.action_report_partner_member_year_tree)d"
-                view_mode="graph,tree" colspan="4"/>-->  
-                
+                view_mode="graph,tree" colspan="4"/>-->
+            
+        <record model ="ir.ui.view" id="view_report_event_reg_graph">
+            <field name="name">Registration Event report</field>
+            <field name="model">report.event.registration</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Event on Registration"  type="bar" >
+                    <field name="event_id"/>
+                    <field name="draft_state" operator="+"/>
+                    <field name="confirm_state" operator="+"/>
+                    <field name="register_max" operator="+"/>
+                </graph>
+            </field>
+        </record>     
+                  
+        <record  model="ir.actions.act_window" id="act_event_reg">
+            <field name="name">Events On Registrations</field>
+            <field name="res_model">report.event.registration</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_report_event_reg_graph"/>
+        </record>                
+
+       <record model="ir.actions.act_window" id="act_event_view">
+           <field name="name">Next Events</field>
+           <field name="type">ir.actions.act_window</field>
+           <field name="res_model">event.event</field>
+           <field name="view_type">form</field>
+           <field name="view_mode">tree,form</field>
+       </record>    
+               
         <record model="board.note.type" id="note_association_type">
             <field name="name">associations</field>
         </record>
@@ -27,7 +57,7 @@
                     <hpaned position="100">
                         <child1>
                             <action string="Next Events"
-                                name="%(event.action_event_registration_report)d"
+                                name="%(act_event_view)d"
                                 colspan="4"/>
                             <action
                                 string="Unpaid Invoices"
@@ -35,14 +65,13 @@
                                 colspan="4"
                                 domain="[('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','out_invoice')]"/>
                         </child1>
-
                         <child2>
-                            <action
-                                string="Registrations by Events"
-                                name="%(event.action_event_type_registration)d"
-                                view_mode="graph,tree"
-                                colspan="4"/>
+                            <action string="Register Events"
+                                name="%(act_event_reg)d"
+                                colspan="4"/>    
+                        
                         </child2>
+                        
                     </hpaned>
                 </form>
             </field>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index c58c1575d3b..3bc8ff14ff6 100755
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -47,7 +47,6 @@
         </record>
         <menuitem name="Events by Categories" id="menu_action_event_categories" action="action_event_categories" parent="menu_event_main"/>
 
-
     <!-- Events Organisation/CONFIGURATION/EVENTS -->
 
         <record model="ir.ui.view" id="view_event_form">
@@ -136,7 +135,7 @@
             <field name="arch" type="xml">
                 <search string="Events">
                     <group col="10" colspan="4">
-                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Events"/>
+                        <filter icon="terp-document-new" string="Draft" name="draft" domain="[('state','=','draft')]" help="Draft Events"/>
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed Events"/>
                         <separator orientation="vertical"/>
                         <field name="name" string="Event" select="1"/>
@@ -154,7 +153,7 @@
                         <filter string="Event Type" icon="terp-crm"  context="{'group_by':'type'}"/>
                         <filter string="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/> 
-                        <filter string="Responsible" name="user" icon="terp-personal" context="{'group_by': 'user_id'}"/>
+                        <filter string="Responsible"  icon="terp-personal" context="{'group_by': 'user_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Creation" icon="terp-go-month"
                             domain="[]" context="{'group_by':'date_begin'}"/>
@@ -171,7 +170,7 @@
            <field name="res_model">event.event</field>
            <field name="view_type">form</field>
            <field name="view_mode">tree,form</field>
-           <field name="context">{"search_default_user_id":uid}</field>
+           <field name="context">{"search_default_draft": "1"}</field>
            <field name="search_view_id" ref="view_event_search"/>
        </record>
        
@@ -190,7 +189,7 @@
 
         <!-- Registration view (form) by _inherits  .................. -->
         
-        <record model="ir.ui.view" id="event_registration_tree">
+        <record model="ir.ui.view" id="view_event_registration_tree">
             <field name="name">event.registration.tree</field>
             <field name="model">event.registration</field>
             <field name="type">tree</field>
@@ -206,7 +205,7 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="event_registration_form">
+        <record model="ir.ui.view" id="view_event_registration_form">
             <field name="name">event.registration.form</field>
             <field name="model">event.registration</field>
             <field name="type">form</field>
@@ -332,7 +331,7 @@
             <field name="arch" type="xml">
                 <search string="Event Registration">
                     <group col="12" colspan="4">
-                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Registrations"/>
+                        <filter icon="terp-document-new" string="Draft" name="draft" domain="[('state','=','draft')]" help="Draft Registrations"/>
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','in',('open','done'))]" help="Confirmed Registrations"/>
                         <separator orientation="vertical"/>
                         <field name="partner_id" />
@@ -352,7 +351,7 @@
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>                        
-                        <filter string="Responsible" name="uid" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Responsible"  icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                    </group>
                 </search>
             </field>
@@ -364,7 +363,7 @@
           <field name="view_type">form</field>
           <field name="domain"></field>
           <field name="view_mode">tree,form</field>
-          <field name="context">{"search_default_user_id":uid}</field>
+          <field name="context">{"search_default_draft": "1"}</field>
           <field name="search_view_id" ref="view_registration_search"/>
         </record>
         

From c756e0b0faf5b5f4d75af0901054de106ed0d89f Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Tue, 22 Jun 2010 20:30:35 +0530
Subject: [PATCH 087/121] [Fix]: remove some .moved file.

bzr revid: atp@tinyerp.co.in-20100622150035-ueu35w1vrzrl3y2j
---
 addons/event/event_view.xml                   |  5 +-
 addons/event/wizard/event_registration.py     | 60 -------------------
 .../event/wizard/event_registration_view.xml  | 43 -------------
 .../wizard/crm_make_sale_view.xml.moved       | 43 -------------
 4 files changed, 3 insertions(+), 148 deletions(-)
 delete mode 100755 addons/event/wizard/event_registration.py
 delete mode 100755 addons/event/wizard/event_registration_view.xml
 delete mode 100644 addons/sale_crm/wizard/crm_make_sale_view.xml.moved

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 3bc8ff14ff6..68091a24df9 100755
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -89,13 +89,14 @@
                             <newline/>
                             <field name="mail_auto_registr"/>
                             <separator string="Registration Email" colspan="2"/>
-                            <field name="mail_registr" colspan="2" nolabel="1"/>
+                            <newline/>
+                            <field name="mail_registr" colspan="2"  nolabel="1"/>
                         </group>
                         <group col="2" colspan="2">
                             <separator string="Auto Confirmation Email" colspan="2"/>
                             <field name="mail_auto_confirm"/>
                             <newline/>
-                            <separator string="Confirmation Email" colspan="2"/>
+                            <separator string="Confirmation Email" colspan="4"/>
                             <field name="mail_confirm" colspan="2" nolabel="1"/>
                         </group>
                     </page>
diff --git a/addons/event/wizard/event_registration.py b/addons/event/wizard/event_registration.py
deleted file mode 100755
index 7640f040a99..00000000000
--- a/addons/event/wizard/event_registration.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields, osv
-
-class event_registration_list(osv.osv_memory):
-    """ List Event Registration """
-    
-    _name = "event.registration.list"
-    _description = "List Event Registrations"
-
-    def open_registration(self, cr, uid, ids, context={}):
-        """
-        Open Event Registration form
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of Event registration list's IDs
-        @param context: A standard dictionary for contextual values
-        @return: Dictionary value which open Event registration form.
-        """
-
-        if not context.get('active_id', None):
-            return {
-            'name': 'Event Registrations',
-            'view_type': 'form',
-            'view_mode': 'tree,form',
-            'res_model': 'event.registration',
-            'type': 'ir.actions.act_window'
-            }
-
-        return {
-            'domain': [('event_id', '=', context['active_id'])],
-            'name': 'Event Registrations',
-            'view_type': 'form',
-            'view_mode': 'tree,form',
-            'res_model': 'event.registration',
-            'type': 'ir.actions.act_window'
-        }
-
-event_registration_list()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/event/wizard/event_registration_view.xml b/addons/event/wizard/event_registration_view.xml
deleted file mode 100755
index 75d90d9991e..00000000000
--- a/addons/event/wizard/event_registration_view.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="view_event_registration" model="ir.ui.view">
-            <field name="name">List Event Registrations</field>
-            <field name="model">event.registration.list</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-              <form string="Event Registrations">
-                <group colspan="4" col="2">
-                    <separator string="List Event Registrations" colspan="4"/>
-
-                      <button special="cancel" string="Close" icon="gtk-close"/>
-                    <button name="open_registration" string="Open Registrations" type="object" icon="gtk-open"/>
-                </group>
-            </form>
-            </field>
-        </record>
-
-        <record id="action_event_registration" model="ir.actions.act_window">
-            <field name="name">Registrations</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">event.registration.list</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_event_registration"/>
-            <field name="context">{'record_id' : active_id}</field>
-            <field name="target">new</field>
-        </record>
-
-        <record model="ir.values" id="event_registration_values">
-            <field name="model_id" ref="event.model_event_event" />
-            <field name="object" eval="1" />
-            <field name="name">Event Registrations</field>
-            <field name="key2">client_action_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_event_registration'))" />
-            <field name="key">action</field>
-            <field name="model">event.event</field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/sale_crm/wizard/crm_make_sale_view.xml.moved b/addons/sale_crm/wizard/crm_make_sale_view.xml.moved
deleted file mode 100644
index 64b0585fb25..00000000000
--- a/addons/sale_crm/wizard/crm_make_sale_view.xml.moved
+++ /dev/null
@@ -1,43 +0,0 @@
-<openerp>
-   <data>
-
-        <!-- crm make sale's view -->
-
-       <record id="view_crm_make_sale" model="ir.ui.view">
-          <field name="name">crm.make.sale.form</field>
-          <field name="model">crm.make.sale</field>
-          <field name="type">form</field>
-          <field name="arch" type="xml">
-              <form string="Create a Sale Order" >
-                	<group colspan="4">
-	                	<field name="partner_id"/>
-	                	<field name="shop_id"/>
-	                	<field name="analytic_account"/>
-	                	<field name="picking_policy"/>
-	                	<field name="close"/>
-	                </group>
-	                <separator string="Products" colspan="4"/>
-	                <field name="product_ids" colspan="4" nolabel="1"/>
-                <separator colspan="4"/>
-                <group col="4" colspan="4">
-                    <label string="" colspan="2"/>
-                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                    <button name="makeOrder" string="Create" type="object" icon='gtk-go-forward'/>
-                </group>
-            </form>
-          </field>
-       </record>
-       
-       <!-- crm make sale's  action -->
-       
-       <record id="action_crm_make_sale" model="ir.actions.act_window">
-          <field name="name">Make Quotation</field>
-          <field name="type">ir.actions.act_window</field>
-          <field name="res_model">crm.make.sale</field>
-          <field name="view_type">form</field>
-          <field name="view_mode">form</field>
-          <field name="target">new</field>
-       </record>
-       
-   </data>
-</openerp>

From 4fd5e6b51487b60bfd999b776a0f793f56f689aa Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 22 Jun 2010 18:03:39 +0300
Subject: [PATCH 088/121] Doc webdav: temp fixes

Including a meaningful exception when range of data (chunked transfer)
is requested.

bzr revid: p_christ@hol.gr-20100622150339-e93xs3dw0kw1ni3y
---
 addons/document_webdav/dav_fs.py        | 5 ++++-
 addons/document_webdav/webdav_server.py | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index 88f855f75f0..51368388734 100644
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -223,7 +223,7 @@ class openerp_dav_handler(dav_interface):
             return None
         return pool.get('document.directory').get_object(cr, uid, uri)
 
-    def get_data(self,uri):    
+    def get_data(self,uri, rrange=None):
         self.parent.log_message('GET: %s' % uri)
         if uri[-1]=='/':uri=uri[:-1]
         cr, uid, pool, dbname, uri2 = self.get_cr(uri)
@@ -234,6 +234,9 @@ class openerp_dav_handler(dav_interface):
             if not node:
                 raise DAV_NotFound(uri2)
             try:
+                if rrange:
+                    self.parent.log_error("Doc get_data cannot use range")
+                    raise DAV_Error(409)
                 datas = node.get_data(cr)
             except TypeError,e:
                 import traceback                
diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py
index 80b8b6bb898..b907ed94df6 100644
--- a/addons/document_webdav/webdav_server.py
+++ b/addons/document_webdav/webdav_server.py
@@ -42,6 +42,9 @@ def OpenDAVConfig(**kw):
     class OpenDAV:
         def __init__(self, **kw):
             self.__dict__.update(**kw)
+            
+        def getboolean(self, word):
+            return self.__dict__.get(word, False)
 
     class Config:
         DAV = OpenDAV(**kw)

From 29ff45bbd011bd72909513d0721c5376a34c1f0a Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 22 Jun 2010 18:03:42 +0300
Subject: [PATCH 089/121] Document: show storage path for any type except 'db'

bzr revid: p_christ@hol.gr-20100622150342-jo41vtxhkq4ff5rz
---
 addons/document/document_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 29f3617d64f..b1696fa770d 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -20,7 +20,7 @@
                     <field name="online"/>
                     <field name="readonly"/>
                 </group>
-                <group colspan="2" attrs="{'invisible':[('type','!=','realstore')]}">
+                <group colspan="2" attrs="{'invisible':[('type','=','db')]}">
                     <field name="path"/>
                 </group>
             </form>
@@ -260,7 +260,7 @@
         <field name="type">tree</field>
         <field name="priority" eval="1"/>
         <field name="arch" type="xml">
-            <tree colors="blue:type in ('url')" string="Documents">
+            <tree colors="blue:type in ('url')" string="Documents"> *-*
                 <field name="name"/>
                 <field name="type"/>
                 <field name="datas_fname"/>

From f2a5600be1a793f380243f8dbd446d852bb18a74 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 22 Jun 2010 18:03:44 +0300
Subject: [PATCH 090/121] Document: default storage should be into db.

.. because db works without settings, and ir.attachment defaults to it
before document is installed.

bzr revid: p_christ@hol.gr-20100622150344-zlklaz5uldeict3h
---
 addons/document/document_data.xml | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/addons/document/document_data.xml b/addons/document/document_data.xml
index 77c80b078d1..b44973ec6e8 100644
--- a/addons/document/document_data.xml
+++ b/addons/document/document_data.xml
@@ -9,15 +9,9 @@
     </record>
     
     <record model="document.storage" id="storage_default">
-	<field name="name">Default File storage</field>
-	<field name="user_id" ref="base.user_admin"/>
-    </record>
-
-    <record model="document.storage" id="storage_db">
-	<field name="name">DB storage</field>
-	<field name="user_id" ref="base.user_admin"/>
-	<field name="type" eval="'db'" />
-	<field name="path"></field>
+        <field name="name">Default DB storage</field>
+        <field name="type">db</field>
+        <field name="user_id" ref="base.user_admin"/>
     </record>
 
     <record model="document.directory" id="dir_root">

From f96ac9db029e83227d7dbc20bb59cad9f8eec091 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Tue, 22 Jun 2010 18:03:47 +0300
Subject: [PATCH 091/121] Document: fix spelling of personal folders.

bzr revid: p_christ@hol.gr-20100622150347-g9wi75dmxule6hwq
---
 addons/document/document_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/document/document_data.xml b/addons/document/document_data.xml
index b44973ec6e8..c2bef5de34f 100644
--- a/addons/document/document_data.xml
+++ b/addons/document/document_data.xml
@@ -54,7 +54,7 @@
     </record>
 
     <record model="document.directory" id="dir_personnal_folder">
-        <field name="name">Personnal Folders</field>
+        <field name="name">Personal Folders</field>
         <field name="parent_id" ref="dir_root"/>
         <field name="type">ressource</field>
 	<field name="storage_id" ref="storage_default"/>

From 2a7f27083c6a789af28af85bcfd494637c879f89 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Wed, 23 Jun 2010 11:36:50 +0530
Subject: [PATCH 092/121] [IMP]: event: Minor Improvement in event view.use
 expand="1" in mailing tab.

bzr revid: atp@tinyerp.co.in-20100623060650-s1kvvp8n9ns0j8sq
---
 addons/event/event_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 68091a24df9..7f23122791c 100755
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -81,10 +81,10 @@
                         </group>
                     </page>
                    <page string="Mailing">
-                        <field name="reply_to"/>
+                        <field name="reply_to" />
                         <newline/>
 
-                        <group col="3" colspan="2">
+                        <group col="3" colspan="2" expand="1">
                             <separator string="Auto Registration Email" colspan="2"/>
                             <newline/>
                             <field name="mail_auto_registr"/>
@@ -92,11 +92,11 @@
                             <newline/>
                             <field name="mail_registr" colspan="2"  nolabel="1"/>
                         </group>
-                        <group col="2" colspan="2">
+                        <group col="2" colspan="2" >
                             <separator string="Auto Confirmation Email" colspan="2"/>
                             <field name="mail_auto_confirm"/>
                             <newline/>
-                            <separator string="Confirmation Email" colspan="4"/>
+                            <separator string="Confirmation Email" colspan="2"/>
                             <field name="mail_confirm" colspan="2" nolabel="1"/>
                         </group>
                     </page>

From 1747e2a90b35b04bf084bdf33e8350621e158824 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Wed, 23 Jun 2010 12:26:51 +0530
Subject: [PATCH 093/121] [IMP]: removed _log_create=True in  crm and
 mailgateway module.

bzr revid: atp@tinyerp.co.in-20100623065651-zo5x336p2fbuei0g
---
 addons/crm/crm_lead.py                    | 1 -
 addons/crm/crm_meeting.py                 | 2 +-
 addons/crm/crm_phonecall.py               | 2 +-
 addons/crm_claim/crm_claim.py             | 2 +-
 addons/crm_fundraising/crm_fundraising.py | 2 +-
 addons/crm_helpdesk/crm_helpdesk.py       | 2 +-
 addons/crm_profiling/crm_profiling.py     | 2 +-
 addons/mail_gateway/mail_gateway.py       | 5 ++---
 8 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index e92378785d6..7e0dc1ea36a 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -36,7 +36,6 @@ class crm_lead(osv.osv, crm_case):
     _order = "priority, id desc"
     _inherit = ['res.partner.address']
     _inherits = {'mailgate.thread': 'thread_id'}
-    _log_create=True
 
     def _compute_day(self, cr, uid, ids, fields, args, context={}):
         """
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index e3116ba39ca..3529e329ffa 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -45,7 +45,7 @@ class crm_meeting(osv.osv, crm_case):
     _order = "id desc"
     _inherit = ["calendar.event"]
     _inherits = {'mailgate.thread': 'thread_id'}
-    _log_create=True
+   
 
     _columns = {
         # From crm.case
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 4ed59e2a5c3..29a52866907 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -32,7 +32,7 @@ class crm_phonecall(osv.osv, crm_case):
     _description = "Phonecall"
     _order = "id desc"
     _inherits = {'mailgate.thread': 'thread_id'}
-    _log_create=True
+    
 
     _columns = {
         # From crm.case
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index a5dfc5a30e5..6677b29151e 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -30,7 +30,7 @@ class crm_claim(osv.osv, crm.crm_case):
     _description = "Claim Cases"
     _order = "id desc"
     _inherits = {'mailgate.thread': 'thread_id'}
-    _log_create=True
+   
 
     _columns = {
         'thread_id': fields.many2one('mailgate.thread', 'Thread', required=False), 
diff --git a/addons/crm_fundraising/crm_fundraising.py b/addons/crm_fundraising/crm_fundraising.py
index 4ff7832e64f..6fb70b97a46 100644
--- a/addons/crm_fundraising/crm_fundraising.py
+++ b/addons/crm_fundraising/crm_fundraising.py
@@ -29,7 +29,7 @@ class crm_fundraising(osv.osv, crm.crm_case):
     _description = "Fund Raising Cases"
     _order = "id desc"
     _inherits = {'mailgate.thread': 'thread_id'}
-    _log_create=True
+    
 
     _columns = {
             'thread_id': fields.many2one('mailgate.thread', 'Thread', required=False), 
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index 0b14994d2b6..35de73c4471 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -29,7 +29,7 @@ class crm_helpdesk(osv.osv, crm.crm_case):
     _description = "Helpdesk Cases"
     _order = "id desc"
     _inherits = {'mailgate.thread': 'thread_id'}
-    _log_create=True
+   
 
     _columns = {
             'thread_id': fields.many2one('mailgate.thread', 'Thread', required=False), 
diff --git a/addons/crm_profiling/crm_profiling.py b/addons/crm_profiling/crm_profiling.py
index 6f61687e12d..71c494ffb94 100644
--- a/addons/crm_profiling/crm_profiling.py
+++ b/addons/crm_profiling/crm_profiling.py
@@ -158,7 +158,7 @@ class questionnaire(osv.osv):
 
     _name="crm_profiling.questionnaire"
     _description= "Questionnaire"
-    _log_create = True
+   
 
     def build_form(self, cr, uid, data, context):
         """
diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index 76b35c630ee..dbbc1e8d748 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -36,7 +36,7 @@ class mailgate_thread(osv.osv):
     _name = 'mailgate.thread'
     _description = 'Mailgateway Thread'
     _rec_name = 'thread' 
-
+    
     _columns = {
         'thread': fields.char('Thread', size=32, required=False), 
         'message_ids': fields.one2many('mailgate.message', 'thread_id', 'Messages', domain=[('history', '=', True)], required=False), 
@@ -120,8 +120,7 @@ class mailgate_message(osv.osv):
     _name = 'mailgate.message'
     _description = 'Mailgateway Message'
     _order = 'date desc'
-    _log_create=True
-
+    
     _columns = {
         'name':fields.char('Message', size=64), 
         'thread_id':fields.many2one('mailgate.thread', 'Thread'), 

From bd267c693e17e333e7ede9de765850745b709f44 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Wed, 23 Jun 2010 15:49:16 +0530
Subject: [PATCH 094/121] [FIX] Document: string attribute is not support in
 tree tag. so removed it into tree view of document

bzr revid: hmo@tinyerp.com-20100623101916-6d8yo6szm74pn1kw
---
 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 b1696fa770d..fc8dddf437f 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -260,7 +260,7 @@
         <field name="type">tree</field>
         <field name="priority" eval="1"/>
         <field name="arch" type="xml">
-            <tree colors="blue:type in ('url')" string="Documents"> *-*
+            <tree colors="blue:type in ('url')"> 
                 <field name="name"/>
                 <field name="type"/>
                 <field name="datas_fname"/>

From aacbfeb672339c8a229ccc483fd2040f83fe8f3a Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Wed, 23 Jun 2010 16:01:44 +0530
Subject: [PATCH 095/121] [FIX] Document: Document directory strcuture could
 not open. Give 'field_parent' into tree view of document directory

bzr revid: hmo@tinyerp.com-20100623103144-083549ttpjc6ftj0
---
 addons/document/document_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index fc8dddf437f..bfed22be780 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -119,6 +119,7 @@
         <field name="name">document.directory</field>
         <field name="model">document.directory</field>
         <field name="type">tree</field>
+        <field name="field_parent">child_ids</field>
         <field name="arch" type="xml">
             <tree string="Directories" toolbar="1">
                 <field name="name"/>

From 0be3a0757ca31d9abe8f78f86c3606200d546941 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Wed, 23 Jun 2010 13:49:56 +0300
Subject: [PATCH 096/121] Doc webdav: fix at listing of dbs

This is not a complete fix yet, but handles the case when one of the
scanned db's is not a proper OpenERP one (happens if a db has same user
as in the openerp conf, or if openerp db is not initialized properly).

bzr revid: p_christ@hol.gr-20100623104956-w5r3n035ozvz0h0v
---
 addons/document_webdav/dav_fs.py | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index 51368388734..a0d70704579 100644
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -140,13 +140,19 @@ class openerp_dav_handler(dav_interface):
         result = s.exp_list()
         self.db_name_list=[]
         for db_name in result:
-            db = pooler.get_db_only(db_name)
-            cr = db.cursor()
-            cr.execute("select id from ir_module_module where name = 'document' and state='installed' ")
-            res=cr.fetchone()
-            if res and len(res):
-                self.db_name_list.append(db_name)
-            cr.close()
+            cr = None
+            try:
+                db = pooler.get_db_only(db_name)
+                cr = db.cursor()
+                cr.execute("SELECT id FROM ir_module_module WHERE name = 'document' AND state='installed' ")
+                res=cr.fetchone()
+                if res and len(res):
+                    self.db_name_list.append(db_name)
+            except Exception, e:
+                self.parent.log_error("Exception in db list: %s" % e)
+            finally:
+                if cr:
+                    cr.close()
         return self.db_name_list
 
     def get_childs(self, uri, filters=None):

From e56957c1811c6b1708c196528551b64b79869fbf Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Wed, 23 Jun 2010 16:20:49 +0530
Subject: [PATCH 097/121] [ADD] Document: Search View of Document Directory

bzr revid: hmo@tinyerp.com-20100623105049-ljrwb0w3axw5dk0d
---
 addons/document/document_view.xml | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index bfed22be780..db261923395 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -96,7 +96,7 @@
                         </tree>
                     </field>
                 </page>
-                <page string="Dynamic context">
+                <page string="Dynamic context" groups="base.group_extended">
                     <field name="dctx_ids" nolabel="1" colspan="4">
                         <tree string="Fields" editable="bottom">
                             <field name="field"/>
@@ -131,12 +131,35 @@
         </field>
     </record>
 
+    <record id="view_document_directory_filter" model="ir.ui.view">
+            <field name="name">Search View: Document Directory</field>
+            <field name="model">document.directory</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Document Directory">
+                    <filter string="Static" domain="[('type','=','directory')]"/>
+                    <filter string="Resources" domain="[('type','=','ressource')]"/>
+                    <separator orientation="vertical"/>
+                    <field name="name" />
+                    <field name="user_id" />
+                    <field name="storage_id" />
+                    <newline/>
+                    <group expand="0" string="Group By..." groups="base.group_extended">
+                        <filter string="Type"  domain="[]" context="{'group_by':'type'}"/>
+                        <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Storage" domain="[]" context="{'group_by':'storage_id'}"/>                        
+                    </group>
+               </search>
+            </field>
+        </record>
+
     <record model="ir.actions.act_window" id="action_document_directory_form">
         <field name="name">Directories</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">document.directory</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
+        <field name="search_view_id" ref="view_document_directory_filter"/>
     </record>
 
     <record id="action_dir_view1" model="ir.actions.act_window.view">
@@ -350,6 +373,9 @@
         res_model="ir.attachment"
         src_model="document.directory"/>
 
+
+    
+
 </data>
 </openerp>
 

From a26e8ae2eef6af0d33255f1081cfcc978c0c5138 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Wed, 23 Jun 2010 13:54:37 +0300
Subject: [PATCH 098/121] Doc Webdav: Cleanup code, fix db listing, children
 paths.

This is a reshape of the code, since the porting. While the MultiHttpHandler
will strip the '/webdav' part of the path, the DAV code will try to
generate more paths without it. So, there must be consinstent functions
that will convert (at mk_prop_response and mk_propname_response) to the
full path or back. Also, only have one function that will strip the
db name from the path, so that we control the auth requirements (for the
purpose of database listings, which shouldn't require authentication).

bzr revid: p_christ@hol.gr-20100623105437-kmy0ccqihu5h9ydp
---
 addons/document_webdav/dav_fs.py        | 101 +++++++++++++-----------
 addons/document_webdav/webdav.py        |  47 ++++++++++-
 addons/document_webdav/webdav_server.py |  25 ++++--
 3 files changed, 117 insertions(+), 56 deletions(-)

diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index a0d70704579..8fa3ed5ed88 100644
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -55,8 +55,6 @@ class openerp_dav_handler(dav_interface):
     M_NS={ "DAV:" : dav_interface.M_NS['DAV:'],}
 
     def __init__(self,  parent, verbose=False):        
-        self.db_name = False
-        self.directory_id=False
         self.db_name_list=[]
         self.parent = parent
         self.baseuri = parent.baseuri
@@ -65,10 +63,10 @@ class openerp_dav_handler(dav_interface):
     def get_propnames(self, uri):
         props = self.PROPS   
         self.parent.log_message('get propnames: %s' % uri)
-        if uri[-1]=='/':uri=uri[:-1]
         cr, uid, pool, dbname, uri2 = self.get_cr(uri)
         if not dbname:
             if cr: cr.close()
+            # TODO: maybe limit props for databases..?
             return props
         node = self.uri2object(cr, uid, pool, uri2)
         if node:
@@ -83,7 +81,6 @@ class openerp_dav_handler(dav_interface):
         raise DAV_NotFound
 
     def match_prop(self, uri, match, ns, propname):        
-        if uri[-1]=='/':uri=uri[:-1]
         cr, uid, pool, dbname, uri2 = self.get_cr(uri)
         if not dbname:
             if cr: cr.close()
@@ -104,8 +101,7 @@ class openerp_dav_handler(dav_interface):
             pname        -- name of the property
          """            
         if self.M_NS.has_key(ns):
-           return dav_interface.get_prop(self, uri, ns, propname) 
-        if uri[-1]=='/':uri=uri[:-1]
+            return dav_interface.get_prop(self, uri, ns, propname)
         cr, uid, pool, dbname, uri2 = self.get_cr(uri)
         if not dbname:
             if cr: cr.close()
@@ -114,19 +110,46 @@ class openerp_dav_handler(dav_interface):
         if not node:
             cr.close()
             raise DAV_NotFound
-        res = node.get_dav_eprop(cr, ns, propname)        
+        res = node.get_dav_eprop(cr, ns, propname)
         cr.close()        
         return res    
 
-    def get_db(self,uri):
-        names=self.uri2local(uri).split('/')        
-        self.db_name=False
-        if len(names) > 1:
-            self.db_name=self.uri2local(uri).split('/')[1]
-            if self.db_name=='':
-                raise Exception,'Plese specify Database name in folder'
-        return self.db_name    
-    
+    def get_db(self, uri, rest_ret=False, allow_last=False):
+        """Parse the uri and get the dbname and the rest.
+           Db name should be the first component in the unix-like
+           path supplied in uri.
+           
+           @param rest_ret Instead of the db_name, return (db_name, rest),
+                where rest is the remaining path
+           @param allow_last If the dbname is the last component in the
+                path, allow it to be resolved. The default False value means
+                we will not attempt to use the db, unless there is more
+                path.
+                
+           @return db_name or (dbname, rest) depending on rest_ret,
+                will return dbname=False when component is not found.
+        """
+        
+        uri2 = self.uri2local(uri)
+        if uri2.startswith('/'):
+            uri2 = uri2[1:]
+        names=uri2.split('/',1)
+        db_name=False
+        rest = None
+        if allow_last:
+            ll = 0
+        else:
+            ll = 1
+        if len(names) > ll and names[0]:
+            db_name = names[0]
+            names = names[1:]
+
+        if rest_ret:
+            if len(names):
+                rest = names[0]
+            return db_name, rest
+        return db_name
+
 
     def urijoin(self,*ajoin):
         """ Return the base URI of this request, or even join it with the
@@ -158,8 +181,7 @@ class openerp_dav_handler(dav_interface):
     def get_childs(self, uri, filters=None):
         """ return the child objects as self.baseuris for the given URI """        
         self.parent.log_message('get childs: %s' % uri)
-        if uri[-1]=='/':uri=uri[:-1]
-        cr, uid, pool, dbname, uri2 = self.get_cr(uri)  
+        cr, uid, pool, dbname, uri2 = self.get_cr(uri, allow_last=True)
         
         if not dbname:            
             if cr: cr.close()
@@ -200,38 +222,33 @@ class openerp_dav_handler(dav_interface):
     #
     # pos: -1 to get the parent of the uri
     #
-    def get_cr(self, uri):            
+    def get_cr(self, uri, allow_last=False):
+        """ Split the uri, grab a cursor for that db
+        """
         pdb = self.parent.auth_proxy.last_auth
-        reluri = self.uri2local(uri)        
-        try:
-            dbname = reluri.split('/')[1]
-        except:
-            dbname = False        
+        dbname, uri2 = self.get_db(uri, rest_ret=True, allow_last=allow_last)
+        uri2 = (uri2 and uri2.split('/')) or []
         if not dbname:
-            return None, None, None, False, None
-        if not pdb and dbname:
-            # if dbname was in our uri, we should have authenticated
-            # against that.
-            raise Exception("Programming error")        
-        #assert pdb == dbname, " %s != %s" %(pdb, dbname)        
+            return None, None, None, False, uri2
+        # if dbname was in our uri, we should have authenticated
+        # against that.
+        assert pdb == dbname, " %s != %s" %(pdb, dbname)
         res = self.parent.auth_proxy.auth_creds.get(dbname, False)
-        if not res:            
+        if not res:
             self.parent.auth_proxy.checkRequest(self.parent, uri, dbname)
-            res = self.parent.auth_proxy.auth_creds[dbname]            
+            res = self.parent.auth_proxy.auth_creds[dbname]
         user, passwd, dbn2, uid = res
         db,pool = pooler.get_db_and_pool(dbname)
         cr = db.cursor()
-        uri2 = reluri.split('/')[2:]        
         return cr, uid, pool, dbname, uri2
 
-    def uri2object(self, cr, uid, pool,uri):
+    def uri2object(self, cr, uid, pool, uri):
         if not uid:
             return None
         return pool.get('document.directory').get_object(cr, uid, uri)
 
     def get_data(self,uri, rrange=None):
         self.parent.log_message('GET: %s' % uri)
-        if uri[-1]=='/':uri=uri[:-1]
         cr, uid, pool, dbname, uri2 = self.get_cr(uri)
         try:
             if not dbname:
@@ -265,7 +282,6 @@ class openerp_dav_handler(dav_interface):
     def _get_dav_resourcetype(self,uri):
         """ return type of object """        
         self.parent.log_message('get RT: %s' % uri)
-        if uri[-1]=='/':uri=uri[:-1]
         cr, uid, pool, dbname, uri2 = self.get_cr(uri)
         try:
             if not dbname:
@@ -281,7 +297,6 @@ class openerp_dav_handler(dav_interface):
 
     def _get_dav_displayname(self,uri):
         self.parent.log_message('get DN: %s' % uri)
-        if uri[-1]=='/':uri=uri[:-1]
         cr, uid, pool, dbname, uri2 = self.get_cr(uri)
         if not dbname:
             cr.close()
@@ -297,7 +312,6 @@ class openerp_dav_handler(dav_interface):
     def _get_dav_getcontentlength(self, uri):
         """ return the content length of an object """        
         self.parent.log_message('get length: %s' % uri)
-        if uri[-1]=='/':uri=uri[:-1]
         result = 0
         cr, uid, pool, dbname, uri2 = self.get_cr(uri)        
         if not dbname:
@@ -315,7 +329,6 @@ class openerp_dav_handler(dav_interface):
     def _get_dav_getetag(self,uri):
         """ return the ETag of an object """
         self.parent.log_message('get etag: %s' % uri)
-        if uri[-1]=='/':uri=uri[:-1]
         result = 0
         cr, uid, pool, dbname, uri2 = self.get_cr(uri)
         if not dbname:
@@ -332,7 +345,6 @@ class openerp_dav_handler(dav_interface):
     @memoize(CACHE_SIZE)
     def get_lastmodified(self, uri):
         """ return the last modified date of the object """
-        if uri[-1]=='/':uri=uri[:-1]
         today = time.time()
         cr, uid, pool, dbname, uri2 = self.get_cr(uri)
         if not dbname:
@@ -351,7 +363,6 @@ class openerp_dav_handler(dav_interface):
     @memoize(CACHE_SIZE)
     def get_creationdate(self, uri):
         """ return the last modified date of the object """        
-        if uri[-1]=='/':uri=uri[:-1]
         cr, uid, pool, dbname, uri2 = self.get_cr(uri)
         if not dbname:
             raise DAV_Error, 409
@@ -370,7 +381,6 @@ class openerp_dav_handler(dav_interface):
     @memoize(CACHE_SIZE)
     def _get_dav_getcontenttype(self,uri):
         self.parent.log_message('get contenttype: %s' % uri)
-        if uri[-1]=='/':uri=uri[:-1]
         cr, uid, pool, dbname, uri2 = self.get_cr(uri)
         if not dbname:
             return 'httpd/unix-directory'
@@ -443,10 +453,8 @@ class openerp_dav_handler(dav_interface):
 
     def rmcol(self,uri):
         """ delete a collection """
-        if uri[-1]=='/':uri=uri[:-1]
-
         cr, uid, pool, dbname, uri2 = self.get_cr(uri)        
-        if not dbname: # *-*
+        if not dbname:
             raise DAV_Error, 409
         node = self.uri2object(cr, uid, pool, uri2)             
         node.rmcol(cr)
@@ -456,7 +464,6 @@ class openerp_dav_handler(dav_interface):
         return 204
 
     def rm(self,uri):
-        if uri[-1]=='/':uri=uri[:-1]        
         cr, uid, pool,dbname, uri2 = self.get_cr(uri)
         if not dbname:        
             cr.close()
@@ -635,3 +642,5 @@ class openerp_dav_handler(dav_interface):
     def is_collection(self, uri):
         """ test if the given uri is a collection """
         return self._get_dav_resourcetype(uri)==COLLECTION
+
+#eof
diff --git a/addons/document_webdav/webdav.py b/addons/document_webdav/webdav.py
index 2406bc10492..e904d2ecfb7 100644
--- a/addons/document_webdav/webdav.py
+++ b/addons/document_webdav/webdav.py
@@ -3,6 +3,7 @@
 #
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (c) 1999 Christian Scholz (ruebe@aachen.heimat.de)
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -48,7 +49,9 @@ def mk_prop_response(self, uri, good_props, bad_props, doc):
     uparts=urlparse.urlparse(uri)
     fileloc=uparts[2]
     href=doc.createElement("D:href")
-    huri=doc.createTextNode(uparts[0]+'://'+'/'.join(uparts[1:2]) + urllib.quote(fileloc))
+    davpath = self._dataclass.parent.get_davpath()
+    hurl = '%s://%s%s%s' % (uparts[0], uparts[1], davpath, urllib.quote(fileloc))
+    huri=doc.createTextNode(hurl)
     href.appendChild(huri)
     re.appendChild(href)
 
@@ -111,5 +114,45 @@ def mk_prop_response(self, uri, good_props, bad_props, doc):
     return re
     
 
-PROPFIND.mk_prop_response = mk_prop_response
+def mk_propname_response(self,uri,propnames,doc):
+    """ make a new <prop> result element for a PROPNAME request 
+
+    This will simply format the propnames list.
+    propnames should have the format {NS1 : [prop1, prop2, ...], NS2: ...}
+
+    """
+    re=doc.createElement("D:response")
+
+    # write href information
+    uparts=urlparse.urlparse(uri)
+    fileloc=uparts[2]
+    href=doc.createElement("D:href")
+    davpath = self._dataclass.parent.get_davpath()
+    hurl = '%s://%s%s%s' % (uparts[0], uparts[1], davpath, urllib.quote(fileloc))
+    huri=doc.createTextNode(hurl)
+    href.appendChild(huri)
+    re.appendChild(href)
+
+    ps=doc.createElement("D:propstat")
+    nsnum=0
+
+    for ns,plist in propnames.items():
+        # write prop element
+        pr=doc.createElement("D:prop")
+        nsp="ns"+str(nsnum)
+        pr.setAttribute("xmlns:"+nsp,ns)
+        nsnum=nsnum+1
+
+    # write propertynames
+    for p in plist:
+        pe=doc.createElement(nsp+":"+p)
+        pr.appendChild(pe)
+
+    ps.appendChild(pr)
+    re.appendChild(ps)
+
+    return re
+
+PROPFIND.mk_prop_response = mk_prop_response
+PROPFIND.mk_propname_response = mk_propname_response
 
diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py
index b907ed94df6..c920c84ea72 100644
--- a/addons/document_webdav/webdav_server.py
+++ b/addons/document_webdav/webdav_server.py
@@ -67,18 +67,17 @@ class DAVHandler(FixSendError,DAVRequestHandler):
         pass
 
     def get_db_from_path(self, uri):
-        if uri or uri == '/':
-            dbs = self.IFACE_CLASS.db_list()
-            res = len(dbs) and dbs[0] or False
-        else:
-            res =  self.IFACE_CLASS.get_db(uri)        
+        # interface class will handle all cases.
+        res =  self.IFACE_CLASS.get_db(uri, allow_last=True)
         return res
 
     def setup(self):
-        davpath = '/'+config.get_misc('webdav','vdir','webdav')
+        self.davpath = '/'+config.get_misc('webdav','vdir','webdav')
         self.baseuri = "http://%s:%d/"% (self.server.server_name, self.server.server_port)
         self.IFACE_CLASS  = openerp_dav_handler(self, self.verbose)
         
+    def get_davpath(self):
+        return self.davpath
     
     def log_message(self, format, *args):
         netsvc.Logger().notifyChannel('webdav', netsvc.LOG_DEBUG_RPC, format % args)
@@ -164,8 +163,18 @@ class DAVHandler(FixSendError,DAVRequestHandler):
         self.send_body(None, '201', 'Created', '', headers=headers)
 
 
+from service.http_server import reg_http_service,OpenERPAuthProvider
+
+class DAVAuthProvider(OpenERPAuthProvider):
+    def authenticate(self, db, user, passwd, client_address):
+        """ authenticate, but also allow the False db, meaning to skip
+            authentication when no db is specified.
+        """
+        if db is False and user is None and passwd is None:
+            return True
+        return OpenERPAuthProvider.authenticate(self, db, user, passwd, client_address)
+
 try:
-    from service.http_server import reg_http_service,OpenERPAuthProvider   
 
     if (config.get_misc('webdav','enable',True)):
         directory = '/'+config.get_misc('webdav','vdir','webdav') 
@@ -180,7 +189,7 @@ try:
 
         conf = OpenDAVConfig(**_dc)
         handler._config = conf
-        reg_http_service(HTTPDir(directory,DAVHandler,OpenERPAuthProvider()))
+        reg_http_service(HTTPDir(directory,DAVHandler,DAVAuthProvider()))
         netsvc.Logger().notifyChannel('webdav', netsvc.LOG_INFO, "WebDAV service registered at path: %s/ "% directory)
 except Exception, e:
     logger = netsvc.Logger()

From b224ddbf8f2aa5d37ec3c60a89a4a0753e54b7dc Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Wed, 23 Jun 2010 16:35:59 +0530
Subject: [PATCH 099/121] [ADD] Document: Search View of Document Storage media

bzr revid: hmo@tinyerp.com-20100623110559-c83nx1rmo3sr0i47
---
 addons/document/document_view.xml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index db261923395..712d189a1d2 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -41,11 +41,33 @@
         </field>
     </record>
 
+    <record id="view_document_storage_filter" model="ir.ui.view">
+            <field name="name">Search View: Document Storage</field>
+            <field name="model">document.storage</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Document storage">
+                    <filter string="Database Storage" domain="[('type','=','db')]"/>
+                    <filter string="Internal File storage" domain="[('type','=','filestore')]"/>
+                    <filter string="External File storage" domain="[('type','=','realstore')]"/>
+                    <separator orientation="vertical"/>
+                    <field name="name" />
+                    <field name="user_id" />                    
+                    <newline/>
+                    <group expand="0" string="Group By..." groups="base.group_extended">
+                        <filter string="Type"  domain="[]" context="{'group_by':'type'}"/>
+                        <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>                                               
+                    </group>
+               </search>
+            </field>
+        </record>
+
     <record model="ir.actions.act_window" id="action_document_storage_form">
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">document.storage</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
+        <field name="search_view_id" ref="view_document_storage_filter"/>
     </record>
    <menuitem
         name="Storage Media"

From d2cb81281449f500743dab06257f2ea848b2b3e7 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Wed, 23 Jun 2010 17:23:49 +0530
Subject: [PATCH 100/121] [IMP] document: add new field company_id in document
 and directory model

bzr revid: hmo@tinyerp.com-20100623115349-ik8webt0myj6l43l
---
 addons/document/document.py           | 2 ++
 addons/document/document_directory.py | 2 ++
 addons/document/document_view.xml     | 9 ++++++++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/addons/document/document.py b/addons/document/document.py
index 5d3075f7a4a..aa893b617c3 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -98,6 +98,7 @@ class document_file(osv.osv):
             ('binary','Binary'),
 
         ],'Type', help="Type is used to separate URL and binary File"),
+        'company_id': fields.many2one('res.company', 'Company'),
     }
 
     def __get_def_directory(self, cr, uid, context=None):
@@ -105,6 +106,7 @@ class document_file(osv.osv):
         return dirobj._get_root_directory(cr, uid, context)
 
     _defaults = {
+        'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'ir.attachment', context=c),
         'user_id': lambda self, cr, uid, ctx:uid,
         'file_size': lambda self, cr, uid, ctx:0,
         'store_method': lambda *args: 'db',
diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index 1d0bbf3ed7c..961073ad434 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -60,6 +60,7 @@ class document_directory(osv.osv):
         'ressource_tree': fields.boolean('Tree Structure',
             help="Check this if you want to use the same tree structure as the object selected in the system."),
         'dctx_ids': fields.one2many('document.directory.dctx', 'dir_id', 'Context fields'),
+        'company_id': fields.many2one('res.company', 'Company'),        
     }
 
 
@@ -92,6 +93,7 @@ class document_directory(osv.osv):
                 return None
         
     _defaults = {
+        'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'document.directory', context=c),
         'user_id': lambda self,cr,uid,ctx: uid,
         'domain': lambda self,cr,uid,ctx: '[]',
         'type': lambda *args: 'directory',
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 712d189a1d2..3d3559e94e9 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -85,6 +85,7 @@
                 <field name="user_id"/>
                 <field name="parent_id"/>
                 <field name="storage_id" />
+                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 <notebook colspan="4">
                 <page string="Definition">
                     <separator string="Directory Type" colspan="4"/>
@@ -226,7 +227,8 @@
                 <group colspan="4" col="6">
                     <field name="name" select="1" />
                     <field name="type"/>
-                     <field name="parent_id"/>
+                    <field name="parent_id"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </group>
                 <notebook colspan="4">
                 <page string="Attachment">
@@ -291,11 +293,15 @@
                         help="Filter on my Attachment" />
                  </field>
                 <field name="partner_id"/>
+                <field name="company_id" groups="base.group_multi_company"/>
                 <newline/>
                 <group expand="0" string="Group By...">
                     <filter string="Partner" icon="terp-personal" domain="[]"
                        context="{'group_by':'partner_id'}" />
                     <filter string="Directory" icon="terp-folder-green" domain="[]" context="{'group_by':'parent_id'}"/>
+                    <filter string="Type"  domain="[]" context="{'group_by':'type'}"/>
+                    <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                    <filter string="Company" icon="terp-personal" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                 </group>
               </search>
              </field>
@@ -319,6 +325,7 @@
     </record>
 
     <record model="ir.actions.act_window" id="action_document_file_form">
+        <field name="name">Documents</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">ir.attachment</field>
         <field name="view_type">form</field>

From 1b6970ec3f0ea7daf484559de72abd945cd75b89 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Wed, 23 Jun 2010 15:41:48 +0300
Subject: [PATCH 101/121] Document view: fix names of doc, dir forms

bzr revid: p_christ@hol.gr-20100623124148-gcaxfhklv5riq3zd
---
 addons/document/document_view.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 712d189a1d2..ad56a50d06e 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -205,7 +205,7 @@
 
     <record model="ir.actions.act_window" id="action_document_directory_tree">
         <field name="type">ir.actions.act_window</field>
-        <field name="name">Directorie's Structure</field>
+        <field name="name">Directories' Structure</field>
         <field name="res_model">document.directory</field>
         <field name="view_type">tree</field>
         <field name="view_id" ref="document.view_document_directory_tree"/>
@@ -321,6 +321,7 @@
     <record model="ir.actions.act_window" id="action_document_file_form">
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">ir.attachment</field>
+        <field name="name">Document</field>
         <field name="view_type">form</field>
     </record>
     <menuitem name="Documents" id="menu_document_doc" parent="base.menu_document" sequence="5"/>
@@ -333,6 +334,7 @@
     <record model="ir.actions.act_window" id="action_document_file_directory_form">
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">ir.attachment</field>
+        <field name="name">Directory</field>
         <field name="view_type">form</field>
         <field name="domain">[('parent_id','child_of',active_id)]</field>
         <field name="context">{'parent_id':'active_id'}</field>

From df40ff60dcabc12c3d806ce6715097f4290087a1 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Wed, 23 Jun 2010 17:07:09 +0300
Subject: [PATCH 102/121] Document: fix creating of empty files.

For an empty file, the interface (eg. webdav) could ask to create with
data=None. Allow that.

bzr revid: p_christ@hol.gr-20100623140709-m11r40kk2dl9okvo
---
 addons/document/nodes.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/document/nodes.py b/addons/document/nodes.py
index df1878ad798..299e2a84330 100644
--- a/addons/document/nodes.py
+++ b/addons/document/nodes.py
@@ -339,7 +339,8 @@ class node_dir(node_database):
         fil_id = fil_obj.create(cr, uid, val, context=ctx)
         fil = fil_obj.browse(cr, uid, fil_id, context=ctx)
         fnode = node_file(path, self, self.context, fil)
-        fnode.set_data(cr, data, fil)
+        if data is not None:
+            fnode.set_data(cr, data, fil)
         return fnode
 
     def get_etag(self, cr):

From c6e0309c9bfd692071ef9d119b6d95029fa7386b Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Wed, 23 Jun 2010 17:07:20 +0300
Subject: [PATCH 103/121] Document: fix unicode passed as content-type header

Py-webdav will not allow us to have unicode in the mimetype. And that's
not in the protocol, anyway. So, ensure we are only sending a string (was
broken since the db query would convert to unicode).

bzr revid: p_christ@hol.gr-20100623140720-nzst9y9hmarfo7qv
---
 addons/document/nodes.py         | 4 ++--
 addons/document_webdav/dav_fs.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/document/nodes.py b/addons/document/nodes.py
index 299e2a84330..dcd864e6db0 100644
--- a/addons/document/nodes.py
+++ b/addons/document/nodes.py
@@ -668,7 +668,7 @@ class node_file(node_class):
         self.file_id = fil.id
         #todo: more info from ir_attachment
         if fil.file_type and '/' in fil.file_type:
-            self.mimetype = fil.file_type
+            self.mimetype = str(fil.file_type)
         self.create_date = fil.create_date
         self.write_date = fil.write_date or fil.create_date
         self.content_length = fil.file_size
@@ -810,7 +810,7 @@ class node_content(node_class):
                 (self.extension,))
         res = cr.fetchall()
         if res and res[0][0]:
-            self.mimetype = res[0][0]
+            self.mimetype = str(res[0][0])
 
 
     def get_data(self, cr, fil_obj = None):
diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index 8fa3ed5ed88..880074173ea 100644
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -388,7 +388,7 @@ class openerp_dav_handler(dav_interface):
             node = self.uri2object(cr, uid, pool, uri2)
             if not node:
                 raise DAV_NotFound(uri2)
-            result = node.mimetype
+            result = str(node.mimetype)
             return result
             #raise DAV_NotFound, 'Could not find %s' % path
         finally:

From 665103115d21b7d5646c30b144bd8436b6ee9546 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Thu, 24 Jun 2010 18:00:54 +0300
Subject: [PATCH 104/121] Doc WebDAV: workaround py-webdav for persistent
 connections.

Python-webdav does not follow the http protocol for persistent connections,
nor does it accept patches. So, override their functions.

bzr revid: p_christ@hol.gr-20100624150054-iwuvgehsyjr7qghv
---
 addons/document_webdav/webdav_server.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py
index c920c84ea72..4dec2eff0f4 100644
--- a/addons/document_webdav/webdav_server.py
+++ b/addons/document_webdav/webdav_server.py
@@ -33,6 +33,7 @@ from dav_fs import openerp_dav_handler
 from tools.config import config
 from DAV.WebDAVServer import DAVRequestHandler
 from service.websrv_lib import HTTPDir,FixSendError
+from BaseHTTPServer import BaseHTTPRequestHandler
 import urlparse
 import urllib
 from string import atoi,split
@@ -54,6 +55,7 @@ def OpenDAVConfig(**kw):
 
 class DAVHandler(FixSendError,DAVRequestHandler):
     verbose = False
+    protocol_version = 'HTTP/1.1'
     
     def get_userinfo(self,user,pw):
         return False
@@ -85,6 +87,17 @@ class DAVHandler(FixSendError,DAVRequestHandler):
     def log_error(self, format, *args):
         netsvc.Logger().notifyChannel('xmlrpc', netsvc.LOG_WARNING, format % args)
 
+    def send_response(self, code, message=None):
+        # the BufferingHttpServer will send Connection: close , while
+        # the BaseHTTPRequestHandler will only accept int code.
+        # workaround both of them.
+        BaseHTTPRequestHandler.send_response(self, int(code), message)
+
+    def send_header(self, key, value):
+        if key == 'Connection' and value == 'close':
+            self.close_connection = 1
+        DAVRequestHandler.send_header(self, key, value)
+
     def do_PUT(self):
         dc=self.IFACE_CLASS        
         uri=urlparse.urljoin(self.get_baseuri(dc), self.path)

From 4b30a4787979f269b490c21ddc273efdf79a3806 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Thu, 24 Jun 2010 18:01:22 +0300
Subject: [PATCH 105/121] Doc WebDAV: allow auth of False db, even with user
 set

This is another workaround for nautilus, that descends into the db (=does
authorization) and then requests info for the parent again
(causing db=False later).

bzr revid: p_christ@hol.gr-20100624150122-tntum07kgth2ogup
---
 addons/document_webdav/webdav_server.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py
index 4dec2eff0f4..610e51a0f07 100644
--- a/addons/document_webdav/webdav_server.py
+++ b/addons/document_webdav/webdav_server.py
@@ -183,7 +183,7 @@ class DAVAuthProvider(OpenERPAuthProvider):
         """ authenticate, but also allow the False db, meaning to skip
             authentication when no db is specified.
         """
-        if db is False and user is None and passwd is None:
+        if db is False:
             return True
         return OpenERPAuthProvider.authenticate(self, db, user, passwd, client_address)
 

From cccd6992950de87cbf1b098d6993082a447e15a5 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Thu, 24 Jun 2010 18:17:35 +0300
Subject: [PATCH 106/121] Doc content index: expand tabs, OpenDocument.

bzr revid: p_christ@hol.gr-20100624151735-ekzzke6rluwklcy2
---
 addons/document/std_index.py | 54 ++++++++++++++++++++++++------------
 1 file changed, 37 insertions(+), 17 deletions(-)

diff --git a/addons/document/std_index.py b/addons/document/std_index.py
index c4f7d787d4d..3c6d77d3cec 100644
--- a/addons/document/std_index.py
+++ b/addons/document/std_index.py
@@ -39,14 +39,14 @@ def _to_unicode(s):
 class TxtIndex(indexer):
     def _getMimeTypes(self):
         return ['text/plain','text/html','text/diff','text/xml', 'text/*', 
-        'application/xml']
+            'application/xml']
     
     def _getExtensions(self):
         return ['.txt', '.py']
 
     def _doIndexContent(self, content):
         return content
-        
+
 cntIndex.register(TxtIndex())
 
 class PptxIndex(indexer):
@@ -131,21 +131,41 @@ class ImageNoIndex(indexer):
 
 cntIndex.register(ImageNoIndex())
 
-#class Doc(indexer):
-    #def _getDefMime(self,ext):
+# other opendocument formats:
+#vnd.oasis.opendocument.chart-template
+#vnd.oasis.opendocument.chart
+#vnd.oasis.opendocument.database
+#vnd.oasis.opendocument.formula-template
+#vnd.oasis.opendocument.formula
+#vnd.oasis.opendocument.graphics-template
+#vnd.oasis.opendocument.graphics
+#vnd.oasis.opendocument.image
+#vnd.oasis.opendocument.presentation-template
+#vnd.oasis.opendocument.presentation
+#vnd.oasis.opendocument.spreadsheet-template
+#vnd.oasis.opendocument.spreadsheet
+
+class OpenDoc(indexer):
+    """ Index OpenDocument files.
+    
+        Q: is it really worth it to index spreadsheets, or do we only get a
+        meaningless list of numbers (cell contents) ?
+        """
+    def _getMimeTypes(self):
+        otypes = [ 'text', 'text-web', 'text-template', 'text-master' ]
+        return map(lambda a: 'application/vnd.oasis.opendocument.'+a, otypes)
+    
+    def _getExtensions(self):
+        return ['.odt', '.ott', ] # '.ods'
+
+    def _doIndexContent(self, content):
+        s = StringIO.StringIO(content)
+        o = odt2txt.OpenDocumentTextFile(s)
+        result = _to_unicode(o.toString())
+        s.close()
+        return result
+
+cntIndex.register(OpenDoc())
 
-#def content_index(content, filename=None, content_type=None):
-    #fname,ext = os.path.splitext(filename)
-    #result = ''
-    #elif ext in ('.xls','.ods','.odt','.odp'):
-        #s = StringIO.StringIO(content)
-        #o = odt2txt.OpenDocumentTextFile(s)
-        #result = _to_unicode(o.toString())
-        #s.close()
-    #elif ext in ('.txt','.py','.patch','.html','.csv','.xml'):
-        #result = content
-    #else:
-        #result = content
-    #return result
 
 #eof

From 741c317b42b7def35b200e24ffc4d82074efcb32 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Thu, 24 Jun 2010 18:27:10 +0300
Subject: [PATCH 107/121] Doc std_index: compact some comment

There is OpenDocument types we do not currently attempt to index, because
their text may not make much sense. It is very easy, though, to add them
in the list and get them indexed.

bzr revid: p_christ@hol.gr-20100624152710-r6cm1384l7mq6pcz
---
 addons/document/std_index.py | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/addons/document/std_index.py b/addons/document/std_index.py
index 4517f38b5d3..25b7e1f081f 100644
--- a/addons/document/std_index.py
+++ b/addons/document/std_index.py
@@ -178,18 +178,10 @@ class ImageNoIndex(indexer):
 cntIndex.register(ImageNoIndex())
 
 # other opendocument formats:
-#vnd.oasis.opendocument.chart-template
-#vnd.oasis.opendocument.chart
-#vnd.oasis.opendocument.database
-#vnd.oasis.opendocument.formula-template
-#vnd.oasis.opendocument.formula
-#vnd.oasis.opendocument.graphics-template
-#vnd.oasis.opendocument.graphics
-#vnd.oasis.opendocument.image
-#vnd.oasis.opendocument.presentation-template
-#vnd.oasis.opendocument.presentation
-#vnd.oasis.opendocument.spreadsheet-template
-#vnd.oasis.opendocument.spreadsheet
+# chart-template chart database
+# formula-template formula graphics-template graphics
+# image
+# presentation-template presentation spreadsheet-template spreadsheet
 
 class OpenDoc(indexer):
     """ Index OpenDocument files.

From f7ee7c4b14cb8427f6050a7e532b94025ab04aa6 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Thu, 24 Jun 2010 18:36:47 +0300
Subject: [PATCH 108/121] Doc std_index: bring back the .doc index, using
 antiword

It may not work in all plarforms, but is the only thing we have so far
for those common files.

bzr revid: p_christ@hol.gr-20100624153647-73l75xuolkzhkp9b
---
 addons/document/std_index.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/document/std_index.py b/addons/document/std_index.py
index 25b7e1f081f..2a588a017c1 100644
--- a/addons/document/std_index.py
+++ b/addons/document/std_index.py
@@ -95,8 +95,8 @@ class DocIndex(indexer):
         return ['.doc']
 
     def _doIndexFile(self,fname):
-        #fp = Popen(['antiword', fname], shell=False, stdout=PIPE).stdout
-        return _to_unicode( 'None')
+        fp = Popen(['antiword', fname], shell=False, stdout=PIPE).stdout
+        return _to_unicode(fp.read())
 
 cntIndex.register(DocIndex())
 

From 25a66882be59400fc6a40640efe37ca5d3097c9f Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Thu, 24 Jun 2010 18:42:04 +0300
Subject: [PATCH 109/121] Doc index: Small improvement at the helper script.

Let it run, display output.

bzr revid: p_christ@hol.gr-20100624154204-wx4tius06tq32awe
---
 addons/document/test_cindex.py | 3 +++
 1 file changed, 3 insertions(+)
 mode change 100644 => 100755 addons/document/test_cindex.py

diff --git a/addons/document/test_cindex.py b/addons/document/test_cindex.py
old mode 100644
new mode 100755
index 7c0bcb987f3..267e0497950
--- a/addons/document/test_cindex.py
+++ b/addons/document/test_cindex.py
@@ -31,6 +31,9 @@ for fname in args:
         else:
             res = cntIndex.doIndex(None, fname, None, fname,True)
 
+        if options.verbose:
+            for line in res[:5]:
+                print line
     except Exception,e:
         import traceback,sys
         tb_s = reduce(lambda x, y: x+y, traceback.format_exception( sys.exc_type, sys.exc_value, sys.exc_traceback))

From a82a4a5b2168e78cc6f88562e20f90fbac9952e2 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Fri, 25 Jun 2010 13:28:37 +0300
Subject: [PATCH 110/121] Document report: drop views before replacing them

Since they have changed columns, we cannot use the 'or replace' method
of postgres, we have to really drop.

bzr revid: p_christ@hol.gr-20100625102837-89jvyg9xpp8jqc7m
---
 addons/document/report/document_report.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/addons/document/report/document_report.py b/addons/document/report/document_report.py
index d3964fc2d99..ab517ce069c 100644
--- a/addons/document/report/document_report.py
+++ b/addons/document/report/document_report.py
@@ -53,8 +53,8 @@ class report_document_user(osv.osv):
         'partner':fields.char('Partner',size=64,readonly=True),
      }
     def init(self, cr):
-         cr.execute("""
-            create or replace view report_document_user as (
+        tools.drop_view_if_exists(cr, 'report_document_user')
+        cr.execute("""CREATE VIEW report_document_user AS (
                  select
                      min(f.id) as id,
                      to_char(f.create_date, 'YYYY') as name,
@@ -94,7 +94,7 @@ class report_files_partner(osv.osv):
     def init(self, cr):
          tools.drop_view_if_exists(cr, 'report_files_partner')
          cr.execute("""
-            create or replace view report_files_partner as (
+            CREATE VIEW report_files_partner as (
                 select min(f.id) as id,count(*) as nbr,
                        to_char(f.create_date,'YYYY') as name,
                        min(to_char(f.create_date,'MM')) as month,
@@ -119,8 +119,10 @@ class report_document_file(osv.osv):
      }
     _order = "month"
     def init(self, cr):
-         cr.execute("""
-            create or replace view report_document_file as (
+        print "called an init!"
+        tools.drop_view_if_exists(cr, 'report_document_file')
+        cr.execute("""
+            CREATE VIEW report_document_file AS (
                 select min(f.id) as id,
                        count(*) as nbr,
                        min(EXTRACT(MONTH FROM f.create_date)||'-'||to_char(f.create_date,'Month')) as month,
@@ -145,8 +147,9 @@ class report_document_wall(osv.osv):
              }
 
     def init(self, cr):
-         cr.execute("""
-            create or replace view report_document_wall as (
+        tools.drop_view_if_exists(cr, 'report_document_wall')
+        cr.execute("""
+            CREATE VIEW report_document_wall as (
                select max(f.id) as id,
                to_char(min(f.create_date),'YYYY-MM-DD HH24:MI:SS') as last,
                f.user_id as user_id, f.user_id as user,

From c759d434055a94de54780fbfd6d4a68391e1a49a Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Fri, 25 Jun 2010 13:29:33 +0300
Subject: [PATCH 111/121] Doc storage: port logging to pythonic one.

A cleanup to get rid of netsvc.Logger()

Conflicts:

	document/document_storage.py

bzr revid: p_christ@hol.gr-20100625102933-pdymhisr2c7xzemr
---
 addons/document/document_storage.py | 33 +++++++++++++++--------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/addons/document/document_storage.py b/addons/document/document_storage.py
index e680bca5983..90be2bc47df 100644
--- a/addons/document/document_storage.py
+++ b/addons/document/document_storage.py
@@ -24,6 +24,8 @@ from osv import osv, fields
 import os
 import tools
 import base64
+import logging
+
 from tools.misc import ustr
 from tools.translate import _
 
@@ -96,6 +98,8 @@ class document_storage(osv.osv):
     """
     _name = 'document.storage'
     _description = 'Storage Media'
+    _doclog = logging.getLogger('document')
+
     _columns = {
         'name': fields.char('Name', size=64, required=True, select=1),
         'write_date': fields.datetime('Date Modified', readonly=True),
@@ -151,7 +155,7 @@ class document_storage(osv.osv):
                 # On a migrated db, some files may have the wrong storage type
                 # try to fix their directory.
                 if ira.file_size:
-                    netsvc.Logger().notifyChannel('document', netsvc.LOG_WARNING, "ir.attachment #%d does not have a filename, but is at filestore, fix it!" % ira.id)
+                    self._doclog.warning( "ir.attachment #%d does not have a filename, but is at filestore, fix it!" % ira.id)
                 return None
             fpath = os.path.join(boo.path, ira.store_fname)
             return file(fpath, 'rb').read()
@@ -167,7 +171,7 @@ class document_storage(osv.osv):
                 # On a migrated db, some files may have the wrong storage type
                 # try to fix their directory.
                 if ira.file_size:
-                    netsvc.Logger().notifyChannel('document',netsvc.LOG_WARNING,"ir.attachment #%d does not have a filename, trying the name." %ira.id)
+                    self._doclog.warning("ir.attachment #%d does not have a filename, trying the name." %ira.id)
                 sfname = ira.name
             fpath = os.path.join(boo.path,ira.store_fname or ira.name)
             if os.path.exists(fpath):
@@ -187,7 +191,6 @@ class document_storage(osv.osv):
         if not context:
             context = {}
         boo = self.browse(cr, uid, id, context)
-        logger = netsvc.Logger()
         if fil_obj:
             ira = fil_obj
         else:
@@ -195,7 +198,7 @@ class document_storage(osv.osv):
 
         if not boo.online:
             raise RuntimeError('media offline')
-        logger.notifyChannel('document', netsvc.LOG_DEBUG, "Store data for ir.attachment #%d" % ira.id)
+        self._doclog.debug( "Store data for ir.attachment #%d" % ira.id)
         store_fname = None
         fname = None
         if boo.type == 'filestore':
@@ -214,14 +217,14 @@ class document_storage(osv.osv):
                 fp = file(fname, 'wb')
                 fp.write(data)
                 fp.close()
-                logger.notifyChannel('document', netsvc.LOG_DEBUG, "Saved data to %s" % fname)
+                self._doclog.debug( "Saved data to %s" % fname)
                 filesize = len(data) # os.stat(fname).st_size
                 store_fname = os.path.join(flag, filename)
 
                 # TODO Here, an old file would be left hanging.
 
-            except Exception, e :
-                netsvc.Logger().notifyChannel('document', netsvc.LOG_WARNING, "Couldn't save data: %s" % str(e))
+            except Exception, e:
+                self._doclog.warning( "Couldn't save data to %s", path, exc_info=True)
                 raise except_orm(_('Error!'), str(e))
         elif boo.type == 'db':
             filesize = len(data)
@@ -250,14 +253,12 @@ class document_storage(osv.osv):
                 fp = file(fname,'wb')
                 fp.write(data)
                 fp.close()
-                logger.notifyChannel('document',netsvc.LOG_DEBUG,"Saved data to %s" % fname)
+                self._doclog.debug("Saved data to %s", fname)
                 filesize = len(data) # os.stat(fname).st_size
                 store_fname = os.path.join(*npath)
                 # TODO Here, an old file would be left hanging.
             except Exception,e :
-                import traceback
-                traceback.print_exc()
-                netsvc.Logger().notifyChannel('document',netsvc.LOG_WARNING,"Couldn't save data: %s" % e)
+                self._doclog.warning("Couldn't save data:", exc_info=True)
                 raise except_orm(_('Error!'), str(e))
         else:
             raise TypeError("No %s storage" % boo.type)
@@ -271,8 +272,8 @@ class document_storage(osv.osv):
             try:
                 mime, icont = cntIndex.doIndex(data, ira.datas_fname,
                 ira.file_type or None, fname)
-            except Exception, e:
-                logger.notifyChannel('document', netsvc.LOG_DEBUG, 'Cannot index file: %s' % str(e))
+            except Exception:
+                self._doclog.debug('Cannot index file:', exc_info=True)
                 pass
 
             # a hack: /assume/ that the calling write operation will not try
@@ -284,7 +285,7 @@ class document_storage(osv.osv):
             file_node.content_type = mime
             return True
         except Exception, e :
-            netsvc.Logger().notifyChannel('document', netsvc.LOG_WARNING, "Couldn't save data: %s" % str(e))
+            self._doclog.warning( "Couldn't save data:", exc_info=True)
             # should we really rollback once we have written the actual data?
             # at the db case (only), that rollback would be safe
             raise except_orm(_('Error at doc write!'), str(e))
@@ -319,9 +320,9 @@ class document_storage(osv.osv):
                 try:
                     os.unlink(fname)
                 except Exception, e:
-                    netsvc.Logger().notifyChannel('document', netsvc.LOG_WARNING, "Could not remove file %s, please remove manually." % fname)
+                    self._doclog.warning("Could not remove file %s, please remove manually.", fname, exc_info=True)
             else:
-                netsvc.Logger().notifyChannel('document', netsvc.LOG_WARNING, "Unknown unlink key %s" % ktype)
+                self._doclog.warning("Unknown unlink key %s" % ktype)
 
         return True
 

From 29833594654fe28a87ac77794cc6c2ad7331615e Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Fri, 25 Jun 2010 15:16:13 +0300
Subject: [PATCH 112/121] Document: clear the storage form view.

bzr revid: p_christ@hol.gr-20100625121613-q4uehtu6lfl6kofw
---
 addons/document/document_view.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 9463e0f7585..010a3352a37 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -13,10 +13,11 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Storage Media">
-                <group colspan="4" col="4">
+                <group colspan="4" col="6">
                     <field name="name" select="1" colspan="4"/>
-                    <field name="user_id"/>
                     <field name="type"/>
+                    <newline/>
+                    <field name="user_id"/>
                     <field name="online"/>
                     <field name="readonly"/>
                 </group>

From 658960d605fb45646fe5cb647705621007d7af7b Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Fri, 25 Jun 2010 15:16:22 +0300
Subject: [PATCH 113/121] Document: better expression for tree view

bzr revid: p_christ@hol.gr-20100625121622-brmw4714rztflnh2
---
 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 010a3352a37..6ada0a6ef65 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -312,7 +312,7 @@
         <field name="type">tree</field>
         <field name="priority" eval="1"/>
         <field name="arch" type="xml">
-            <tree colors="blue:type in ('url')"> 
+            <tree colors="blue:type in ('url',)"> 
                 <field name="name"/>
                 <field name="type"/>
                 <field name="datas_fname"/>

From 47f486b2cf6e6bbddd99177176c951eff6ec517d Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Fri, 25 Jun 2010 15:16:46 +0300
Subject: [PATCH 114/121] Document: simplify the storage tree, search views.

As discussed in the review, these views must remain simple. No need
to have extended searching options for storage media, anyway.

bzr revid: p_christ@hol.gr-20100625121646-8lps6xi11e66fz79
---
 addons/document/document_view.xml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 6ada0a6ef65..714c6d2c107 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -36,8 +36,6 @@
             <tree string="Storage Media" toolbar="1">
                 <field name="name"/>
                 <field name="type"/>
-                <field name="online"/>
-                <field name="readonly"/>
             </tree>
         </field>
     </record>
@@ -48,16 +46,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Document storage">
-                    <filter string="Database Storage" domain="[('type','=','db')]"/>
-                    <filter string="Internal File storage" domain="[('type','=','filestore')]"/>
-                    <filter string="External File storage" domain="[('type','=','realstore')]"/>
-                    <separator orientation="vertical"/>
                     <field name="name" />
-                    <field name="user_id" />                    
                     <newline/>
                     <group expand="0" string="Group By..." groups="base.group_extended">
                         <filter string="Type"  domain="[]" context="{'group_by':'type'}"/>
-                        <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>                                               
                     </group>
                </search>
             </field>

From 7369085786e1515746f33f9ed63be8796c39c7de Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 26 Jun 2010 17:15:23 +0200
Subject: [PATCH 115/121] [IMP] sale useability, fix stock, better uom handling

bzr revid: fp@tinyerp.com-20100626151523-40k3eqmegon0ovqg
---
 addons/crm/crm_phonecall.py                   |   4 +-
 addons/crm/crm_phonecall_menu.xml             |   4 +-
 addons/crm/crm_phonecall_view.xml             |   9 +-
 addons/product/product.py                     |  66 +++-----
 addons/product/product_data.xml               |   4 +-
 addons/product/product_view.xml               |  21 ++-
 addons/sale/sale.py                           |  15 ++
 addons/sale/sale_view.xml                     |   4 +-
 addons/stock/stock.py                         |   8 +-
 addons/stock/stock_sequence.xml               |   8 +-
 addons/stock/stock_view.xml                   |  85 +++++-----
 addons/stock/wizard/stock_move.py             |   4 +-
 addons/stock/wizard/stock_splitinto.py        |  43 ++---
 addons/stock/wizard/stock_splitinto_view.xml  |  53 +++---
 .../stock/wizard/stock_traceability_view.xml  | 154 +++++++++---------
 15 files changed, 231 insertions(+), 251 deletions(-)

diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 1d6a855c208..bcdcc2e9bf6 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -52,7 +52,7 @@ class crm_phonecall(osv.osv, crm_case):
                                     ('draft', 'Draft'), 
                                     ('open', 'Todo'), 
                                     ('cancel', 'Cancelled'), 
-                                    ('done', 'Closed'), 
+                                    ('done', 'Done'), 
                                     ('pending', 'Pending'),
                                 ], 'State', size=16, readonly=True, 
                                   help='The state is set to \'Draft\', when a case is created.\
@@ -89,7 +89,7 @@ class crm_phonecall(osv.osv, crm_case):
     _defaults = {
         'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), 
         'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0], 
-        'state': lambda *a: 'draft', 
+        'state': lambda *a: 'open', 
         'user_id': lambda self,cr,uid,ctx: uid,
         'active': lambda *a: 1, 
     }
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index e269cadfaf1..6c5472afa99 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -67,7 +67,7 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_phone_tree_view"/>
         <field name="domain" eval="'[(\'categ_id\',\'=\','+str(ref('categ_phone1'))+')]'"/>
-        <field name="context">{'set_editable':True,'default_state':'open'}</field>
+        <field name="context">{'set_editable':True,'default_state':'open','search_default_current':1,'search_default_today':1}</field>
         <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
     </record>
 
@@ -103,7 +103,7 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_phone_tree_view"/>
         <field name="domain" eval="'[(\'categ_id\',\'=\','+str(ref('categ_phone2'))+')]'"/>
-        <field name="context">{'default_state':'open'}</field>
+        <field name="context">{'default_state':'open','search_default_current':1}</field>
         <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
     </record>
 
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index ef068e122a3..bb143964d70 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -245,17 +245,22 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Phonecalls">
+               <filter icon="terp-go-today" string="Current"
+                   name="current"
+                   domain="[('state','in', ('draft','open','pending'))]"/>
+               <separator orientation="vertical"/>
                <filter icon="terp-go-today" string="Today"
                    domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),\
                     ('date','&gt;=',datetime.strftime('%%Y-%%m-%%d 00:00:00'))]"
+                   name="today"
                    help="Todays's Phonecalls"
                />
                <filter icon="terp-go-week"
                    string="7 Days"
                    help="Phonecalls during last 7 days"
-                   domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')),\
-                    ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                   domain="[('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                />
+
                <separator orientation="vertical"/>
                <field name="name" string="Call Summary"/>
                <field name="partner_id"/>
diff --git a/addons/product/product.py b/addons/product/product.py
index 8c35990cf9e..7787a8e646e 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -48,35 +48,25 @@ class product_uom(osv.osv):
     _name = 'product.uom'
     _description = 'Product Unit of Measure'
 
-    def _factor(self, cursor, user, ids, name, arg, context):
+    def _factor_inv(self, cursor, user, ids, name, arg, context):
         res = {}
         for uom in self.browse(cursor, user, ids, context=context):
             if uom.factor:
-                if uom.factor_inv_data:
-                    res[uom.id] = uom.factor_inv_data
-                else:
-                    res[uom.id] = round(1 / uom.factor, 6)
+                res[uom.id] = round(1 / uom.factor, 6)
             else:
                 res[uom.id] = 0.0
         return res
 
-    def _factor_inv(self, cursor, user, id, name, value, arg, context):
-        ctx = context.copy()
-        if 'read_delta' in ctx:
-            del ctx['read_delta']
+    def _factor_inv_write(self, cursor, user, id, name, value, arg, context):
         if value:
-            data = 0.0
-            if round(1 / round(1/value, 6), 6) != value:
-                data = value
             self.write(cursor, user, id, {
                 'factor': round(1/value, 6),
-                'factor_inv_data': data,
-                }, context=ctx)
+            }, context=context)
         else:
             self.write(cursor, user, id, {
                 'factor': 0.0,
-                'factor_inv_data': 0.0,
-                }, context=ctx)
+            }, context=context)
+        return True
 
     _columns = {
         'name': fields.char('Name', size=64, required=True, translate=True),
@@ -85,17 +75,17 @@ class product_uom(osv.osv):
         'factor': fields.float('Ratio', digits=(12, 6), required=True,
             help='The coefficient for the formula:\n' \
                     '1 (base unit) = coeff (this unit). Ratio = 1 / Factor.'),
-        'factor_inv': fields.function(_factor, digits=(12, 6),
+        'factor_inv': fields.function(_factor_inv, digits=(12, 6),
+            fnct_inv=_factor_inv_write,
             method=True, string='Factor',
             help='The coefficient for the formula:\n' \
                     'coeff (base unit) = 1 (this unit). Factor = 1 / Rate.'),
-        'factor_inv_data': fields.float('Factor', digits=(12, 6)),
         'rounding': fields.float('Rounding Precision', digits=(16, 3), required=True,
             help="The computed quantity will be a multiple of this value. Use 1.0 for products that can not be split."),
         'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the unit of measure without removing it."),
-        'uom_factor': fields.selection([('bigger','Bigger than the Default'),
-                                        ('smaller','Smaller than the Default'),
-                                        ('','')],'UoM Factor'),
+        'uom_factor': fields.selection([('bigger','Bigger than the default'),
+                                        ('smaller','Smaller than the default'),
+                                        ('default','The Default unit of measure')],'Type of Unit', required=1),
     }
 
     _defaults = {
@@ -103,12 +93,11 @@ class product_uom(osv.osv):
         'factor_inv': lambda *a: 1.0,
         'active': lambda *a: 1,
         'rounding': lambda *a: 0.01,
-        'uom_factor': lambda *a: 'smaller',
+        'uom_factor': lambda *a: 'default',
     }
 
     _sql_constraints = [
         ('factor_gt_zero', 'CHECK (factor!=0)', 'Value of the factor can never be 0 !'),
-        ('factor_inv_data_gt_zero', 'CHECK (factor_inv_data!=0)', 'Value of the factor_inv_data can never be 0 !'),
     ]
 
     def _compute_qty(self, cr, uid, from_uom_id, qty, to_uom_id=False):
@@ -124,15 +113,9 @@ class product_uom(osv.osv):
     def _compute_qty_obj(self, cr, uid, from_unit, qty, to_unit, context={}):
         if from_unit.category_id.id <> to_unit.category_id.id:
             return qty
-        if from_unit.factor_inv_data:
-            amount = qty * from_unit.factor_inv_data
-        else:
-            amount = qty / from_unit.factor
+        amount = qty / from_unit.factor
         if to_unit:
-            if to_unit.factor_inv_data:
-                amount = rounding(amount / to_unit.factor_inv_data, to_unit.rounding)
-            else:
-                amount = rounding(amount * to_unit.factor, to_unit.rounding)
+            amount = rounding(amount * to_unit.factor, to_unit.rounding)
         return amount
 
     def _compute_price(self, cr, uid, from_uom_id, price, to_uom_id=False):
@@ -145,26 +128,15 @@ class product_uom(osv.osv):
             from_unit, to_unit = uoms[-1], uoms[0]
         if from_unit.category_id.id <> to_unit.category_id.id:
             return price
-        if from_unit.factor_inv_data:
-            amount = price / from_unit.factor_inv_data
-        else:
-            amount = price * from_unit.factor
+        amount = price * from_unit.factor
         if to_uom_id:
-            if to_unit.factor_inv_data:
-                amount = amount * to_unit.factor_inv_data
-            else:
-                amount = amount / to_unit.factor
+            amount = amount / to_unit.factor
         return amount
 
-    def onchange_factor_inv(self, cursor, user, ids, value):
-        if value == 0.0:
-            return {'value': {'factor': 0}}
-        return {'value': {'factor': round(1/value, 6)}}
-
     def onchange_factor(self, cursor, user, ids, value):
-        if value == 0.0:
-            return {'value': {'factor_inv': 0}}
-        return {'value': {'factor_inv': round(1/value, 6)}}
+        if value == 'default':
+            return {'value': {'factor': 1, 'factor_inv': 1}}
+        return {}
 
 product_uom()
 
diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index 4763c191817..ff4da8254ec 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -30,7 +30,7 @@
         <record id="product_uom_kgm" model="product.uom">
             <field name="category_id" ref="product_uom_categ_kgm"/>
             <field name="name">KGM</field>
-            <field name="factor">1000.0</field>
+            <field name="factor">1</field>
         </record>
         <record id="uom_hour" model="product.uom">
             <field name="name">Hour</field>
@@ -45,7 +45,7 @@
         <record id="product_uom_ton" model="product.uom">
             <field name="category_id" ref="product_uom_categ_kgm"/>
             <field name="name">TON</field>
-            <field name="factor">1.0</field>
+            <field name="factor">0.001</field>
         </record>
         <record id="product_uom_meter" model="product.uom">
             <field name="category_id" ref="uom_categ_length"/>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index e302ed912c0..a9f408db9f2 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -298,7 +298,6 @@
                     <field name="name"/>
                     <field name="category_id"/>
                     <field name="factor"/>
-                    <field name="factor_inv"/>
                     <field name="rounding"/>
                 </tree>
             </field>
@@ -310,14 +309,18 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Units of Measure">
-                    <field name="name" select="1"/>
-                    <field name="category_id" select="1"/>
-                    <field name="factor" select="1" attrs="{'readonly':[('uom_factor','=','bigger')]}"/>
-                    <field name="factor_inv_data" select="1" string="Factor Data" attrs="{'readonly':[('uom_factor','=','smaller')]}"/>
-                    <field name="factor_inv" invisible="1"/>
-                    <field name="rounding"/>
-                    <field name="uom_factor"/>
-                    <field name="active"/>
+                    <group col="6" colspan="4">
+                        <field name="name" select="1"/>
+                        <field name="category_id" select="1"/>
+                        <field name="active"/>
+                        <field name="uom_factor" on_change="onchange_factor(uom_factor)"/>
+                        <group colspan="2" col="2">
+                            <field name="factor" select="1" attrs="{'invisible':[('uom_factor','&lt;&gt;','smaller')]}"/>
+                            <field name="factor_inv" select="1" string="Factor Data" attrs="{'invisible':[('uom_factor','&lt;&gt;','bigger')]}"/>
+                        </group>
+                        <newline/>
+                        <field name="rounding"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index b7229fcef46..7d32e3c721a 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -97,6 +97,7 @@ class sale_order(osv.osv):
             res[order.id]['amount_total'] = res[order.id]['amount_untaxed'] + res[order.id]['amount_tax']
         return res
 
+    # This is False
     def _picked_rate(self, cr, uid, ids, name, arg, context=None):
         if context is None:
             context = {}
@@ -1021,6 +1022,7 @@ class sale_order_line(osv.osv):
                     }
             result['product_uom_qty'] = qty
 
+        uom2 = False
         if uom:
             uom2 = product_uom_obj.browse(cr, uid, uom)
             if product_obj.uom_id.category_id.id != uom2.category_id.id:
@@ -1076,6 +1078,19 @@ class sale_order_line(osv.osv):
                 result['product_uos_qty'] = qty
             result['th_weight'] = q * product_obj.weight        # Round the quantity up
 
+        if not uom2:
+            uom2 = product_obj.uom_id
+        if (product_obj.type=='product') and (product_obj.virtual_available * product_obj.uom_id.factor < qty * uom2.factor) \
+          and (product_obj.procure_method=='make_to_stock'):
+            warning = {
+                'title': _('Not enough stock !'),
+                'message': _('You plan to sell %.2f %s but you only have %.2f %s available !\nThe real stock is %.2f %s. (without reservations)') %
+                    (qty, uom2 and uom2.name or product_obj.uom_id.name,
+                     max(0,product_obj.virtual_available), product_obj.uom_id.name,
+                     max(0,product_obj.qty_available), product_obj.uom_id.name)
+            }
+
+
         # get unit price
 
         if not pricelist:
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 7a46b213b43..4bb3d603ce7 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -134,7 +134,7 @@
                                             <field colspan="4"
                                                 context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
                                                 name="product_id"
-                                                on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], True, parent.date_order, product_packaging, parent.fiscal_position)"
+                                                on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], True, parent.date_order, product_packaging, parent.fiscal_position, False)"
                                                 />
                                             <field
                                                 context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
@@ -147,7 +147,7 @@
                                             <field
                                                 name="product_packaging"
                                                 context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
-                                                on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging, parent.fiscal_position)"
+                                                on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging, parent.fiscal_position, False)"
                                                 domain="[('product_id','=',product_id)]"
                                                 groups="base.group_extended"/>
 
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 9dca7325314..acc4378398e 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -408,7 +408,7 @@ stock_location()
 
 class stock_tracking(osv.osv):
     _name = "stock.tracking"
-    _description = "Stock Tracking Lots"
+    _description = "Packs"
 
     def checksum(sscc):
         salt = '31' * 8 + '3'
@@ -424,7 +424,7 @@ class stock_tracking(osv.osv):
 
     _columns = {
         'name': fields.char('Tracking ID', size=64, required=True),
-        'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the tracking lots without removing it."),
+        'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the pack without removing it."),
         'serial': fields.char('Reference', size=64),
         'move_ids': fields.one2many('stock.move', 'tracking_id', 'Moves Tracked'),
         'date': fields.datetime('Created Date', required=True),
@@ -1308,7 +1308,7 @@ class stock_move(osv.osv):
         return (res and res[0]) or False
     _name = "stock.move"
     _description = "Stock Move"
-    _order = 'date_planned desc'
+    _order = 'date_expected desc, id'
     _log_create = False
 
     def name_get(self, cr, uid, ids, context={}):
@@ -1362,7 +1362,7 @@ class stock_move(osv.osv):
         'address_id': fields.many2one('res.partner.address', 'Dest. Address', help="Address where goods are to be delivered"),
 
         'prodlot_id': fields.many2one('stock.production.lot', 'Production Lot', help="Production lot is used to put a serial number on the production"),
-        'tracking_id': fields.many2one('stock.tracking', 'Tracking Lot', select=True, help="Tracking lot is the code that will be put on the logistical unit/pallet"),
+        'tracking_id': fields.many2one('stock.tracking', 'Pack', select=True, help="This is the code that will be put on the logistical unit: pallet, box, pack."),
 #       'lot_id': fields.many2one('stock.lot', 'Consumer lot', select=True, readonly=True),
 
         'auto_validate': fields.boolean('Auto Validate'),
diff --git a/addons/stock/stock_sequence.xml b/addons/stock/stock_sequence.xml
index 9c5083d13b4..06d898c6637 100644
--- a/addons/stock/stock_sequence.xml
+++ b/addons/stock/stock_sequence.xml
@@ -61,11 +61,11 @@
     Sequences from tracking numbers
     -->
         <record id="sequence_type_serial" model="ir.sequence.type">
-            <field name="name">Stock Production Lots</field>
+            <field name="name">Production Lots</field>
             <field name="code">stock.lot.serial</field>
         </record>
         <record id="sequence_production_lots" model="ir.sequence">
-            <field name="name">Stock Production Lots</field>
+            <field name="name">Production Lots</field>
             <field name="code">stock.lot.serial</field>
             <field name="prefix"></field>
             <field name="padding">7</field>
@@ -74,12 +74,12 @@
         </record>
 
         <record id="sequence_type_tracking" model="ir.sequence.type">
-            <field name="name">Stock Tracking Lots</field>
+            <field name="name">Packs</field>
             <field name="code">stock.lot.tracking</field>
         </record>
 
         <record id="sequence_tracking" model="ir.sequence">
-            <field name="name">Stock Tracking Lots</field>
+            <field name="name">Packs</field>
             <field name="code">stock.lot.tracking</field>
             <field name="prefix"></field>
             <field name="padding">7</field>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 0129fbe8b8d..699a11a7a4b 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -154,7 +154,7 @@
             <field name="model">stock.tracking</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Tracking/Serial">
+                <form string="Packs">
                     <field name="name" select="1"/>
                     <field name="serial" select="1"/>
                     <field name="date" select="1"/>
@@ -167,7 +167,7 @@
             <field name="model">stock.tracking</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Tracking/Serial">
+                <tree string="Packs">
                     <field name="name"/>
                     <field name="serial"/>
                     <field name="date"/>
@@ -176,7 +176,7 @@
             </field>
         </record>
         <record id="action_tracking_form" model="ir.actions.act_window">
-            <field name="name">Tracking Lots</field>
+            <field name="name">Packs</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">stock.tracking</field>
             <field name="view_type">form</field>
@@ -193,7 +193,7 @@
             <field name="type">tree</field>
             <field name="field_parent">child_ids</field>
             <field name="arch" type="xml">
-                <tree colors="grey:not active" string="Tracking Number">
+                <tree colors="grey:not active" string="Packs">
                     <field name="name" />
                     <field name="serial" />
                     <field name="date" />
@@ -637,15 +637,14 @@
                                         type="action" icon="terp-stock_effects-object-colorize"
                                         states="draft,waiting,confirmed,assigned" />
                                     <field groups="base.group_extended" name="tracking_id"/>
-                                    <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                                    <button name="setlast_tracking" string="Put in current pack" type="object"
                                         attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" 
-                                        groups="base.group_extended" 
                                         icon="terp-stock_effects-object-colorize" 
+                                        groups="base.group_extended" 
                                         states="draft,assigned,confirmed,done"/>
-                                    <button name="setlast_tracking" string="Set Last Tracking" type="object"
-                                        attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" 
-                                        icon="terp-stock_effects-object-colorize" 
+                                    <button name="%(split_into)d" string="Put in a new pack" type="action"
                                         groups="base.group_extended" 
+                                        icon="terp-stock_effects-object-colorize" 
                                         states="draft,assigned,confirmed,done"/>
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
@@ -688,9 +687,8 @@
                                              states="draft,waiting,confirmed,assigned"
                                             type="action" icon="terp-stock_effects-object-colorize"
                                               groups="base.group_extended" />
-                                            <button name="%(move_scrap)d" string="Scrap Move Line" type="action" icon="gtk-justify-fill"/>
-                                            <button name="%(split_into)d" string="Split Stock Moves" type="action"
-                                                attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
+                                            <button name="%(move_scrap)d" string="Scrap" type="action" icon="gtk-justify-fill"/>
+                                            <button name="%(split_into)d" string="Put in a new pack" type="action"
                                                 states="draft,assigned,confirmed,done"
                                                 groups="base.group_extended" 
                                                 icon="terp-stock_effects-object-colorize" />
@@ -804,15 +802,15 @@
                                     <field name="picking_id" />
                                     <field name="prodlot_id" groups="base.group_extended"/>
                                     <field groups="base.group_extended" name="tracking_id"/>
-                                    <button name="%(split_into)d" string="Split Stock Moves" type="action"
-                                        icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
-                                        states="draft,assigned,confirmed,done"
-                                        groups="base.group_extended"/>
-                                    <button name="setlast_tracking" string="Set Last Tracking" type="object"
+                                    <button name="setlast_tracking" string="Put in current pack" type="object"
                                         attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" 
                                         groups="base.group_extended" 
                                         icon="terp-stock_effects-object-colorize" 
                                         states="draft,assigned,confirmed,done"/>
+                                    <button name="%(split_into)d" string="Put in a new pack" type="action"
+                                        icon="terp-stock_effects-object-colorize"
+                                        states="draft,assigned,confirmed,done"
+                                        groups="base.group_extended"/>
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="date_planned"/>
@@ -859,9 +857,8 @@
                                             states="draft,waiting,confirmed,assigned"
                                             type="action" icon="terp-stock_effects-object-colorize"/>
                                             <label/>
-                                            <button name="%(split_into)d" string="Split Stock Moves" type="action"
-                                                attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" 
-                                              groups="base.group_extended" 
+                                            <button name="%(split_into)d" string="Put in a new pack" type="action"
+                                                groups="base.group_extended" 
                                                 icon="terp-stock_effects-object-colorize"
                                                 states="draft,assigned,confirmed,done"/>
                                             <separator colspan="4" string="Move State"/>
@@ -1014,16 +1011,15 @@
                                         states="draft,assigned,confirmed,done"
                                         groups="base.group_extended"/>
                                     <field name="tracking_id" groups="base.group_extended"/>
-                                    <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                                    <button name="setlast_tracking" string="Put in current pack" type="object"
                                         attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" 
+                                        groups="base.group_extended" 
+                                        icon="terp-stock_effects-object-colorize" 
+                                        states="draft,assigned,confirmed,done"/>
+                                    <button name="%(split_into)d" string="Put in a new pack" type="action"
                                         icon="terp-stock_effects-object-colorize"
                                         groups="base.group_extended" 
                                         states="draft,assigned,confirmed,done"/>
-                                <button name="setlast_tracking" string="Set Last Tracking" type="object"
-                                    attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" 
-                                    groups="base.group_extended" 
-                                    icon="terp-stock_effects-object-colorize" 
-                                    states="draft,assigned,confirmed,done"/>
                                     <field name="location_id"/>
                                     <field name="date_planned"/>
                                     <field name="state"/>
@@ -1059,8 +1055,7 @@
                                                 groups="base.group_extended" 
                                              />
                                             <label/>
-                                            <button name="%(split_into)d" string="Split Stock Moves" type="action"
-                                                attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" 
+                                            <button name="%(split_into)d" string="Put in a new pack" type="action"
                                                 groups="base.group_extended" 
                                                 icon="terp-stock_effects-object-colorize" 
                                                 states="draft,assigned,confirmed,done"/>
@@ -1082,7 +1077,7 @@
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-yes"/>
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" groups="base.group_extended" icon="gtk-apply"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
-                                <button name="%(action_partial_picking)d" states="assigned" string="Picking Done" type="action" icon="gtk-execute"/>
+                                <button name="%(action_partial_picking)d" states="assigned" string="Done" type="action" icon="gtk-execute"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
@@ -1215,16 +1210,16 @@
                                            type="action" icon="terp-stock_effects-object-colorize"
                                            states="draft,waiting,confirmed,assigned" />
                                     <field name="tracking_id" groups="base.group_extended"/>
-                                    <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                                    <button name="setlast_tracking" string="Put in current pack" type="object"
                                         groups="base.group_extended" 
                                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                                         states="draft,assigned,confirmed,done"/>
-                                    <button name="setlast_tracking" string="Set Last Tracking" type="object"
+                                    <button name="%(split_into)d" string="Put in a new pack" type="action"
                                         groups="base.group_extended" 
-                                        icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
+                                        icon="terp-stock_effects-object-colorize"
                                         states="draft,assigned,confirmed,done"/>
                                     <field name="state"/>
-                                     <button name="%(stock.move_scrap)d"
+                                    <button name="%(stock.move_scrap)d"
                                         string="Scrap Products" type="action"
                                         icon="gtk-convert" context="{'scrap': True}"
                                         states="draft,waiting,confirmed,assigned" />
@@ -1409,13 +1404,13 @@
                        states="draft,waiting,confirmed,assigned"
                         groups="base.group_extended"/>
                     <field groups="base.group_extended" name="tracking_id"/>
-                    <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                    <button name="setlast_tracking" string="Put in current pack" type="object"
                         groups="base.group_extended" 
                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                         states="draft,assigned,confirmed,done"/>
-                    <button name="setlast_tracking" string="Set Last Tracking" type="object"
+                    <button name="%(split_into)d" string="Put in a new pack" type="action"
                         groups="base.group_extended" 
-                        icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
+                        icon="terp-stock_effects-object-colorize"
                         states="draft,assigned,confirmed,done"/>
                     <field name="location_id"/>
                     <field name="location_dest_id"/>
@@ -1480,9 +1475,9 @@
                                       states="draft,waiting,confirmed,assigned"
                                       string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize" colspan="2" />
                                   <label/>
-                                  <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                                  <button name="%(split_into)d" string="Put in a new pack" type="action"
                                       groups="base.group_extended" 
-                                      icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
+                                      icon="terp-stock_effects-object-colorize"
                                       states="draft,assigned,confirmed,done"/>
                                 </group>
                             </group>
@@ -1573,15 +1568,15 @@
                         context="{'default_use_exist': picking_id.type=='in'}"
                         groups="base.group_extended"/>
                     <field name="tracking_id" groups="base.group_extended"/>
-                    <button name="%(split_into)d" string="Split Stock Moves" type="action"
-                        groups="base.group_extended" 
-                        icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
-                        states="draft,assigned,confirmed,done"/>
-                    <button name="setlast_tracking" string="Set Last Tracking" type="object"
+                    <button name="setlast_tracking" string="Put in current pack" type="object"
                         attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" 
                         groups="base.group_extended" 
                         icon="terp-stock_effects-object-colorize" 
                         states="draft,assigned,confirmed,done"/>
+                    <button name="%(split_into)d" string="Put in a new pack" type="action"
+                        groups="base.group_extended" 
+                        icon="terp-stock_effects-object-colorize"
+                        states="draft,assigned,confirmed,done"/>
                     <field name="date_planned"/>
                     <field name="backorder_id" groups="base.group_extended"/>
                     <field name="state"/>
@@ -1629,9 +1624,9 @@
                               groups="base.group_extended" 
                               type="action" icon="terp-stock_effects-object-colorize"/>
                               <label/>
-                               <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                               <button name="%(split_into)d" string="Put in a new pack" type="action"
                                   groups="base.group_extended" 
-                                  icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
+                                  icon="terp-stock_effects-object-colorize"
                                   states="draft,assigned,confirmed,done"/>
                               <label/>
                               <button name="%(track_line)d" string="Split in production lots" 
diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py
index d7d356cee1b..194f11dc9b4 100644
--- a/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.py
@@ -193,7 +193,7 @@ class split_in_production_lot(osv.osv_memory):
         'product_uom': fields.many2one('product.uom', 'Product UOM'),
         'line_ids': fields.one2many('stock.move.split.lines', 'lot_id', 'Lots Number'),
         'line_exist_ids': fields.one2many('stock.move.split.lines.exist', 'lot_id', 'Lots Existing Numbers'),
-        'use_exist' : fields.boolean('Use Exist'),
+        'use_exist' : fields.boolean('Existing Lot'),
      }
 
     def split_lot(self, cr, uid, ids, context=None):
@@ -293,7 +293,7 @@ class stock_move_split_lines(osv.osv_memory):
     _columns = {
         'name': fields.char('Tracking serial', size=64),
         'quantity': fields.integer('Quantity'),
-        'use_exist' : fields.boolean('Use Exist'),
+        'use_exist' : fields.boolean('Existing Lot'),
         'lot_id': fields.many2one('stock.move.split', 'Lot'),
         'action': fields.selection([('split','Split'),('keepinone','Keep in one lot')],'Action'),
     }
diff --git a/addons/stock/wizard/stock_splitinto.py b/addons/stock/wizard/stock_splitinto.py
index 0e27ae6561f..8623ba65875 100644
--- a/addons/stock/wizard/stock_splitinto.py
+++ b/addons/stock/wizard/stock_splitinto.py
@@ -40,32 +40,25 @@ class stock_split_into(osv.osv_memory):
 
         quantity = self.browse(cr, uid, data[0], context).quantity or 0.0
         for move in move_obj.browse(cr, uid, rec_id):
-            move_qty = move.product_qty
-            uos_qty_rest = move.product_uos_qty
-            quantity_rest = move_qty - quantity
-            if (quantity_rest == 0) or (quantity <= 0) :
-                continue
-            move_obj.setlast_tracking(cr, uid, [move.id], context=context)
-            move_obj.write(cr, uid, [move.id], {
-                'product_qty': quantity,
-                'product_uos_qty': quantity,
-                'product_uos': move.product_uom.id,
-            })
             quantity_rest = move.product_qty - quantity
-            tracking_id = track_obj.create(cr, uid, {})
-            default_val = {
-                'product_qty': quantity_rest,
-                'product_uos_qty': quantity_rest,
-                'tracking_id': tracking_id,
-                'state': move.state,
-                'product_uos': move.product_uom.id
-            }
-            current_move = move_obj.copy(cr, uid, move.id, default_val)
-            new_move.append(current_move)
-            update_val['product_qty'] = quantity
-            update_val['tracking_id'] = tracking_id
-            update_val['product_uos_qty'] = uos_qty_rest
-            move_obj.write(cr, uid, [move.id], update_val)
+            if quantity > 0:
+                move_obj.setlast_tracking(cr, uid, [move.id], context=context)
+                move_obj.write(cr, uid, [move.id], {
+                    'product_qty': quantity,
+                    'product_uos_qty': quantity,
+                    'product_uos': move.product_uom.id,
+                })
+            if quantity_rest>0:
+                quantity_rest = move.product_qty - quantity
+                tracking_id = track_obj.create(cr, uid, {})
+                default_val = {
+                    'product_qty': quantity_rest,
+                    'product_uos_qty': quantity_rest,
+                    'tracking_id': tracking_id,
+                    'state': move.state,
+                    'product_uos': move.product_uom.id
+                }
+                current_move = move_obj.copy(cr, uid, move.id, default_val)
         return {}
 stock_split_into()
 
diff --git a/addons/stock/wizard/stock_splitinto_view.xml b/addons/stock/wizard/stock_splitinto_view.xml
index 50555eea926..b6c19db5e9c 100644
--- a/addons/stock/wizard/stock_splitinto_view.xml
+++ b/addons/stock/wizard/stock_splitinto_view.xml
@@ -1,31 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    
-	    <record id="view_stock_move_split_wizard" model="ir.ui.view">
-	            <field name="name">Split move</field>
-	            <field name="model">stock.split.into</field>
-	            <field name="type">form</field>
-	            <field name="arch" type="xml">
-	                <form string="Split Move">
-                  <separator string="Set quantity to split your palets" colspan="4"/>
-	                	<field name="quantity"/>
-	                	<button icon='gtk-cancel' special="cancel"
-	                		string="Cancel" />
-	                	<button name="split" string="Ok"
-	                		type="object" icon="gtk-ok" />
-	                </form>
-	            </field>
-	        </record>
-	
-	        <record id="split_into" model="ir.actions.act_window">
-	            <field name="name">Split into</field>
-	            <field name="type">ir.actions.act_window</field>
-	            <field name="res_model">stock.split.into</field>
-	            <field name="view_type">form</field>
-	            <field name="view_mode">form</field>
-	            <field name="target">new</field>
-	        </record>
-	        
-	</data>
-</openerp>	
+        <record id="view_stock_move_split_wizard" model="ir.ui.view">
+            <field name="name">Split move</field>
+            <field name="model">stock.split.into</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            <form string="Split Move">
+                <separator string="Quantity for current pack" colspan="4"/>
+                <field name="quantity"/>
+                <button icon='gtk-cancel' special="cancel"
+                    string="Cancel" />
+                <button name="split" string="Ok"
+                    type="object" icon="gtk-ok" />
+            </form>
+            </field>
+        </record>
+        <record id="split_into" model="ir.actions.act_window">
+            <field name="name">Split into</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">stock.split.into</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/stock/wizard/stock_traceability_view.xml b/addons/stock/wizard/stock_traceability_view.xml
index 4a1f6b11b25..466f249a06b 100644
--- a/addons/stock/wizard/stock_traceability_view.xml
+++ b/addons/stock/wizard/stock_traceability_view.xml
@@ -8,25 +8,25 @@
                 <field name="model">stock.traceability.downstream</field>
                 <field name="type">form</field>
                 <field name="arch" type="xml">
-	                <form string="Downstream traceability">
-	                	
-	                	<label string="It will give information about the stock of a product as per the Tracking Lot" colspan="2" />
-				<separator string="" colspan="4" />
-	                	<button icon='gtk-cancel' special="cancel"
-	                		string="Cancel" />
-	                	<button name="action_traceability" string="Downstream traceability" type="object" context="{'type': 'move_history_ids2','field': ''}"/>
-	                	
-	                </form>
-	            </field>
-	        </record>	        
-     	
-	<act_window name="Downstream traceability"		    
-		res_model="stock.traceability.downstream"
-		src_model="stock.tracking"
-		view_mode="form"
-		target="new"        
-		key2="client_action_multi"    
-		id="action_view_stock_traceability_downstream"/>
+                    <form string="Downstream traceability">
+
+                        <label string="It will give information about the stock of a product as per the pack" colspan="2" />
+                <separator string="" colspan="4" />
+                        <button icon='gtk-cancel' special="cancel"
+                            string="Cancel" />
+                        <button name="action_traceability" string="Downstream traceability" type="object" context="{'type': 'move_history_ids2','field': ''}"/>
+
+                    </form>
+                </field>
+            </record>
+
+    <act_window name="Downstream traceability"
+        res_model="stock.traceability.downstream"
+        src_model="stock.tracking"
+        view_mode="form"
+        target="new"
+        key2="client_action_multi"
+        id="action_view_stock_traceability_downstream"/>
 
 <!-- =========stock.traceability.upstream================= -->
 
@@ -35,25 +35,25 @@
                 <field name="model">stock.traceability.upstream</field>
                 <field name="type">form</field>
                 <field name="arch" type="xml">
-	                <form string="Upstream traceability">
-	                	
-	                	<label string="It will give information about the stock of a product as per the Tracking Lot" colspan="2" />
-				<separator string="" colspan="4" />
-	                	<button icon='gtk-cancel' special="cancel"
-	                		string="Cancel" />
-	                	<button name="action_traceability" string="Upstream traceability" type="object" context="{'type': '','field': ''}"/>
-	                	
-	                </form>
-	            </field>
-	        </record>	        
-     	
-	<act_window name="Upstream traceability"		    
-		res_model="stock.traceability.upstream"
-		src_model="stock.tracking"
-		view_mode="form"
-		target="new"        
-		key2="client_action_multi"    
-		id="action_view_stock_traceability_upstream"/>
+                    <form string="Upstream traceability">
+
+                        <label string="It will give information about the stock of a product as per the pack" colspan="2" />
+                <separator string="" colspan="4" />
+                        <button icon='gtk-cancel' special="cancel"
+                            string="Cancel" />
+                        <button name="action_traceability" string="Upstream traceability" type="object" context="{'type': '','field': ''}"/>
+
+                    </form>
+                </field>
+            </record>
+
+    <act_window name="Upstream traceability"
+        res_model="stock.traceability.upstream"
+        src_model="stock.tracking"
+        view_mode="form"
+        target="new"
+        key2="client_action_multi"
+        id="action_view_stock_traceability_upstream"/>
 
 <!-- =========stock.traceability.lot.upstream================= -->
 
@@ -62,25 +62,25 @@
                 <field name="model">stock.traceability.lot.upstream</field>
                 <field name="type">form</field>
                 <field name="arch" type="xml">
-	                <form string="Stock traceability lot upstream">
-	                	
-	                	<label string="It will give information about the stock of a product as per the Production Lot" colspan="2" />
-				<separator string="" colspan="4" />
-	                	<button icon='gtk-cancel' special="cancel"
-	                		string="Cancel" />
-	                	<button name="action_traceability" string="Upstream traceability" type="object" context="{'type': '', 'field': 'prodlot_id'}"/>
-	                	
-	                </form>
-	            </field>
-	        </record>	        
-     	
-	<act_window name="Upstream traceability"		    
-		res_model="stock.traceability.lot.upstream"
-		src_model="stock.production.lot"
-		view_mode="form"
-		target="new"        
-		key2="client_action_multi"    
-		id="action_view_stock_traceability_lot_upstream"/>
+                    <form string="Stock traceability lot upstream">
+
+                        <label string="It will give information about the stock of a product as per the Production Lot" colspan="2" />
+                <separator string="" colspan="4" />
+                        <button icon='gtk-cancel' special="cancel"
+                            string="Cancel" />
+                        <button name="action_traceability" string="Upstream traceability" type="object" context="{'type': '', 'field': 'prodlot_id'}"/>
+
+                    </form>
+                </field>
+            </record>
+
+    <act_window name="Upstream traceability"
+        res_model="stock.traceability.lot.upstream"
+        src_model="stock.production.lot"
+        view_mode="form"
+        target="new"
+        key2="client_action_multi"
+        id="action_view_stock_traceability_lot_upstream"/>
 
 <!-- =========stock.traceability.lot.downstream================= -->
 
@@ -89,26 +89,26 @@
                 <field name="model">stock.traceability.lot.downstream</field>
                 <field name="type">form</field>
                 <field name="arch" type="xml">
-	                <form string="Stock traceability lot downstream">
-	                	
-	                	<label string="It will give information about the stock of a product as per the Production Lot" colspan="2" />
-				<separator string="" colspan="4" />
-	                	<button icon='gtk-cancel' special="cancel"
-	                		string="Cancel" />
-	                	<button name="action_traceability" string="Downstream traceability" type="object" context="{'type': 'move_history_ids2', 'field': 'prodlot_id'}"/>
-	                	
-	                </form>
-	            </field>
-	        </record>	        
-     	
-	<act_window name="Downstream traceability"		    
-		res_model="stock.traceability.lot.downstream"
-		src_model="stock.production.lot"
-		view_mode="form"
-		target="new"        
-		key2="client_action_multi"    
-		id="action_view_stock_traceability_lot_downstream"/>
+                    <form string="Stock traceability lot downstream">
 
-	</data>
+                        <label string="It will give information about the stock of a product as per the Production Lot" colspan="2" />
+                <separator string="" colspan="4" />
+                        <button icon='gtk-cancel' special="cancel"
+                            string="Cancel" />
+                        <button name="action_traceability" string="Downstream traceability" type="object" context="{'type': 'move_history_ids2', 'field': 'prodlot_id'}"/>
+
+                    </form>
+                </field>
+            </record>
+
+    <act_window name="Downstream traceability"
+        res_model="stock.traceability.lot.downstream"
+        src_model="stock.production.lot"
+        view_mode="form"
+        target="new"
+        key2="client_action_multi"
+        id="action_view_stock_traceability_lot_downstream"/>
+
+    </data>
 </openerp>
 

From a51c0c7b4993c7c32274bfd196e603d1b31dba02 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 26 Jun 2010 18:05:28 +0200
Subject: [PATCH 116/121] useability_improvement

bzr revid: fp@tinyerp.com-20100626160528-ytin0aht9e9k946d
---
 addons/product/product.py       | 4 ++--
 addons/product/product_view.xml | 6 +++---
 addons/sale/sale.py             | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/product/product.py b/addons/product/product.py
index 7787a8e646e..1512048bb83 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -77,7 +77,7 @@ class product_uom(osv.osv):
                     '1 (base unit) = coeff (this unit). Ratio = 1 / Factor.'),
         'factor_inv': fields.function(_factor_inv, digits=(12, 6),
             fnct_inv=_factor_inv_write,
-            method=True, string='Factor',
+            method=True, string='Ratio',
             help='The coefficient for the formula:\n' \
                     'coeff (base unit) = 1 (this unit). Factor = 1 / Rate.'),
         'rounding': fields.float('Rounding Precision', digits=(16, 3), required=True,
@@ -85,7 +85,7 @@ class product_uom(osv.osv):
         'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the unit of measure without removing it."),
         'uom_factor': fields.selection([('bigger','Bigger than the default'),
                                         ('smaller','Smaller than the default'),
-                                        ('default','The Default unit of measure')],'Type of Unit', required=1),
+                                        ('default','Default UoM for the category')],'Type of Unit', required=1),
     }
 
     _defaults = {
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index a9f408db9f2..dfeb9c0a28f 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -311,12 +311,12 @@
                 <form string="Units of Measure">
                     <group col="6" colspan="4">
                         <field name="name" select="1"/>
-                        <field name="category_id" select="1"/>
+                        <field name="category_id" select="1" widget="selection"/>
                         <field name="active"/>
                         <field name="uom_factor" on_change="onchange_factor(uom_factor)"/>
                         <group colspan="2" col="2">
-                            <field name="factor" select="1" attrs="{'invisible':[('uom_factor','&lt;&gt;','smaller')]}"/>
-                            <field name="factor_inv" select="1" string="Factor Data" attrs="{'invisible':[('uom_factor','&lt;&gt;','bigger')]}"/>
+                            <field name="factor" attrs="{'invisible':[('uom_factor','&lt;&gt;','smaller')]}"/>
+                            <field name="factor_inv" string="Factor Data" attrs="{'invisible':[('uom_factor','&lt;&gt;','bigger')]}"/>
                         </group>
                         <newline/>
                         <field name="rounding"/>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 7d32e3c721a..26cb92d3f66 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1080,7 +1080,7 @@ class sale_order_line(osv.osv):
 
         if not uom2:
             uom2 = product_obj.uom_id
-        if (product_obj.type=='product') and (product_obj.virtual_available * product_obj.uom_id.factor < qty * uom2.factor) \
+        if (product_obj.type=='product') and (product_obj.virtual_available * uom2.factor < qty * product_obj.uom_id.factor) \
           and (product_obj.procure_method=='make_to_stock'):
             warning = {
                 'title': _('Not enough stock !'),

From b535556b0baf768dd5708e6e30be8f4285f46468 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Sun, 27 Jun 2010 00:46:11 +0530
Subject: [PATCH 117/121] [ADD]: add a new feature to account, cash register
 based on bank statement [IMP]: implement cash register in account

bzr revid: mga@tinyerp.com-20100626191611-uelrhietfd81g3fb
---
 addons/account/__init__.py               |   3 +-
 addons/account/account_cash_statement.py | 448 +++++++++++++++++++++++
 addons/account/account_view.xml          | 159 +++++++-
 3 files changed, 594 insertions(+), 16 deletions(-)
 create mode 100644 addons/account/account_cash_statement.py

diff --git a/addons/account/__init__.py b/addons/account/__init__.py
index da397978bd2..0608bb83c88 100644
--- a/addons/account/__init__.py
+++ b/addons/account/__init__.py
@@ -25,6 +25,7 @@ import project
 import partner
 import invoice
 import account_bank_statement
+import account_cash_statement
 import account_move_line
 import account_analytic_line
 import wizard
@@ -33,4 +34,4 @@ import product
 import sequence
 import company
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
new file mode 100644
index 00000000000..f9ea0f10eab
--- /dev/null
+++ b/addons/account/account_cash_statement.py
@@ -0,0 +1,448 @@
+# encoding: utf-8
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2008 PC Solutions (<http://pcsol.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+import time
+from mx import DateTime
+from decimal import Decimal
+from tools.translate import _
+
+class singer_statement(osv.osv):
+    
+    """ Singer Statements """
+    
+    _name = 'singer.statement'
+    _description = 'Statement'
+
+    def _sub_total(self, cr, uid, ids, name, arg, context=None):
+       
+        """ Calculates Sub total"
+        @param name: Names of fields.
+        @param arg: User defined arguments
+        @return: Dictionary of values.
+        """
+        res = {}
+        for obj in self.browse(cr, uid, ids):
+            res[obj.id] = obj.pieces * obj.number
+        return res
+
+    def on_change_sub(self, cr, uid, ids, pieces, number,*a):
+
+        """ Calculates Sub total on change of number
+        @param pieces: Names of fields.
+        @param number:
+        """           
+        sub=pieces*number
+        return {'value':{'subtotal': sub or 0.0}}
+
+    _columns = {
+        'pieces': fields.float('Values', digits=(16,2)),
+        'number': fields.integer('Number'),
+        'subtotal': fields.function(_sub_total, method=True, string='Sub Total', type='float',digits=(16,2)),
+        'starting_id': fields.many2one('account.bank.statement',ondelete='cascade'),
+        'ending_id': fields.many2one('account.bank.statement',ondelete='cascade'),
+     }
+singer_statement()
+
+class account_cash_statement(osv.osv):
+    
+    _inherit = 'account.bank.statement'
+    
+    def _get_starting_balance(self, cr, uid, ids, name, arg, context=None):
+
+        """ Find starting balance  "
+        @param name: Names of fields.
+        @param arg: User defined arguments
+        @return: Dictionary of values.
+        """          
+        res ={}
+        for statement in self.browse(cr, uid, ids):
+            amount_total=0.0
+            for line in statement.starting_details_ids:
+                amount_total+= line.pieces * line.number
+            res[statement.id]=amount_total
+        return res
+    
+    def _balance_end_cash(self, cr, uid, ids, name, arg, context=None):
+        """ Find ending balance  "
+        @param name: Names of fields.
+        @param arg: User defined arguments
+        @return: Dictionary of values.
+        """          
+        res ={}
+        for statement in self.browse(cr, uid, ids):
+            amount_total=0.0
+            for line in statement.ending_details_ids:
+                amount_total+= line.pieces * line.number
+            res[statement.id]=amount_total
+        return res
+        
+    def _get_sum_entry_encoding(self, cr, uid, ids, name, arg, context=None):
+
+        """ Find encoding total of statements "
+        @param name: Names of fields.
+        @param arg: User defined arguments
+        @return: Dictionary of values.
+        """
+        res2={}
+        for statement in self.browse(cr, uid, ids):
+            encoding_total=0.0
+            for line in statement.line_ids:
+               encoding_total+= line.amount
+            res2[statement.id]=encoding_total
+        return res2
+
+    def _default_journal_id(self, cr, uid, context={}):
+
+        """ To get default journal for the object" 
+        @param name: Names of fields.
+        @return: journal 
+        """  
+        company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
+        journal = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', company_id)])
+        if journal:
+            return journal[0]
+        else:
+            return False
+    
+    def _end_balance(self, cursor, user, ids, name, attr, context=None):
+        res_currency_obj = self.pool.get('res.currency')
+        res_users_obj = self.pool.get('res.users')
+
+        res = {}
+
+        company_currency_id = res_users_obj.browse(cursor, user, user,
+                context=context).company_id.currency_id.id
+
+        statements = self.browse(cursor, user, ids, context=context)
+        for statement in statements:
+            res[statement.id] = statement.balance_start
+            currency_id = statement.currency.id
+            for line in statement.move_line_ids:
+                if line.debit > 0:
+                    if line.account_id.id == \
+                            statement.journal_id.default_debit_account_id.id:
+                        res[statement.id] += res_currency_obj.compute(cursor,
+                                user, company_currency_id, currency_id,
+                                line.debit, context=context)
+                else:
+                    if line.account_id.id == \
+                            statement.journal_id.default_credit_account_id.id:
+                        res[statement.id] -= res_currency_obj.compute(cursor,
+                                user, company_currency_id, currency_id,
+                                line.credit, context=context)
+            if statement.state in ('draft', 'open'):
+                for line in statement.line_ids:
+                    res[statement.id] += line.amount
+        for r in res:
+            res[r] = round(res[r], 2)
+        return res
+    
+    _columns = {
+        'company_id':fields.many2one('res.company', 'Company', required=False),
+        'journal_id': fields.many2one('account.journal', 'Journal', required=True),
+        'balance_start': fields.function(_get_starting_balance, method=True, string='Opening Balance', type='float',digits=(16,2)),
+        'balance_end_real': fields.float('Closing Balance', digits=(16,2), states={'confirm':[('readonly', True)]}),
+        'state': fields.selection(
+            [('draft', 'Draft'),
+            ('confirm', 'Confirm'),
+            ('open','Open')], 'State', required=True, states={'confirm': [('readonly', True)]}, readonly="1"),
+        'total_entry_encoding':fields.function(_get_sum_entry_encoding, method=True, string="Cash Transaction"),
+        'date':fields.datetime("Open On"),
+        'closing_date':fields.datetime("Closed On"),
+        'balance_end': fields.function(_end_balance, method=True, string='Balance'),
+        'balance_end_cash': fields.function(_balance_end_cash, method=True, string='Balance'),
+        'starting_details_ids': fields.one2many('singer.statement', 'starting_id', string='Opening Cashbox'),
+        'ending_details_ids': fields.one2many('singer.statement', 'ending_id', string='Closing Cashbox'),
+        'name': fields.char('Name', size=64, required=True, readonly=True),
+        'user_id':fields.many2one('res.users', 'Responsible', required=False),
+    }
+    _defaults = {
+        'state': lambda *a: 'draft',
+        'name': lambda *a: '/',
+        'date': lambda *a:time.strftime("%Y-%m-%d %H:%M:%S"),
+        'journal_id': _default_journal_id,
+        'user_id': lambda self, cr, uid, context=None: uid
+     }
+
+    def create(self, cr, uid, vals, context=None):
+        company_id = vals and vals.get('company_id',False)
+        if company_id:
+            open_jrnl = self.search(cr, uid, [('company_id', '=', vals['company_id']), ('journal_id', '=', vals['journal_id']), ('state', '=', 'open')])
+            if open_jrnl:
+                raise osv.except_osv('Error', u'Une caisse de type espèce est déjà ouverte')
+            if 'starting_details_ids' in vals:
+                vals['starting_details_ids'] = starting_details_ids = map(list, vals['starting_details_ids'])
+                for i in starting_details_ids:
+                    if i and i[0] and i[1]:
+                        i[0], i[1] = 0, 0
+        res = super(account_cash_statement, self).create(cr, uid, vals, context=context)
+        return res
+    
+    def onchange_journal_id(self, cr, uid, statement_id, journal_id, context={}):
+        """ Changes balance start and starting details if journal_id changes" 
+        @param statement_id: Changed statement_id
+        @param journal_id: Changed journal_id
+        @return:  Dictionary of changed values
+        """
+        
+        cash_pool = self.pool.get('singer.statement')
+        statement_pool = self.pool.get('account.bank.statement')
+
+        res = {}
+        balance_start = 0.0
+        
+        if not journal_id:
+            res.update({
+                'balance_start': balance_start
+            })
+            return res
+        
+        
+        res = super(account_cash_statement, self).onchange_journal_id(cr, uid, statement_id, journal_id, context)
+        return res
+
+    def button_open(self, cr, uid, ids, context=None):
+        
+        """ Changes statement state to Running.
+        @return: True 
+        """
+        cash_pool = self.pool.get('singer.statement')
+        statement_pool = self.pool.get('account.bank.statement')
+
+        statement = statement_pool.browse(cr, uid, ids[0])
+        number = self.pool.get('ir.sequence').get(cr, uid, 'account.bank.statement')
+        
+        if len(statement.starting_details_ids) > 0:
+            sid = []
+            for line in statement.starting_details_ids:
+                sid.append(line.id)
+            
+            cash_pool.unlink(cr, uid, sid)
+        
+        cr.execute("select id from account_bank_statement where journal_id=%s and user_id=%s and state=%s order by id desc limit 1", (statement.journal_id.id, uid, 'confirm'))
+        rs = cr.fetchone()
+        rs = rs and rs[0] or None
+        if rs:
+            statement = statement_pool.browse(cr, uid, rs)
+            balance_start = statement.balance_end_real or 0.0
+            open_ids = cash_pool.search(cr, uid, [('ending_id','=',statement.id)])
+            for sid in open_ids:
+                default = {
+                    'ending_id': False,
+                    'starting_id':ids[0]
+                }
+                cash_pool.copy(cr, uid, sid, default)
+            
+        vals = {
+            'date':time.strftime("%Y-%m-%d %H:%M:%S"), 
+            'state':'open',
+            'name':number
+        }
+        
+        self.write(cr, uid, ids, vals)
+        return True
+
+    def button_confirm(self, cr, uid, ids, context={}):
+        
+        """ Check the starting and ending detail of  statement 
+        @return: True 
+        """
+        done = []
+        res_currency_obj = self.pool.get('res.currency')
+        res_users_obj = self.pool.get('res.users')
+        account_move_obj = self.pool.get('account.move')
+        account_move_line_obj = self.pool.get('account.move.line')
+        account_bank_statement_line_obj = self.pool.get('account.bank.statement.line')
+
+        company_currency_id = res_users_obj.browse(cr, uid, uid, context=context).company_id.currency_id.id
+
+        for st in self.browse(cr, uid, ids, context):
+            if not st.state == 'open':
+                continue
+                
+            if st.balance_end != st.balance_end_cash:
+                raise osv.except_osv(_('Error !'), _('Cash balance is not match with closing balance !'))
+                
+            if not (abs((st.balance_end or 0.0) - st.balance_end_real) < 0.0001):
+                raise osv.except_osv(_('Error !'),
+                        _('The statement balance is incorrect !\n') +
+                        _('The expected balance (%.2f) is different than the computed one. (%.2f)') % (st.balance_end_real, st.balance_end))
+            if (not st.journal_id.default_credit_account_id) \
+                    or (not st.journal_id.default_debit_account_id):
+                raise osv.except_osv(_('Configuration Error !'),
+                        _('Please verify that an account is defined in the journal.'))
+
+            for line in st.move_line_ids:
+                if line.state <> 'valid':
+                    raise osv.except_osv(_('Error !'),
+                            _('The account entries lines are not in valid state.'))
+            # for bank.statement.lines
+            # In line we get reconcile_id on bank.ste.rec.
+            # in bank stat.rec we get line_new_ids on bank.stat.rec.line
+            for move in st.line_ids:
+                context.update({'date':move.date})
+                move_id = account_move_obj.create(cr, uid, {
+                    'journal_id': st.journal_id.id,
+                    'period_id': st.period_id.id,
+                    'date': move.date,
+                }, context=context)
+                account_bank_statement_line_obj.write(cr, uid, [move.id], {
+                    'move_ids': [(4,move_id, False)]
+                })
+                if not move.amount:
+                    continue
+
+                torec = []
+                if move.amount >= 0:
+                    account_id = st.journal_id.default_credit_account_id.id
+                else:
+                    account_id = st.journal_id.default_debit_account_id.id
+                acc_cur = ((move.amount<=0) and st.journal_id.default_debit_account_id) or move.account_id
+                amount = res_currency_obj.compute(cr, uid, st.currency.id,
+                        company_currency_id, move.amount, context=context,
+                        account=acc_cur)
+                if move.reconcile_id and move.reconcile_id.line_new_ids:
+                    for newline in move.reconcile_id.line_new_ids:
+                        amount += newline.amount
+
+                val = {
+                    'name': move.name,
+                    'date': move.date,
+                    'ref': move.ref,
+                    'move_id': move_id,
+                    'partner_id': ((move.partner_id) and move.partner_id.id) or False,
+                    'account_id': (move.account_id) and move.account_id.id,
+                    'credit': ((amount>0) and amount) or 0.0,
+                    'debit': ((amount<0) and -amount) or 0.0,
+                    'statement_id': st.id,
+                    'journal_id': st.journal_id.id,
+                    'period_id': st.period_id.id,
+                    'currency_id': st.currency.id,
+                }
+
+                amount = res_currency_obj.compute(cr, uid, st.currency.id,
+                        company_currency_id, move.amount, context=context,
+                        account=acc_cur)
+                if st.currency.id <> company_currency_id:
+                    amount_cur = res_currency_obj.compute(cr, uid, company_currency_id,
+                                st.currency.id, amount, context=context,
+                                account=acc_cur)
+                    val['amount_currency'] = -amount_cur
+
+                if move.account_id and move.account_id.currency_id and move.account_id.currency_id.id <> company_currency_id:
+                    val['currency_id'] = move.account_id.currency_id.id
+                    if company_currency_id==move.account_id.currency_id.id:
+                        amount_cur = move.amount
+                    else:
+                        amount_cur = res_currency_obj.compute(cr, uid, company_currency_id,
+                                move.account_id.currency_id.id, amount, context=context,
+                                account=acc_cur)
+                    val['amount_currency'] = amount_cur
+
+                torec.append(account_move_line_obj.create(cr, uid, val , context=context))
+
+                if move.reconcile_id and move.reconcile_id.line_new_ids:
+                    for newline in move.reconcile_id.line_new_ids:
+                        account_move_line_obj.create(cr, uid, {
+                            'name': newline.name or move.name,
+                            'date': move.date,
+                            'ref': move.ref,
+                            'move_id': move_id,
+                            'partner_id': ((move.partner_id) and move.partner_id.id) or False,
+                            'account_id': (newline.account_id) and newline.account_id.id,
+                            'debit': newline.amount>0 and newline.amount or 0.0,
+                            'credit': newline.amount<0 and -newline.amount or 0.0,
+                            'statement_id': st.id,
+                            'journal_id': st.journal_id.id,
+                            'period_id': st.period_id.id,
+                            'analytic_account_id':newline.analytic_id and newline.analytic_id.id or False,
+
+                        }, context=context)
+
+                # Fill the secondary amount/currency
+                # if currency is not the same than the company
+                amount_currency = False
+                currency_id = False
+                if st.currency.id <> company_currency_id:
+                    amount_currency = move.amount
+                    currency_id = st.currency.id
+                account_move_line_obj.create(cr, uid, {
+                    'name': move.name,
+                    'date': move.date,
+                    'ref': move.ref,
+                    'move_id': move_id,
+                    'partner_id': ((move.partner_id) and move.partner_id.id) or False,
+                    'account_id': account_id,
+                    'credit': ((amount < 0) and -amount) or 0.0,
+                    'debit': ((amount > 0) and amount) or 0.0,
+                    'statement_id': st.id,
+                    'journal_id': st.journal_id.id,
+                    'period_id': st.period_id.id,
+                    'amount_currency': amount_currency,
+                    'currency_id': currency_id,
+                    }, context=context)
+
+                for line in account_move_line_obj.browse(cr, uid, [x.id for x in
+                        account_move_obj.browse(cr, uid, move_id,
+                            context=context).line_id],
+                        context=context):
+                    if line.state <> 'valid':
+                        raise osv.except_osv(_('Error !'),
+                                _('Ledger Posting line "%s" is not valid') % line.name)
+
+                if move.reconcile_id and move.reconcile_id.line_ids:
+                    torec += map(lambda x: x.id, move.reconcile_id.line_ids)
+                    #try:
+                    if abs(move.reconcile_amount-move.amount)<0.0001:
+
+                        writeoff_acc_id = False
+                        #There should only be one write-off account!
+                        for entry in move.reconcile_id.line_new_ids:
+                            writeoff_acc_id = entry.account_id.id
+                            break
+
+                        account_move_line_obj.reconcile(cr, uid, torec, 'statement', writeoff_acc_id=writeoff_acc_id, writeoff_period_id=st.period_id.id, writeoff_journal_id=st.journal_id.id, context=context)
+                    else:
+                        account_move_line_obj.reconcile_partial(cr, uid, torec, 'statement', context)
+                    #except:
+                    #    raise osv.except_osv(_('Error !'), _('Unable to reconcile entry "%s": %.2f') % (move.name, move.amount))
+
+                if st.journal_id.entry_posted:
+                    account_move_obj.write(cr, uid, [move_id], {'state':'posted'})
+            done.append(st.id)
+        self.write(cr, uid, done, {'state':'confirm'}, context=context)
+        return True
+
+    def button_cancel(self, cr, uid, ids, context={}):
+        done = []
+        for st in self.browse(cr, uid, ids, context):
+            ids = []
+            for line in st.line_ids:
+                ids += [x.id for x in line.move_ids]
+            self.pool.get('account.move').unlink(cr, uid, ids, context)
+            done.append(st.id)
+        self.write(cr, uid, done, {'state':'draft'}, context=context)
+        return True
+
+account_cash_statement()
+
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 066c5bee06c..1c876a2a06c 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -378,7 +378,7 @@
             <field name="model">account.bank.statement</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Statement">
+                <form string="Bank Statement">
                     <group col="6" colspan="4">
                         <field name="name" select="1"/>
                         <field name="date" select="1"/>
@@ -394,7 +394,7 @@
                     <field name="balance_end_real"/>
                     </group>                    
                     <notebook colspan="4">
-                        <page string="Entry encoding">
+                        <page string="Transaction">
                             <field colspan="4" name="line_ids" nolabel="1">
                                 <tree editable="bottom" string="Statement lines">
                                     <field name="sequence" invisible="1"/>
@@ -423,7 +423,7 @@
                                 </form>
                             </field>
                         </page>
-                        <page string="Real Entries">
+                        <page string="Accounting Entries">
                             <field colspan="4" name="move_line_ids" nolabel="1"/>
                         </page>
                     </notebook>
@@ -442,6 +442,7 @@
             <field name="res_model">account.bank.statement</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="domain">[('journal_id.type', '=', 'bank')]</field>
         </record>
         <menuitem string="Bank Statements" action="action_bank_statement_tree" id="menu_bank_statement_tree" parent="menu_finance_bank_and_cash" sequence="7"/>
 
@@ -1131,16 +1132,6 @@
             <field name="view_mode">form</field>
             <field name="act_window_id" ref="action_move_line_search"/>
         </record>
-        <record id="action_move_line_search_view3" model="ir.actions.act_window">
-            <field name="name">Cash Register</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.move.line</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_move_line_tree"/>
-            <field name="search_view_id" ref="view_account_move_line_filter"/>
-            <field name="domain">[('journal_id.type', '=', 'cash')]</field>
-        </record>
         <record id="action_move_line_search_view4" model="ir.actions.act_window">
             <field name="name">Checks Register</field>
             <field name="type">ir.actions.act_window</field>
@@ -1151,7 +1142,7 @@
             <field name="search_view_id" ref="view_account_move_line_filter"/>
             <field name="domain">[('journal_id.type', '=', 'bank')]</field>
         </record>
-        <menuitem action="action_move_line_search_view3" id="journal_cash_move_lines" parent="menu_finance_bank_and_cash"/>
+        
         <menuitem action="action_move_line_search_view4" id="journal_bank_move_lines" parent="menu_finance_bank_and_cash"/>
 
 <!--        <menuitem action="action_move_line_search" id="menu_action_move_line_search" parent="account.next_id_29"/>-->
@@ -2037,6 +2028,144 @@
             sequence="4"
         />
 
-
+        <!-- Cash Statement -->
+        <record id="view_bank_statement_tree" model="ir.ui.view">
+            <field name="name">account.bank.statement.tree</field>
+            <field name="model">account.bank.statement</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree colors="red:balance_end_real!=balance_end;blue:state=='draft' and (balance_end_real==balance_end);black:state in ('open');blue:state in ('draft')" string="Statement">
+                    <field name="date"/>
+                    <field name="name"/>
+                    <field name="journal_id"/>
+                    <field name="period_id"/>
+                    <field name="balance_start"/>
+                    <field name="balance_end_real"/>
+                    <field name="balance_end"/>
+                        <field name="user_id" select="1"/>
+                    <field name="state"/>
+                    <button type="object" string="Open" name="button_open" states="draft" icon="terp-camera_test"/>
+                    <button type="object" string="Confirm" name="button_confirm" states="open" icon="terp-gtk-go-back-rtl"/>
+                    <button type="object" string="Cancel" name="button_cancel" states="confirm" icon="terp-gtk-stop"/>
+                </tree>
+            </field>
+        </record>
+        
+        <record id="view_bank_statement_form2" model="ir.ui.view">
+            <field name="name">account.bank.statement.form</field>
+            <field name="model">account.bank.statement</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Statement">
+                    <group col="6" colspan="4">
+                        <field name="name" select="1"/>
+                        <field name="company_id" select="1" groups="base.group_multi_company"/>
+                        <field name="journal_id" on_change="onchange_journal_id(journal_id)" domain="[('type','=','cash')]" select="1" />
+                        <field name="user_id" select="1" readonly="1"/>
+                        <field name="period_id" select="1"/>
+                        <field name="balance_end_real"/>
+                    </group>
+                    
+                    <notebook colspan="4">
+                        <page string="Cash Transactions" attrs="{'invisible': [('state','=','draft')]}">
+                            <field colspan="4" name="line_ids" nolabel="1">
+                                <tree editable="bottom" string="Statement lines">
+                                    <field name="sequence" invisible="1"/>
+                                    <field name="date"/>
+                                    <field name="ref"/>
+                                    <field name="name"/>
+                                    <field name="type"/>
+                                    <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency, {'amount': amount})"/>
+                                    <field domain="[('journal_id','=',parent.journal_id)]" name="account_id"/>
+                                    <field name="amount"/>
+                                    <field context="{'partner_id': partner_id, 'amount': amount, 'account_id': account_id, 'currency_id': parent.currency, 'journal_id': parent.journal_id, 'date':date}" name="reconcile_id"/>
+                                    <field invisible="1" name="reconcile_amount"/>
+                                </tree>
+                            </field>
+                        </page>
+                        <page string="Cash Box">
+                            <group col="2" colspan="2" expand="1">
+                                <field name="starting_details_ids" nolabel="1" colspan="2" attrs="{'readonly':[('state','=','draft')]}">
+                                    <tree string = "Opening Balance" editable="bottom">
+                                        <field name="pieces"/>
+                                        <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
+                                        <field name="subtotal" sum="Total"/>
+                                    </tree>
+                                    <form string = "Opening Balance">
+                                        <field name="pieces"/>
+                                        <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
+                                        <field name="subtotal"/>
+                                    </form>
+                                </field>
+                            </group>
+                            <group col="2" colspan="2" expand="1">
+                                <field name="ending_details_ids" nolabel="1" colspan="2" attrs="{'readonly':[('state','=','draft')]}">
+                                    <tree string = "Closing Balance" editable="bottom">
+                                        <field name="pieces"/>
+                                        <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
+                                        <field name="subtotal" sum="Total"/>
+                                    </tree>
+                                    <form string = "Closing Balance">
+                                        <field name="pieces"/>
+                                        <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
+                                        <field name="subtotal"/>
+                                    </form>
+                                </field>
+                            </group>
+                        </page>
+                        <page string="Accounting Entries">
+                            <field colspan="4" name="move_line_ids" nolabel="1"/>
+                        </page>
+                    </notebook>
+                    <group col="6" colspan="4">
+                        <group col="2" colspan="2">
+                            <separator string="Dates" colspan="4"/>
+                            <field name="date" select="1" attrs="{'readonly':[('state','!=','draft')]}"/>
+                            <field name="closing_date" select="1" attrs="{'readonly':[('state','=','confirm')]}"/>
+                        </group>
+                        <group col="2" colspan="2">
+                            <separator string="Opening Balance" colspan="4"/>
+                            <field name="balance_start"/>
+                            <field name="total_entry_encoding"/>
+                        </group>
+                        <group col="2" colspan="2">
+                            <separator string="Closing Balance" colspan="4"/>
+                            <field name="balance_end" string="Approx"/>
+                            <field name="balance_end_cash" string="Cash Balance"/>
+                        </group>
+                    </group>
+                    <group col="8" colspan="4">
+                        <field name="state" colspan="4"/>
+                        <button name="button_confirm" states="open" string="Close CashBox" icon="terp-check" type="object"/>
+                        <button name="button_open" states="draft" string="Open CashBox" icon="terp-document-new" type="object"/>
+                        <button name="button_cancel" states="confirm,open" string="Cancel" icon="terp-gtk-stop" type="object" groups="base.group_extended"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+        <record id="action_view_bank_statement_tree" model="ir.actions.act_window">
+            <field name="name">Cash Register</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.bank.statement</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_bank_statement_tree"/>
+            <field name="search_view_id" ref="view_account_bank_statement_filter"/>
+            <field name="domain">[('journal_id.type', '=', 'cash')]</field>
+        </record>
+        <record model="ir.actions.act_window.view" id="act_cash_statement1_all">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_bank_statement_tree"/>
+            <field name="act_window_id" ref="action_view_bank_statement_tree"/>
+        </record>
+        <record model="ir.actions.act_window.view" id="act_cash_statement2_all">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_bank_statement_form2"/>
+            <field name="act_window_id" ref="action_view_bank_statement_tree"/>
+        </record>
+        <menuitem action="action_view_bank_statement_tree" id="journal_cash_move_lines" parent="menu_finance_bank_and_cash"/>
+        
     </data>
 </openerp>

From 550a94721cb521ac6bf116f2a50ee6ee869f1fc8 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Sun, 27 Jun 2010 01:01:27 +0530
Subject: [PATCH 118/121] [FIX]: adding help to the fields

bzr revid: mga@tinyerp.com-20100626193127-eo64d7vf6sdqupxu
---
 addons/account/account_cash_statement.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index f9ea0f10eab..eea57359099 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -160,17 +160,17 @@ class account_cash_statement(osv.osv):
     _columns = {
         'company_id':fields.many2one('res.company', 'Company', required=False),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True),
-        'balance_start': fields.function(_get_starting_balance, method=True, string='Opening Balance', type='float',digits=(16,2)),
-        'balance_end_real': fields.float('Closing Balance', digits=(16,2), states={'confirm':[('readonly', True)]}),
+        'balance_start': fields.function(_get_starting_balance, method=True, string='Opening Balance', type='float',digits=(16,2), help="Opening balance based on cashBox"),
+        'balance_end_real': fields.float('Closing Balance', digits=(16,2), states={'confirm':[('readonly', True)]}, help="closing balance entered by the cashbox verifier"),
         'state': fields.selection(
             [('draft', 'Draft'),
             ('confirm', 'Confirm'),
             ('open','Open')], 'State', required=True, states={'confirm': [('readonly', True)]}, readonly="1"),
-        'total_entry_encoding':fields.function(_get_sum_entry_encoding, method=True, string="Cash Transaction"),
+        'total_entry_encoding':fields.function(_get_sum_entry_encoding, method=True, string="Cash Transaction", help="Total cash transactions"),
         'date':fields.datetime("Open On"),
         'closing_date':fields.datetime("Closed On"),
-        'balance_end': fields.function(_end_balance, method=True, string='Balance'),
-        'balance_end_cash': fields.function(_balance_end_cash, method=True, string='Balance'),
+        'balance_end': fields.function(_end_balance, method=True, string='Balance', help="Closing balance based on transactions"),
+        'balance_end_cash': fields.function(_balance_end_cash, method=True, string='Balance', help="Closing balance based on cashBox"),
         'starting_details_ids': fields.one2many('singer.statement', 'starting_id', string='Opening Cashbox'),
         'ending_details_ids': fields.one2many('singer.statement', 'ending_id', string='Closing Cashbox'),
         'name': fields.char('Name', size=64, required=True, readonly=True),
@@ -281,7 +281,7 @@ class account_cash_statement(osv.osv):
                 continue
                 
             if st.balance_end != st.balance_end_cash:
-                raise osv.except_osv(_('Error !'), _('Cash balance is not match with closing balance !'))
+                raise osv.except_osv(_('Error !'), _('Cash balance is not matching with closing balance !'))
                 
             if not (abs((st.balance_end or 0.0) - st.balance_end_real) < 0.0001):
                 raise osv.except_osv(_('Error !'),

From b4df8cd697d49d4406fbcec9cc2115ea020f7278 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Sun, 27 Jun 2010 01:22:02 +0530
Subject: [PATCH 119/121] [FIX]: fix a cashbox view

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

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 1c876a2a06c..4067423cc3f 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2113,7 +2113,7 @@
                                 </field>
                             </group>
                         </page>
-                        <page string="Accounting Entries">
+                        <page string="Accounting Entries" attrs="{'invisible': [('state','!=','confirm')]}">
                             <field colspan="4" name="move_line_ids" nolabel="1"/>
                         </page>
                     </notebook>

From ae1907cac8048510cca4365e212c8a5922e6470b Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Sun, 27 Jun 2010 04:47:17 +0100
Subject: [PATCH 120/121] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100627034717-vdyvdik0gt6n3qbc
---
 addons/auction/i18n/el.po  | 2 +-
 addons/purchase/i18n/el.po | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/auction/i18n/el.po b/addons/auction/i18n/el.po
index 659ea3aff63..60d2dfd08d7 100644
--- a/addons/auction/i18n/el.po
+++ b/addons/auction/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-26 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-06-27 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/purchase/i18n/el.po b/addons/purchase/i18n/el.po
index ceb54327a4d..bcf0c1b089b 100644
--- a/addons/purchase/i18n/el.po
+++ b/addons/purchase/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-26 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-06-27 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"

From b5c6dda6ac4f111ab527e236ddcafd0f597f79d1 Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Mon, 28 Jun 2010 04:48:36 +0100
Subject: [PATCH 121/121] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100628034836-amhlunx8x38xxocz
---
 addons/account_voucher/i18n/es.po           |   8 +-
 addons/audittrail/i18n/es.po                |  13 +-
 addons/crm/i18n/es.po                       |  80 +++----
 addons/event/i18n/es.po                     | 225 +++++++++++---------
 addons/product/i18n/es.po                   |  14 +-
 addons/product_expiry/i18n/es.po            |  51 +++--
 addons/product_manufacturer/i18n/es.po      | 108 ++++++++++
 addons/project_gtd/i18n/zh_CN.po            |   8 +-
 addons/project_retro_planning/i18n/zh_TW.po |   8 +-
 addons/purchase/i18n/es.po                  |   8 +-
 addons/sale_analytic_plans/i18n/zh_TW.po    |  12 +-
 addons/sale_journal/i18n/es.po              |  13 +-
 12 files changed, 336 insertions(+), 212 deletions(-)
 create mode 100644 addons/product_manufacturer/i18n/es.po

diff --git a/addons/account_voucher/i18n/es.po b/addons/account_voucher/i18n/es.po
index 6e8e03cee6f..397104d8f9e 100644
--- a/addons/account_voucher/i18n/es.po
+++ b/addons/account_voucher/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 09:23+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-06-27 21:01+0000\n"
+"Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -215,7 +215,7 @@ msgstr "Estado"
 #: selection:account.voucher.line,type:0
 #: rml:voucher.cash_receipt.drcr:0
 msgid "Debit"
-msgstr "Débito"
+msgstr "Debe"
 
 #. module: account_voucher
 #: field:account.voucher,type:0
diff --git a/addons/audittrail/i18n/es.po b/addons/audittrail/i18n/es.po
index d2537ed39b8..dda9f7880f3 100644
--- a/addons/audittrail/i18n/es.po
+++ b/addons/audittrail/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 08:59+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-06-27 21:04+0000\n"
+"Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
@@ -83,7 +82,7 @@ msgstr "Ver registro"
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_log_line
 msgid "audittrail.log.line"
-msgstr "audittrail.registro.linea"
+msgstr "auditoria.registro.linea"
 
 #. module: audittrail
 #: field:audittrail.log,method:0
@@ -212,7 +211,7 @@ msgstr "Reglas de auditoría"
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_rule
 msgid "audittrail.rule"
-msgstr "audittrail.regla"
+msgstr "auditoria.regla"
 
 #. module: audittrail
 #: view:audittrail.rule:0
@@ -227,7 +226,7 @@ msgstr "Registrar escrituras"
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_log
 msgid "audittrail.log"
-msgstr "audittrail.registro"
+msgstr "auditoria.registro"
 
 #. module: audittrail
 #: field:audittrail.log.line,field_description:0
diff --git a/addons/crm/i18n/es.po b/addons/crm/i18n/es.po
index a5a1074a2fc..98802efa85d 100644
--- a/addons/crm/i18n/es.po
+++ b/addons/crm/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-06-23 17:20+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-06-27 22:27+0000\n"
+"Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-26 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -2302,7 +2301,7 @@ msgstr "Email empleado"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_meeting
 msgid "Meeting Cases"
-msgstr ""
+msgstr "Casos reuniones"
 
 #. module: crm
 #: view:crm.job:0
@@ -2322,7 +2321,7 @@ msgstr "Trabajos"
 #. module: crm
 #: view:crm.case.rule:0
 msgid "%(case_date)s = Creation date"
-msgstr ""
+msgstr "%(case_date)s = Fecha de creación"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_phone3
@@ -2348,12 +2347,12 @@ msgstr "Correctivo"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_opportunity
 msgid "Opportunity Cases"
-msgstr ""
+msgstr "Casos oportunidades"
 
 #. module: crm
 #: view:crm.case:0
 msgid "Support Query"
-msgstr ""
+msgstr "Petición de soporte"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -2387,7 +2386,7 @@ msgstr "Enviar correo"
 #. module: crm
 #: wizard_view:crm.new.send.mail,init:0
 msgid "Set case state to"
-msgstr ""
+msgstr "Establecer estado del caso a"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.categ2_fund3
@@ -2474,7 +2473,7 @@ msgstr "Cerrado"
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Name2"
-msgstr ""
+msgstr "Nombre 2 candidato"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -2516,32 +2515,32 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,freebusy:0
 msgid "FreeBusy"
-msgstr ""
+msgstr "LibreOcupado"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet1
 msgid "Customer Meeting"
-msgstr ""
+msgstr "Reunión de cliente"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,doc2:0
 msgid "Attachment2"
-msgstr ""
+msgstr "Adjunto 2"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,doc3:0
 msgid "Attachment3"
-msgstr ""
+msgstr "Adjunto 3"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Degree"
-msgstr ""
+msgstr "Grado"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,doc1:0
 msgid "Attachment1"
-msgstr ""
+msgstr "Adjunto 1"
 
 #. module: crm
 #: code:addons/crm/crm_phonecall.py:0
@@ -2610,7 +2609,7 @@ msgstr ">"
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Phone"
-msgstr ""
+msgstr "Teléfono candidato"
 
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_send_mail
@@ -2632,7 +2631,7 @@ msgstr "Meses"
 #: model:ir.actions.act_window,name:crm.action_crm_opportunity_assign_wizard
 #: model:ir.actions.act_window,name:crm.action_crm_phonecall_assign_wizard
 msgid "To Assign"
-msgstr ""
+msgstr "Para asignar"
 
 #. module: crm
 #: code:addons/crm/wizard/wizard_cal_subscribe.py:0
@@ -2649,6 +2648,7 @@ msgstr "Cuando un proyecto/oportunidad real es detectado"
 #: wizard_view:crm.job.partner_create,init:0
 msgid "Are you sure you want to create a partner based on this job request ?"
 msgstr ""
+"Está seguro de que desea crear una empresa basada en esta solicitud laboral ?"
 
 #. module: crm
 #: wizard_field:crm.lead.opportunity_set,create_partner,action:0
@@ -2675,12 +2675,12 @@ msgstr "Disminuir (0>1)"
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_case_history_event
 msgid "History of Events"
-msgstr ""
+msgstr "Histórico de eventos"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_category2
 msgid "Category2 of case"
-msgstr ""
+msgstr "Categoría 2 del caso"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,to:0
@@ -2718,7 +2718,7 @@ msgstr "Reciclado"
 #: model:crm.case.categ,name:crm.categ_lead8
 #: model:crm.case.categ,name:crm.categ_oppor8
 msgid "Other"
-msgstr ""
+msgstr "Otro"
 
 #. module: crm
 #: view:crm.case:0
@@ -2728,7 +2728,7 @@ msgstr ""
 #: selection:crm.new.send.mail,init,state:0
 #: view:crm.opportunity:0
 msgid "Done"
-msgstr ""
+msgstr "Hecho"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_max:0
@@ -2777,7 +2777,7 @@ msgstr "Ya existe una empresa con el mismo nombre."
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall
 msgid "Phonecall Cases"
-msgstr ""
+msgstr "Casos llamadas"
 
 #. module: crm
 #: help:crm.case.rule,sequence:0
@@ -2787,7 +2787,7 @@ msgstr ""
 #. module: crm
 #: field:crm.menu.config_wizard,helpdesk:0
 msgid "Helpdesk"
-msgstr ""
+msgstr "Asistencia/Ayuda"
 
 #. module: crm
 #: field:crm.case,user_id:0
@@ -2809,18 +2809,18 @@ msgstr "Responsable"
 #: model:crm.case.stage,name:crm.stage_claim4
 #: model:crm.case.stage,name:crm.stage_meet3
 msgid "Invalid"
-msgstr ""
+msgstr "Inválido"
 
 #. module: crm
 #: wizard_button:crm.job.meeting_set,init,order:0
 #: wizard_button:crm.phonecall.meeting_set,init,order:0
 msgid "Set Meeting"
-msgstr ""
+msgstr "Fijar reunión"
 
 #. module: crm
 #: field:crm.menu.config_wizard,meeting:0
 msgid "Calendar of Meetings"
-msgstr ""
+msgstr "Calendario de reuniones"
 
 #. module: crm
 #: view:crm.case:0
@@ -2840,7 +2840,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead Name"
-msgstr ""
+msgstr "Nombre iniciativa"
 
 #. module: crm
 #: view:crm.claim:0
@@ -2861,22 +2861,22 @@ msgstr ""
 #: wizard_view:crm.lead.opportunity_set,create_partner:0
 #: wizard_view:crm.lead.partner_create,init:0
 msgid "Are you sure you want to create a partner based on this lead ?"
-msgstr ""
+msgstr "¿Está seguro que quiere crear una empresa basada en esta iniciativa?"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job6
 msgid "Refused by Employee"
-msgstr ""
+msgstr "Rechazado por el empleado"
 
 #. module: crm
 #: field:crm.case,partner_name:0
 msgid "Employee's Name"
-msgstr ""
+msgstr "Nombre del empleado"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job2
 msgid "First Interview"
-msgstr ""
+msgstr "Primera entrevista"
 
 #. module: crm
 #: view:report.crm.case.section.categ.categ2:0
@@ -2884,17 +2884,17 @@ msgstr ""
 #: view:report.crm.case.section.categ2:0
 #: view:report.crm.case.section.stage:0
 msgid "This Month"
-msgstr ""
+msgstr "Este mes"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Availability (weeks)"
-msgstr ""
+msgstr "Disponibilidad (semanas)"
 
 #. module: crm
 #: view:crm.opportunity:0
 msgid "Opportunities Tree"
-msgstr ""
+msgstr "Árbol de oportunidades"
 
 #. module: crm
 #: help:crm.case,state:0
@@ -2911,12 +2911,12 @@ msgstr ""
 #. module: crm
 #: view:crm.job:0
 msgid "Open Jobs"
-msgstr ""
+msgstr "Trabajos abiertos"
 
 #. module: crm
 #: selection:crm.email.add.cc,name:0
 msgid "Email Address"
-msgstr ""
+msgstr "Correo electrónico"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_max:0
@@ -2930,17 +2930,17 @@ msgstr ""
 #. module: crm
 #: field:crm.case,case_id:0
 msgid "Related Case"
-msgstr ""
+msgstr "Caso relacionado"
 
 #. module: crm
 #: field:crm.case.rule,server_action_id:0
 msgid "Server Action"
-msgstr ""
+msgstr "Acción servidor"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_claim0
 msgid "All Claims"
-msgstr ""
+msgstr "Todas las reclamaciones"
 
 #. module: crm
 #: field:crm.case.log,user_id:0
diff --git a/addons/event/i18n/es.po b/addons/event/i18n/es.po
index 0905419e610..4559c5b1ada 100644
--- a/addons/event/i18n/es.po
+++ b/addons/event/i18n/es.po
@@ -7,111 +7,110 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-26 17:13+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-06-27 22:00+0000\n"
+"Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
 #: field:event.event,date_end:0
 #: field:report.event.registration,date_end:0
 msgid "Ending date"
-msgstr ""
+msgstr "Fecha de finalización"
 
 #. module: event
 #: field:event.event,register_min:0
 msgid "Minimum Registrations"
-msgstr ""
+msgstr "Registros mínimos"
 
 #. module: event
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nombre de modelo inválido en la definición de acción."
 
 #. module: event
 #: field:event.event,mail_registr:0
 msgid "Registration Email"
-msgstr ""
+msgstr "Email de registro"
 
 #. module: event
 #: model:crm.case.section,name:event.event_0_crm_case_section
 msgid "Concert of Bon Jovi"
-msgstr ""
+msgstr "Concierto de Bon Jovi"
 
 #. module: event
 #: field:event.event,mail_confirm:0
 msgid "Confirmation Email"
-msgstr ""
+msgstr "Email de confirmación"
 
 #. module: event
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive sections."
-msgstr ""
+msgstr "¡Error! No puede crear secciones recursivas."
 
 #. module: event
 #: model:ir.model,name:event.model_event_registration
 msgid "Event Registration"
-msgstr ""
+msgstr "Registro evento"
 
 #. module: event
 #: model:ir.actions.wizard,name:event.event_reg_invoice
 msgid "Make Invoice"
-msgstr ""
+msgstr "Crear factura"
 
 #. module: event
 #: field:report.event.type.registration,draft_state:0
 msgid "Draft Registrations"
-msgstr ""
+msgstr "Registros borrador"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Event on Registration"
-msgstr ""
+msgstr "Evento en el registro"
 
 #. module: event
 #: wizard_button:event.reg_make_invoice,init,end:0
 msgid "Ok"
-msgstr ""
+msgstr "Aceptar"
 
 #. module: event
 #: field:event.event,mail_auto_confirm:0
 msgid "Mail Auto Confirm"
-msgstr ""
+msgstr "Enviar correo auto confirmación"
 
 #. module: event
 #: model:product.template,name:event.event_product_1_product_template
 msgid "Ticket for Opera"
-msgstr ""
+msgstr "Entrada para la ópera"
 
 #. module: event
 #: wizard_field:event.reg_make_invoice,init,inv_rejected:0
 msgid "Invoice Rejected"
-msgstr ""
+msgstr "Factura rechazada"
 
 #. module: event
 #: view:event.event:0
 msgid "Confirm Event"
-msgstr ""
+msgstr "Confirmar evento"
 
 #. module: event
 #: model:crm.case.section,name:event.event_1_crm_case_section
 msgid "Opera of Verdi"
-msgstr ""
+msgstr "Ópera de Verdi"
 
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid "Draft Registration"
-msgstr ""
+msgstr "Registro borrador"
 
 #. module: event
 #: wizard_view:event.reg_make_invoice,init:0
 msgid "Create Invoices"
-msgstr ""
+msgstr "Crear facturas"
 
 #. module: event
 #: model:ir.module.module,description:event.module_meta_information
@@ -131,22 +130,36 @@ msgid ""
 "event or per event category in :\n"
 "                Events / Reporting\n"
 msgstr ""
+"Organización y planificación de eventos.\n"
+"\n"
+"    Este módulo le permite\n"
+"        * gestionar sus eventos y sus registros\n"
+"        * usar emails para confirmar automáticamente y enviar confirmaciones "
+"para cualquier registro a un evento\n"
+"        * ...\n"
+"\n"
+"    Note that:\n"
+"    - You can define new types of events in\n"
+"                Events / Configuration / Types of Events\n"
+"    - You can access predefined reports about number of registration per "
+"event or per event category in :\n"
+"                Events / Reporting\n"
 
 #. module: event
 #: view:event.registration:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Información extra"
 
 #. module: event
 #: view:event.registration:0
 msgid "Registration"
-msgstr ""
+msgstr "Registro"
 
 #. module: event
 #: field:event.type,name:0
 #: model:ir.model,name:event.model_event_type
 msgid "Event type"
-msgstr ""
+msgstr "Tipo de evento"
 
 #. module: event
 #: view:event.event:0
@@ -154,54 +167,54 @@ msgstr ""
 #: model:ir.module.module,shortdesc:event.module_meta_information
 #: field:report.event.registration,name:0
 msgid "Event"
-msgstr ""
+msgstr "Evento"
 
 #. module: event
 #: selection:event.event,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Confirmado"
 
 #. module: event
 #: wizard_view:event.confirm_registration,split:0
 msgid "Registration Confirmation"
-msgstr ""
+msgstr "Confirmación del registro"
 
 #. module: event
 #: view:event.registration:0
 msgid "Dates"
-msgstr ""
+msgstr "Fechas"
 
 #. module: event
 #: field:event.event,register_current:0
 #: model:ir.actions.act_window,name:event.action_registration_confirm
 #: model:ir.ui.menu,name:event.menu_action_registration_confirm
 msgid "Confirmed Registrations"
-msgstr ""
+msgstr "Registros confirmados"
 
 #. module: event
 #: field:event.event,mail_auto_registr:0
 msgid "Mail Auto Register"
-msgstr ""
+msgstr "Enviar correo auto registro"
 
 #. module: event
 #: view:event.registration:0
 msgid "Badge"
-msgstr ""
+msgstr "Distintivo"
 
 #. module: event
 #: field:event.event,section_id:0
 msgid "Case section"
-msgstr ""
+msgstr "Sección del caso"
 
 #. module: event
 #: field:event.registration,tobe_invoiced:0
 msgid "To be Invoiced"
-msgstr ""
+msgstr "Para ser facturado"
 
 #. module: event
 #: model:ir.ui.menu,name:event.menu_event_event
 msgid "All Events"
-msgstr ""
+msgstr "Todos los eventos"
 
 #. module: event
 #: model:ir.ui.menu,name:event.menu_report_event
@@ -211,34 +224,34 @@ msgstr "Informe"
 #. module: event
 #: view:event.registration:0
 msgid "Cancel Registration"
-msgstr ""
+msgstr "Cancelar registro"
 
 #. module: event
 #: model:ir.ui.menu,name:event.menu_action_event_categories
 msgid "Events by Categories"
-msgstr ""
+msgstr "Eventos por categorías"
 
 #. module: event
 #: wizard_view:event.confirm_registration,split:0
 msgid "The event limit is reached. What do you want to do?"
-msgstr ""
+msgstr "Se ha alcanzado el límite del evento. ¿Qué desea hacer?"
 
 #. module: event
 #: field:report.event.type.registration,confirm_state:0
 msgid "Confirm Registrations"
-msgstr ""
+msgstr "Confirmar registros"
 
 #. module: event
 #: view:event.registration:0
 msgid "References"
-msgstr ""
+msgstr "Referencias"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_event_type_registration
 #: model:ir.ui.menu,name:event.menu_report_event_type_registration
 #: view:report.event.type.registration:0
 msgid "Registration By Event Types"
-msgstr ""
+msgstr "Registro por tipos de evento"
 
 #. module: event
 #: model:ir.ui.menu,name:event.menu_event_config
@@ -253,7 +266,7 @@ msgstr "¡XML inválido para la definición de la vista!"
 #. module: event
 #: wizard_button:event.confirm_registration,split,confirm:0
 msgid "Confirm Anyway"
-msgstr ""
+msgstr "Confirmar de todos modos"
 
 #. module: event
 #: constraint:product.template:0
@@ -263,75 +276,75 @@ msgstr "Error: La UdV debe estar en una categoría diferente que la UdM"
 #. module: event
 #: view:event.event:0
 msgid "Parent Category"
-msgstr ""
+msgstr "Categoría padre"
 
 #. module: event
 #: view:event.registration:0
 msgid "Registration Invoiced"
-msgstr ""
+msgstr "Registro facturado"
 
 #. module: event
 #: field:report.event.type.registration,nbevent:0
 msgid "Number Of Events"
-msgstr ""
+msgstr "Número de eventos"
 
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
-msgstr ""
+msgstr "Cancelar evento"
 
 #. module: event
 #: wizard_field:event.reg_make_invoice,init,inv_rej_reason:0
 msgid "Error Messages"
-msgstr ""
+msgstr "Mensajes de error"
 
 #. module: event
 #: view:event.event:0
 msgid "Mailing"
-msgstr ""
+msgstr "Envío correo"
 
 #. module: event
 #: model:product.template,name:event.event_product_0_product_template
 msgid "Ticket for Concert"
-msgstr ""
+msgstr "Entrada para concierto"
 
 #. module: event
 #: field:event.event,register_prospect:0
 #: model:ir.actions.act_window,name:event.action_registration_draft
 #: model:ir.ui.menu,name:event.menu_action_registration_draft
 msgid "Unconfirmed Registrations"
-msgstr ""
+msgstr "Registros sin confirmar"
 
 #. module: event
 #: field:event.registration,partner_invoice_id:0
 msgid "Partner Invoiced"
-msgstr ""
+msgstr "Empresa facturada"
 
 #. module: event
 #: view:event.registration:0
 msgid "Communication history"
-msgstr ""
+msgstr "Histórico comunicación"
 
 #. module: event
 #: selection:event.event,state:0
 msgid "Canceled"
-msgstr ""
+msgstr "Cancelado"
 
 #. module: event
 #: view:event.event:0
 msgid "Event Done"
-msgstr ""
+msgstr "Evento realizado"
 
 #. module: event
 #: field:event.registration,badge_name:0
 msgid "Badge Name"
-msgstr ""
+msgstr "Nombre de distintivo"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_event_registration
 #: model:ir.ui.menu,name:event.menu_report_event_registration
 msgid "Events On Registrations"
-msgstr ""
+msgstr "Eventos en los registros"
 
 #. module: event
 #: constraint:product.template:0
@@ -344,27 +357,27 @@ msgstr ""
 #. module: event
 #: wizard_field:event.reg_make_invoice,init,inv_created:0
 msgid "Invoice Created"
-msgstr ""
+msgstr "Factura creada"
 
 #. module: event
 #: view:event.event:0
 msgid "Statistics"
-msgstr ""
+msgstr "Estadísticas"
 
 #. module: event
 #: selection:event.event,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Borrador"
 
 #. module: event
 #: view:event.event:0
 msgid "Event description"
-msgstr ""
+msgstr "Descripción del evento"
 
 #. module: event
 #: model:ir.model,name:event.model_report_event_type_registration
 msgid "Event type on registration"
-msgstr ""
+msgstr "Tipo de evento en el registro"
 
 #. module: event
 #: constraint:ir.model:0
@@ -377,7 +390,7 @@ msgstr ""
 #. module: event
 #: field:event.registration,event_id:0
 msgid "Event Related"
-msgstr ""
+msgstr "Evento relacionado"
 
 #. module: event
 #: model:crm.case.section,name:event.case_section_event
@@ -389,167 +402,170 @@ msgstr "Eventos"
 #. module: event
 #: field:event.registration,nb_register:0
 msgid "Number of Registration"
-msgstr ""
+msgstr "Número de registro"
 
 #. module: event
 #: view:event.event:0
 #: field:event.event,state:0
 #: view:event.registration:0
 msgid "Status"
-msgstr ""
+msgstr "Estado"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_event_categories
 msgid "Events by section"
-msgstr ""
+msgstr "Eventos por sección"
 
 #. module: event
 #: model:ir.ui.menu,name:event.menu_action_registration
 msgid "All Registrations"
-msgstr ""
+msgstr "Todos los registros"
 
 #. module: event
 #: help:event.event,mail_auto_registr:0
 msgid ""
 "Check this box if you want to use the automatic mailing for new registration"
 msgstr ""
+"Marque esta opción si desea utilizar el correo automático para nuevos "
+"registros"
 
 #. module: event
 #: view:event.event:0
 msgid "Set To Draft"
-msgstr ""
+msgstr "Establecer en borrador"
 
 #. module: event
 #: view:event.registration:0
 #: model:ir.actions.wizard,name:event.event_confirm_registration
 #: field:report.event.registration,confirm_state:0
 msgid "Confirm Registration"
-msgstr ""
+msgstr "Confirmación registro"
 
 #. module: event
 #: view:event.registration:0
 msgid "History"
-msgstr ""
+msgstr "Histórico"
 
 #. module: event
 #: model:ir.ui.menu,name:event.menu_event_type
 msgid "Types of Events"
-msgstr ""
+msgstr "Tipos de eventos"
 
 #. module: event
 #: field:event.registration,contact_id:0
 msgid "Partner Contact"
-msgstr ""
+msgstr "Contacto empresa"
 
 #. module: event
 #: view:event.event:0
 msgid "Auto Confirmation Email"
-msgstr ""
+msgstr "Correo de confirmación automático"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 msgid "General"
-msgstr ""
+msgstr "General"
 
 #. module: event
 #: view:event.registration:0
 msgid "Send Reminder"
-msgstr ""
+msgstr "Enviar recordatorio"
 
 #. module: event
 #: selection:event.event,state:0
 msgid "Done"
-msgstr ""
+msgstr "Realizado"
 
 #. module: event
 #: field:event.event,date_begin:0
 #: field:report.event.registration,date_begin:0
 msgid "Beginning date"
-msgstr ""
+msgstr "Fecha inicio"
 
 #. module: event
 #: field:event.registration,invoice_id:0
 msgid "Invoice"
-msgstr ""
+msgstr "Factura"
 
 #. module: event
 #: model:ir.model,name:event.model_report_event_registration
 msgid "Events on registrations"
-msgstr ""
+msgstr "Eventos en los registros"
 
 #. module: event
 #: wizard_button:event.confirm_registration,split,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: event
 #: wizard_button:event.reg_make_invoice,init,open:0
 msgid "Open"
-msgstr ""
+msgstr "Abierto"
 
 #. module: event
 #: field:event.registration,badge_title:0
 msgid "Badge Title"
-msgstr ""
+msgstr "Título del distintivo"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_new_event_form
 #: model:ir.ui.menu,name:event.menu_event_new_event
 msgid "New event"
-msgstr ""
+msgstr "Nuevo evento"
 
 #. module: event
 #: field:event.registration,unit_price:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Precio unitario"
 
 #. module: event
 #: model:crm.case.section,name:event.event_2_crm_case_section
 msgid "Conference on ERP Buisness"
-msgstr ""
+msgstr "Conferencia en negocios ERP"
 
 #. module: event
 #: field:event.registration,badge_partner:0
 msgid "Badge Partner"
-msgstr ""
+msgstr "Empresa distinguida"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_event_view_confirm
 #: model:ir.ui.menu,name:event.menu_event_event_confirm
 msgid "Confirmed Events"
-msgstr ""
+msgstr "Eventos confirmados"
 
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
 msgid "Maximum Registrations"
-msgstr ""
+msgstr "Registros máximos"
 
 #. module: event
 #: field:event.event,type:0
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
 #. module: event
 #: help:event.event,mail_registr:0
 msgid "This email will be sent when someone subscribes to the event."
 msgstr ""
+"Este correo electrónico será enviado cuando alguien se suscriba al evento."
 
 #. module: event
 #: model:product.template,name:event.event_product_2_product_template
 msgid "Ticket for Conference"
-msgstr ""
+msgstr "Entrada para conferencia"
 
 #. module: event
 #: field:event.registration,case_id:0
 msgid "Case"
-msgstr ""
+msgstr "Caso"
 
 #. module: event
 #: view:event.event:0
 msgid "Name"
-msgstr ""
+msgstr "Nombre"
 
 #. module: event
 #: help:event.event,mail_auto_confirm:0
@@ -557,6 +573,8 @@ msgid ""
 "Check this box if you want ot use the automatic confirmation emailing or the "
 "reminder"
 msgstr ""
+"Marque esta opción si desea utilizar el correo de confirmación automático o "
+"el recordatorio"
 
 #. module: event
 #: help:event.event,mail_confirm:0
@@ -565,55 +583,58 @@ msgid ""
 "subscribes to a confirmed event. This is also the email sent to remind "
 "someone about the event."
 msgstr ""
+"Este correo electrónico será enviado cuando el evento sea confirmado o "
+"cuando alguien se suscriba a un evento confirmado. Éste es también el correo "
+"que será enviado para recordar a alguien sobre el evento."
 
 #. module: event
 #: field:event.event,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Producto"
 
 #. module: event
 #: field:event.registration,invoice_label:0
 msgid "Label Invoice"
-msgstr ""
+msgstr "Etiquetar factura"
 
 #. module: event
 #: view:event.registration:0
 msgid "Payments"
-msgstr ""
+msgstr "Pagos"
 
 #. module: event
 #: view:event.type:0
 #: field:report.event.type.registration,name:0
 msgid "Event Type"
-msgstr ""
+msgstr "Tipo de evento"
 
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_registration
 #: model:ir.actions.wizard,name:event.wizard_event_registration
 msgid "Registrations"
-msgstr ""
+msgstr "Registros"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_event_view_draft
 #: model:ir.ui.menu,name:event.menu_event_event_draft
 msgid "Draft Events"
-msgstr ""
+msgstr "Eventos en borrador"
 
 #. module: event
 #: model:ir.ui.menu,name:event.menu_event_main
 msgid "Events Organisation"
-msgstr ""
+msgstr "Organización de eventos"
 
 #. module: event
 #: view:event.registration:0
 msgid "Actions"
-msgstr ""
+msgstr "Acciones"
 
 #. module: event
 #: model:ir.actions.wizard,name:event.wizard_event_reg_partners
 msgid "List Register Partners"
-msgstr ""
+msgstr "Listar empresas registradas"
 
 #. module: event
 #: constraint:product.product:0
@@ -623,4 +644,4 @@ msgstr "Error: Código EAN erróneo"
 #. module: event
 #: view:event.event:0
 msgid "Auto Registration Email"
-msgstr ""
+msgstr "Correo de registro automático"
diff --git a/addons/product/i18n/es.po b/addons/product/i18n/es.po
index 760e18aaa00..b0f799cc608 100644
--- a/addons/product/i18n/es.po
+++ b/addons/product/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-21 19:25+0000\n"
-"Last-Translator: Jonay <jonay.santana@gmail.com>\n"
+"PO-Revision-Date: 2010-06-27 21:00+0000\n"
+"Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -192,7 +192,7 @@ msgstr "Tipos de precios"
 #. module: product
 #: selection:product.template,type:0
 msgid "Stockable Product"
-msgstr "Producto almacenable"
+msgstr "Almacenable"
 
 #. module: product
 #: model:product.category,name:product.product_category_services
@@ -226,7 +226,7 @@ msgstr "Nombre de este tipo de precio."
 #. module: product
 #: help:product.pricelist.version,date_start:0
 msgid "Starting date for this pricelist version to be valid."
-msgstr "Fecha inicial de esta versión de tarifa para ser válida."
+msgstr "Fecha inicial de validez para esta versión de tarifa."
 
 #. module: product
 #: field:product.product,incoming_qty:0
@@ -256,7 +256,7 @@ msgid ""
 "type. Purchase will trigger purchase orders when requested."
 msgstr ""
 "Producir generará órdenes de producción o tareas, de acuerdo al tipo de "
-"producto. Comprar disparará pedidos de compras cuando sea necesario."
+"producto. Comprar generará pedidos de compras cuando sea necesario."
 
 #. module: product
 #: model:process.transition,note:product.process_transition_supplierofproduct0
@@ -1534,7 +1534,7 @@ msgstr "Obtener bajo pedido"
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
-msgstr "Sobrecarga precio"
+msgstr "Recargo precio"
 
 #. module: product
 #: constraint:product.pricelist.version:0
diff --git a/addons/product_expiry/i18n/es.po b/addons/product_expiry/i18n/es.po
index 537d7ce26ef..2b3f27f0de1 100644
--- a/addons/product_expiry/i18n/es.po
+++ b/addons/product_expiry/i18n/es.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-06-30 15:09+0000\n"
-"PO-Revision-Date: 2010-04-29 04:43+0000\n"
-"Last-Translator: Rhubeni Lopes de Andrade <rhube.itsasecret@gmail.com>\n"
+"PO-Revision-Date: 2010-06-27 22:08+0000\n"
+"Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_expiry
 #: field:product.product,life_time:0
 msgid "Product lifetime"
-msgstr "Ciclo de vida producto"
+msgstr "Ciclo de vida del producto"
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
@@ -54,11 +54,13 @@ msgstr "¡XML no válido para la definición de la vista!"
 #: help:stock.production.lot,life_date:0
 msgid "The date the lot may become dangerous and should not be consumed."
 msgstr ""
+"Fecha en la que el producto puede llegar a ser peligroso y no debería ser "
+"consumido."
 
 #. module: product_expiry
 #: field:stock.production.lot,removal_date:0
 msgid "Removal Date"
-msgstr ""
+msgstr "Fecha de eliminación"
 
 #. module: product_expiry
 #: model:ir.module.module,description:product_expiry.module_meta_information
@@ -70,6 +72,12 @@ msgid ""
 " - alert date\n"
 "Used, for example, in food industries."
 msgstr ""
+"Gestionar diferentes fechas en productos y lotes de producción:\n"
+" - fin de vida\n"
+" - fecha de caducidad\n"
+" - fecha de retirada\n"
+" - fecha de alerta\n"
+"Usados, por ejemplo, en la industria alimentaria."
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_pain_product_template
@@ -96,17 +104,19 @@ msgstr "Error: La UdV debe estar en una categoría diferente que la UdM."
 #. module: product_expiry
 #: field:stock.production.lot,life_date:0
 msgid "End of Life Date"
-msgstr ""
+msgstr "Fecha de fin de vida"
 
 #. module: product_expiry
 #: field:stock.production.lot,use_date:0
 msgid "Best before Date"
-msgstr ""
+msgstr "Fecha caducidad"
 
 #. module: product_expiry
 #: help:stock.production.lot,use_date:0
 msgid "The date the lot starts deteriorating without becoming dangerous."
 msgstr ""
+"Fecha en la que el producto empieza a deteriorarse sin llegar a ser "
+"peligroso."
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_jambon_product_template
@@ -116,7 +126,7 @@ msgstr "Queso Camembert francés"
 #. module: product_expiry
 #: help:product.product,removal_time:0
 msgid "The number of days before a production lot should be removed."
-msgstr ""
+msgstr "Número de días antes de que un lote de producción deba ser retirado."
 
 #. module: product_expiry
 #: field:product.product,use_time:0
@@ -126,7 +136,7 @@ msgstr "Tiempo de uso producto"
 #. module: product_expiry
 #: field:stock.production.lot,alert_date:0
 msgid "Alert Date"
-msgstr ""
+msgstr "Fecha de alerta"
 
 #. module: product_expiry
 #: field:product.product,removal_time:0
@@ -139,6 +149,8 @@ msgid ""
 "The number of days before a production lot starts deteriorating without "
 "becoming dangerous."
 msgstr ""
+"Número de días antes de que un producto empieza a deteriorarse sin llegar a "
+"ser peligroso."
 
 #. module: product_expiry
 #: constraint:product.product:0
@@ -151,30 +163,15 @@ msgid ""
 "The number of days before a production lot may become dangerous and should "
 "not be consumed."
 msgstr ""
+"Número de días antes de que un producto pueda llegar a ser peligroso y no "
+"debe ser consumido."
 
 #. module: product_expiry
 #: help:stock.production.lot,removal_date:0
 msgid "The date the lot should be removed."
-msgstr ""
+msgstr "Fecha en la que el producto debería ser eliminado."
 
 #. module: product_expiry
 #: field:product.product,alert_time:0
 msgid "Product alert time"
 msgstr "Fecha alerta producto"
-
-#~ msgid "Alert date"
-#~ msgstr "Fecha alarma"
-
-#~ msgid ""
-#~ "Track different dates on products and lots. Used, for exampel, in food "
-#~ "industries: expiry date, alert date, date of removal, eso."
-#~ msgstr ""
-#~ "Gestiona distintas fechas para productos y lotes. Utilizado, por ejemplo, en "
-#~ "industria alimentaria: Fecha de caducidad, fecha de alarma, fecha de "
-#~ "eliminación, ..."
-
-#~ msgid "DLUO"
-#~ msgstr "Fecha caducidad"
-
-#~ msgid "Removal date"
-#~ msgstr "Fecha eliminación"
diff --git a/addons/product_manufacturer/i18n/es.po b/addons/product_manufacturer/i18n/es.po
new file mode 100644
index 00000000000..42f8bdc2629
--- /dev/null
+++ b/addons/product_manufacturer/i18n/es.po
@@ -0,0 +1,108 @@
+# Spanish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-25 13:27+0000\n"
+"PO-Revision-Date: 2010-06-27 21:56+0000\n"
+"Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: product_electronic
+#: model:ir.module.module,description:product_electronic.module_meta_information
+msgid "A module that add manufacturers and attributes on the product form"
+msgstr ""
+"Un módulo que añade fabricantes y atributos en el formulario de producto"
+
+#. module: product_electronic
+#: field:product.product,manufacturer_pref:0
+msgid "Manufacturer product code"
+msgstr "Código de producto del fabricante"
+
+#. module: product_electronic
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "¡XML inválido para la estructura de la vista!"
+
+#. module: product_electronic
+#: view:product.electronic.attribute:0
+msgid "Product Template Name"
+msgstr "Nombre de plantilla de producto"
+
+#. module: product_electronic
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"¡El nombre del objeto debe empezar con  x_ y no puede contener ningún "
+"carácter especial!"
+
+#. module: product_electronic
+#: model:ir.model,name:product_electronic.model_product_electronic_attribute
+msgid "Product attributes"
+msgstr "Atributos de producto"
+
+#. module: product_electronic
+#: view:product.product:0
+msgid "Manufacturing data"
+msgstr "Datos de fabricación"
+
+#. module: product_electronic
+#: view:product.product:0
+msgid "Product reference"
+msgstr "Referencia del producto"
+
+#. module: product_electronic
+#: field:product.electronic.attribute,name:0
+msgid "Attribute"
+msgstr "Atributo"
+
+#. module: product_electronic
+#: field:product.electronic.attribute,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: product_electronic
+#: field:product.electronic.attribute,value:0
+msgid "Value"
+msgstr "Valor"
+
+#. module: product_electronic
+#: view:product.product:0
+msgid "Manufacturing Data"
+msgstr "Datos de fabricación"
+
+#. module: product_electronic
+#: view:product.product:0
+msgid "Product name"
+msgstr "Nombre del producto"
+
+#. module: product_electronic
+#: view:product.product:0
+#: field:product.product,attribute_ids:0
+msgid "Attributes"
+msgstr "Atributos"
+
+#. module: product_electronic
+#: model:ir.module.module,shortdesc:product_electronic.module_meta_information
+msgid "Products Attributes & Manufacturers"
+msgstr "Fabricantes y atributos de los productos"
+
+#. module: product_electronic
+#: field:product.product,manufacturer_pname:0
+msgid "Manufacturer product name"
+msgstr "Nombre del fabricante del producto"
+
+#. module: product_electronic
+#: field:product.product,manufacturer:0
+msgid "Manufacturer"
+msgstr "Fabricante"
diff --git a/addons/project_gtd/i18n/zh_CN.po b/addons/project_gtd/i18n/zh_CN.po
index f25a51b156d..cc32edbe876 100644
--- a/addons/project_gtd/i18n/zh_CN.po
+++ b/addons/project_gtd/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 09:47+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
+"PO-Revision-Date: 2010-06-27 22:23+0000\n"
+"Last-Translator: Fan.Khiyon <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
@@ -30,7 +30,7 @@ msgstr "对象名必须以x_开头并且不能包含特殊字符"
 #. module: project_gtd
 #: model:ir.model,name:project_gtd.model_project_gtd_timebox
 msgid "project.gtd.timebox"
-msgstr ""
+msgstr "project.gtd.timebox"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks_my_deadline_open
diff --git a/addons/project_retro_planning/i18n/zh_TW.po b/addons/project_retro_planning/i18n/zh_TW.po
index b87c61bd408..f5f267875ca 100644
--- a/addons/project_retro_planning/i18n/zh_TW.po
+++ b/addons/project_retro_planning/i18n/zh_TW.po
@@ -7,16 +7,16 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-30 12:44+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-06-27 14:09+0000\n"
+"Last-Translator: Rossi Liu <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:19+0000\n"
+"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
 #: model:ir.module.module,shortdesc:project_retro_planning.module_meta_information
 msgid "Project Retro planning"
-msgstr ""
+msgstr "舊有的規劃項目"
diff --git a/addons/purchase/i18n/es.po b/addons/purchase/i18n/es.po
index a8e5b9f94ff..f49b031bfd4 100644
--- a/addons/purchase/i18n/es.po
+++ b/addons/purchase/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 19:39+0000\n"
-"Last-Translator: Jonay <jonay.santana@gmail.com>\n"
+"PO-Revision-Date: 2010-06-27 20:58+0000\n"
+"Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
@@ -681,7 +681,7 @@ msgstr "Posición fiscal"
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Request for Quotation N°"
-msgstr ""
+msgstr "Petición de presupuesto Nº"
 
 #. module: purchase
 #: field:purchase.order,invoice_id:0
diff --git a/addons/sale_analytic_plans/i18n/zh_TW.po b/addons/sale_analytic_plans/i18n/zh_TW.po
index 4929671f557..a1ce96418b5 100644
--- a/addons/sale_analytic_plans/i18n/zh_TW.po
+++ b/addons/sale_analytic_plans/i18n/zh_TW.po
@@ -7,26 +7,26 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-30 13:19+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-06-27 14:29+0000\n"
+"Last-Translator: Rossi Liu <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
 msgid "Analytic Distribution"
-msgstr ""
+msgstr "分佈分析"
 
 #. module: sale_analytic_plans
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "無效的XML視圖結構!"
 
 #. module: sale_analytic_plans
 #: model:ir.module.module,shortdesc:sale_analytic_plans.module_meta_information
 msgid "Sales Analytic Distribution Management"
-msgstr ""
+msgstr "銷售分佈分析管理"
diff --git a/addons/sale_journal/i18n/es.po b/addons/sale_journal/i18n/es.po
index c096276892c..c2bfada3ab3 100644
--- a/addons/sale_journal/i18n/es.po
+++ b/addons/sale_journal/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 10:39+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-06-27 22:12+0000\n"
+"Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
@@ -315,7 +314,7 @@ msgstr "Activo"
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_sale_order_draft
 msgid "Draft sales"
-msgstr "Borrador de ventas"
+msgstr "Ventas borrador"
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
@@ -335,7 +334,7 @@ msgstr "diario_venta.factura.tipo.árbol"
 #. module: sale_journal
 #: view:sale_journal.sale.journal:0
 msgid "Confirm Sales"
-msgstr "Confirmar las ventas"
+msgstr "Confirmar ventas"
 
 #. module: sale_journal
 #: field:sale_journal.picking.journal,date_created:0
@@ -383,7 +382,7 @@ msgstr "Realizado"
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
 msgid "Cancel"
-msgstr "Cancelar"
+msgstr "Cancelado"
 
 #. module: sale_journal
 #: field:sale_journal.picking.journal,picking_stats_ids:0