From 8f91b2b0346145907e81b42dd26084d04a626881 Mon Sep 17 00:00:00 2001
From: "hda@tinyerp.com" <>
Date: Tue, 23 Sep 2008 13:45:37 +0530
Subject: [PATCH 01/46] fix crash problem after configuration wizard

bzr revid: hda@tinyerp.com-20080923081537-wqlqgiynp8mw1pwv
---
 bin/addons/base/module/module.py | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py
index fa8ce19fd57..30b154a1145 100644
--- a/bin/addons/base/module/module.py
+++ b/bin/addons/base/module/module.py
@@ -268,7 +268,7 @@ class module(osv.osv):
                 raise orm.except_orm(_('Error'),
                         _('You try to remove a module that is installed or will be installed'))
         return super(module, self).unlink(cr, uid, ids, context=context)
-    
+
     def state_update(self, cr, uid, ids, newstate, states_to_update, context={}, level=50):
         if level<1:
             raise orm.except_orm(_('Error'), _('Recursion error in modules dependencies !'))
@@ -471,14 +471,14 @@ class module(osv.osv):
             match = re.search('-([a-zA-Z0-9\._-]+)(\.zip)', mod.url, re.I)
             version = '0'
             if match:
-                version = match.group(1)            
+                version = match.group(1)
             if vercmp(mod.installed_version or '0', version) >= 0:
                 continue
             res.append(mod.url)
             if not download:
                 continue
             zipfile = urllib.urlopen(mod.url).read()
-            fname = addons.get_module_path(mod.name+'.zip')            
+            fname = addons.get_module_path(mod.name+'.zip')
             try:
                 fp = file(fname, 'wb')
                 fp.write(zipfile)
@@ -528,12 +528,12 @@ class module(osv.osv):
         self.write(cr, uid, [id], {'category_id': p_id})
 
     def action_install(self,cr,uid,ids,context=None):
-        self.write(cr , uid, ids ,{'state' : 'to install'})        
+        self.write(cr , uid, ids ,{'state' : 'to install'})
         self.download(cr, uid, ids, context=context)
         for id in ids:
             cr.execute("select m.id as id from ir_module_module_dependency d inner join ir_module_module m on (m.name=d.name) where d.module_id=%d and m.state='uninstalled'",(id,))
             dep_ids = map(lambda x:x[0],cr.fetchall())
-            if len(dep_ids):                    
+            if len(dep_ids):
                 self.action_install(cr,uid,dep_ids,context=context)
 
     def update_translations(self, cr, uid, ids, filter_lang=None):
@@ -550,7 +550,7 @@ class module(osv.osv):
         for mod in self.browse(cr, uid, ids):
             if mod.state != 'installed':
                 continue
-            
+
             for lang in filter_lang:
                 f = os.path.join(tools.config['addons_path'], mod.name, 'i18n', lang + '.po')
                 if os.path.exists(f):
@@ -680,6 +680,18 @@ class module_configuration(osv.osv_memory):
                   'type': item.action_id.type,
                   'target':item.action_id.target,
             }
+        user_action=self.pool.get('res.users').browse(cr,uid,uid)
+        act_obj=self.pool.get(user_action.action_id.type)
+        action_ids=act_obj.search(cr,uid,[('name','=',user_action.action_id.name)])
+        action_open=act_obj.browse(cr,uid,action_ids)[0]
+        if context.get('menu',False):
+            return{
+              'view_type': action_open.view_type,
+              'view_id':action_open.view_id and [action_open.view_id.id] or False,
+              'res_model': action_open.res_model,
+              'type': action_open.type,
+              'domain':action_open.domain
+               }
         return {'type':'ir.actions.act_window_close' }
 module_configuration()
 

From 17eb1ec7dafa56196faff9a3df4105d59228021f Mon Sep 17 00:00:00 2001
From: "hda@tinyerp.com" <>
Date: Tue, 23 Sep 2008 15:52:28 +0530
Subject: [PATCH 02/46] bug fix

bzr revid: hda@tinyerp.com-20080923102228-npiylcw40qahdyh3
---
 bin/osv/fields.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/osv/fields.py b/bin/osv/fields.py
index 825420b1ec6..5079100f654 100644
--- a/bin/osv/fields.py
+++ b/bin/osv/fields.py
@@ -648,8 +648,8 @@ class related(function):
 #        return True
 
 
-    def _fnct_write(self,obj,cr, uid, ids, field_name, args, context=None):
-        raise 'Not Implemented Yet'
+#    def _fnct_write(self,obj,cr, uid, ids,values, field_name, args, context=None):
+#        raise 'Not Implemented Yet'
 
     def _fnct_read(self,obj,cr, uid, ids, field_name, args, context=None):
         if not ids: return {}
@@ -678,7 +678,7 @@ class related(function):
     def __init__(self,*arg,**args):
         print arg
         self.arg = arg
-        super(related, self).__init__(self._fnct_read, arg, fnct_inv=self._fnct_write, fnct_inv_arg=arg,method=True, fnct_search=self._fnct_search,**args)
+        super(related, self).__init__(self._fnct_read, arg, fnct_inv_arg=arg,method=True, fnct_search=self._fnct_search,**args)
 
     # TODO: call field_get on the object, not in the DB
     def _field_get(self, cr, uid, obj, model_name, prop):

From 500e964ebbe6e7fa646b4bff0832beacdca8a43d Mon Sep 17 00:00:00 2001
From: Christophe Simonis <christophe@tinyerp.com>
Date: Tue, 23 Sep 2008 12:47:45 +0200
Subject: [PATCH 03/46] get_binary_size is renamed bin_size and its behavior is
 reversed (False by default)

bzr revid: christophe@tinyerp.com-20080923104745-m5osg61ukqtk0szi
---
 bin/osv/fields.py        | 4 ++--
 bin/osv/orm.py           | 4 ++--
 bin/report/report_sxw.py | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/bin/osv/fields.py b/bin/osv/fields.py
index 5079100f654..daee0e4e40a 100644
--- a/bin/osv/fields.py
+++ b/bin/osv/fields.py
@@ -223,7 +223,7 @@ class binary(_column):
                     val = v[name]
                     break
             res.setdefault(i, val)
-            if context.get('get_binary_size', True):
+            if context.get('bin_size', False):
                 res[i] = tools.human_size(val)
 
         return res
@@ -620,7 +620,7 @@ class function(_column):
         else:
             res = self._fnct(cr, obj._table, ids, name, self._arg, context)
 
-        if self._type == 'binary' and context.get('get_binary_size', True):
+        if self._type == 'binary' and context.get('bin_size', False):
             # convert the data returned by the function with the size of that data...
             res = dict(map(lambda (x, y): (x, tools.human_size(len(y))), res.items()))
         return res
diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 00e2f30b35f..0c636acdd03 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1127,7 +1127,7 @@ class orm_memory(orm_template):
                 for f in fields_to_read:
                     if id in self.datas:
                         r[f] = self.datas[id].get(f, False)
-                        if r[f] and isinstance(self._columns[f], fields.binary) and context.get('get_binary_size', True):
+                        if r[f] and isinstance(self._columns[f], fields.binary) and context.get('bin_size', False):
                             r[f] = len(r[f])
                 result.append(r)
                 if id in self.datas:
@@ -1721,7 +1721,7 @@ class orm(orm_template):
             def convert_field(f):
                 if f in ('create_date', 'write_date'):
                     return "date_trunc('second', %s) as %s" % (f, f)
-                if isinstance(self._columns[f], fields.binary) and context.get('get_binary_size', True):
+                if isinstance(self._columns[f], fields.binary) and context.get('bin_size', False):
                     return "length(%s) as %s" % (f,f)
                 return '"%s"' % (f,)
             #fields_pre2 = map(lambda x: (x in ('create_date', 'write_date')) and ('date_trunc(\'second\', '+x+') as '+x) or '"'+x+'"', fields_pre)
diff --git a/bin/report/report_sxw.py b/bin/report/report_sxw.py
index 5b9a78c630a..a5f7ee8d7ef 100644
--- a/bin/report/report_sxw.py
+++ b/bin/report/report_sxw.py
@@ -566,7 +566,6 @@ class report_sxw(report_rml):
         if not context:
             context={}
         context = context.copy()
-        context['get_binary_size'] = False
 
         pool = pooler.get_pool(cr.dbname)
         ir_actions_report_xml_obj = pool.get('ir.actions.report.xml')

From bb3743070d2840750b57675f64c3f95824d948b7 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 23 Sep 2008 13:25:21 +0200
Subject: [PATCH 04/46] improvement

bzr revid: fp@tinyerp.com-20080923112521-gd45nckoeqq29jmx
---
 addons/product/product.py                     |  9 ++++---
 .../stock/wizard/wizard_location_product.py   | 25 ++++++++++---------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/addons/product/product.py b/addons/product/product.py
index 671433bd0fe..627bbf75c51 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -329,10 +329,11 @@ product_template()
 class product_product(osv.osv):
     def view_header_get(self, cr, uid, view_id, view_type, context):
         res = super(product_product, self).view_header_get(cr, uid, view_id, view_type, context)
-        if res: return res
-        if (not context.get('categ_id', False)):
-            return False
-        return _('Products: ')+self.pool.get('product.category').browse(cr, uid, context['categ_id'], context).name
+        if (context.get('categ_id', False)):
+            return _('Products: ')+self.pool.get('product.category').browse(cr, uid, context['categ_id'], context).name
+        if (context.get('location', False)):
+            return _('Products: ')+self.pool.get('stock.location').browse(cr, uid, context['location'], context).name
+        return res
 
     def _product_price(self, cr, uid, ids, name, arg, context={}):
         res = {}
diff --git a/addons/stock/wizard/wizard_location_product.py b/addons/stock/wizard/wizard_location_product.py
index 0083c0e9863..f6190c023d2 100755
--- a/addons/stock/wizard/wizard_location_product.py
+++ b/addons/stock/wizard/wizard_location_product.py
@@ -34,24 +34,27 @@ import time
 
 def _action_open_window(self, cr, uid, data, context):      
     return {
-                'view_type': 'form',
-                "view_mode": 'tree,form',
-                'res_model': 'product.product',
-                'type': 'ir.actions.act_window',
-                'context':{'location': data['ids'][0],'from_date':data['form']['from_date'],'to_date':data['form']['to_date']},
-                'domain':[('type','<>','service')]
-     }
+        'name': False,
+        'view_type': 'form',
+        "view_mode": 'tree,form',
+        'res_model': 'product.product',
+        'type': 'ir.actions.act_window',
+        'context':{'location': data['ids'][0],'from_date':data['form']['from_date'],'to_date':data['form']['to_date']},
+        'domain':[('type','<>','service')]
+    }
 
 
 class product_by_location(wizard.interface):
-    
     form1 = '''<?xml version="1.0"?>
     <form string="View Stock of Products">
+        <separator string="Stock Location Analysis" colspan="4"/>
         <field name="from_date"/>
         <newline/>
         <field name="to_date"/>
+        <newline/>
+        <label string=""/>
+        <label string="(Keep empty to open the current situation)" align="0.0" colspan="3"/>
     </form>'''
-    
     form1_fields = {
              'from_date': {
                 'string': 'From',
@@ -66,13 +69,11 @@ class product_by_location(wizard.interface):
     states = {
       'init': {
             'actions': [],
-            'result': {'type': 'form', 'arch':form1, 'fields':form1_fields, 'state': [ ('open', 'Open Products'),('end', 'Cancel')]}
+            'result': {'type': 'form', 'arch':form1, 'fields':form1_fields, 'state': [('end', 'Cancel','gtk-cancel'),('open', 'Open Products','gtk-ok')]}
         },
     'open': {
             'actions': [],
             'result': {'type': 'action', 'action': _action_open_window, 'state':'end'}
         }
     }
-    
 product_by_location('stock.location.products')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From ac351807de2a1e3407b6eafb2437fc2853244e77 Mon Sep 17 00:00:00 2001
From: qdp <qdp@tinyerp.com>
Date: Tue, 23 Sep 2008 14:51:52 +0200
Subject: [PATCH 05/46] *added equity account_account_type *changed closing
 method of income and expense account_account_type from non to unreconciled

bzr revid: qdp@tinyerp.com-20080923125152-2iol21q7i4zw3i83
---
 addons/account/demo/account_minimal.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index 0138cd5e668..cee3a333e6a 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -21,15 +21,20 @@
             <field name="code">liability</field>
             <field name="close_method">balance</field>
         </record>
+        <record id="account_type_cash_equity" model="account.account.type">
+            <field name="name">Equity</field> 
+            <field name="code">equity</field>
+            <field name="close_method">balance</field>
+        </record>
         <record id="account_type_income" model="account.account.type">
             <field name="name">Income</field> 
             <field name="code">income</field>
-            <field name="close_method">none</field>
+            <field name="close_method">unreconciled</field>
         </record>
         <record id="account_type_expense" model="account.account.type">
             <field name="name">Expense</field> 
             <field name="code">expense</field>
-            <field name="close_method">none</field>
+            <field name="close_method">unreconciled</field>
         </record>
         <record id="account_type_cash_moves" model="account.account.type">
             <field name="name">Cash</field> 

From 004e883f9fb3f45e69e9601fb46cc4771ba18f8b Mon Sep 17 00:00:00 2001
From: qdp <qdp@tinyerp.com>
Date: Tue, 23 Sep 2008 15:28:07 +0200
Subject: [PATCH 06/46] *bugfixed

bzr revid: qdp@tinyerp.com-20080923132807-4gnt09yhvi7opnb2
---
 addons/account_invoice_layout/account_invoice_layout.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/account_invoice_layout/account_invoice_layout.py b/addons/account_invoice_layout/account_invoice_layout.py
index 33be86f2729..a7290ad01d3 100644
--- a/addons/account_invoice_layout/account_invoice_layout.py
+++ b/addons/account_invoice_layout/account_invoice_layout.py
@@ -142,10 +142,12 @@ class account_invoice_line(osv.osv):
         'sequence': fields.integer('Sequence Number'),
         'functional_field': fields.function(_fnct, arg=None, fnct_inv=None, fnct_inv_arg=None, type='char', fnct_search=None, obj=None, method=True, store=False, string="Source Account"),
     }
+
     def _default_account(self, cr, uid, context=None):
-        cr.execute("select id from account_account where code = 0 LIMIT 1")
+        cr.execute("select id from account_account where parent_id IS NULL LIMIT 1")
         res=cr.fetchone()
         return res[0]
+
     _defaults = {
         'state': lambda *a: 'article',
 #       'account_id': _default_account

From ef38343c1113c1ae877d2ac7156a4901fe9773b1 Mon Sep 17 00:00:00 2001
From: Harshad Modi <hmo@tinyerp.com>
Date: Tue, 23 Sep 2008 18:54:11 +0530
Subject: [PATCH 07/46] Improvement on compute stock

bzr revid: hmo@tinyerp.com-20080923132411-ioz1m9wf0y76sil5
---
 addons/stock/product.py | 180 +++++++++++++++++++++++++++++++++-------
 addons/stock/stock.py   | 106 ++---------------------
 2 files changed, 157 insertions(+), 129 deletions(-)

diff --git a/addons/stock/product.py b/addons/stock/product.py
index f66e41acd4a..bef5ccaedad 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -42,53 +42,171 @@ class product_product(osv.osv):
 #        j = cr.fetchone()[0]
 #        if j:
 #            return 'Products: '+j
-#        return False
-#
+#        return False    
+
+    
+        
+    def get_product_available(self,cr,uid,ids,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=%d', (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=%d', (int(context['warehouse']),))
+            res2 = cr.fetchone()
+            if res2:
+                context['location'] = res2[0]
+
+        if context.get('location', False):
+            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
+        location_ids = self.pool.get('stock.location').search(cr, uid, [('location_id', 'child_of', location_ids)])        
+
+        states_str = ','.join(map(lambda s: "'%s'" % s, states))           
+
+        product2uom = {}
+        for product in self.browse(cr, uid, ids, context=context):
+            product2uom[product.id] = product.uom_id.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>='%s' and date<=%s"%(from_date,to_date)
+        elif from_date:
+            date_str="date>='%s'"%(from_date)
+        elif to_date:
+            date_str="date<='%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 '\
+                'from stock_move '\
+                'where location_id not in ('+location_ids_str+') '\
+                'and 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,product_uom'
+            )
+            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 '\
+                'from stock_move '\
+                'where location_id in ('+location_ids_str+') '\
+                'and location_dest_id not 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,product_uom'
+            )
+            results2 = cr.fetchall()
+        uom_obj = self.pool.get('product.uom')
+        for amount, prod_id, prod_uom in results:
+            amount = uom_obj._compute_qty(cr, uid, prod_uom, amount,
+                    context.get('uom', False) or product2uom[prod_id])
+            res[prod_id] += amount
+        for amount, prod_id, prod_uom in results2:
+            amount = uom_obj._compute_qty(cr, uid, prod_uom, amount,
+                    context.get('uom', False) or product2uom[prod_id])
+            res[prod_id] -= amount        
+        return res                           
+
     def _get_product_available_func(states, what):
-        def _product_available(self, cr, uid, ids, name, arg, context={}):
-            if context.get('shop', False):
-                cr.execute('select warehouse_id from sale_shop where id=%d', (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=%d', (int(context['warehouse']),))
-                res2 = cr.fetchone()
-                if res2:
-                    context['location'] = res2[0]
-
-            if context.get('location', False):
-                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
-            location_ids = self.pool.get('stock.location').search(cr, uid, [('location_id', 'child_of', location_ids)])
-            res = self.pool.get('stock.location')._product_get_multi_location(cr, uid, location_ids, ids, context, states, what)
+        def _product_available(self, cr, uid, ids, field_names=False, arg=False, context={}):
+            context.update({
+                'states':states,
+                'what':what
+            })
+            stock=self.get_product_available(cr,uid,ids,context=context)            
+            res = {}
             for id in ids:
-                res.setdefault(id, 0.0)
+                res[id] = {}.fromkeys(field_names, 0.0)                                
+                for a in field_names:
+                    res[id][a] = stock.get(id, 0.0)
             return res
+            
         return _product_available
 
     _product_qty_available = _get_product_available_func(('done',), ('in', 'out'))
     _product_virtual_available = _get_product_available_func(('confirmed','waiting','assigned','done'), ('in', 'out'))
     _product_outgoing_qty = _get_product_available_func(('confirmed','waiting','assigned'), ('out',))
     _product_incoming_qty = _get_product_available_func(('confirmed','waiting','assigned'), ('in',))
+
+    
     _columns = {
-        'qty_available': fields.function(_product_qty_available, method=True, type='float', string='Real Stock', help="Current quantities of products in selected locations or all internal if none have been selected."),
-        'virtual_available': fields.function(_product_virtual_available, method=True, type='float', string='Virtual Stock', help="Futur stock for this product according to the selected location or all internal if none have been selected. Computed as: Real Stock - Outgoing + Incoming."),
-        'incoming_qty': fields.function(_product_incoming_qty, method=True, type='float', string='Incoming', help="Quantities of products that are planned to arrive in selected locations or all internal if none have been selected."),
-        'outgoing_qty': fields.function(_product_outgoing_qty, method=True, type='float', string='Outgoing', help="Quantities of products that are planned to leave in selected locations or all internal if none have been selected."),
+        'qty_available': fields.function(_product_qty_available, method=True, type='float', string='Real Stock',multi='qty_available', help="Current quantities of products in selected locations or all internal if none have been selected."),
+        'virtual_available': fields.function(_product_virtual_available, method=True, type='float', string='Virtual Stock',multi='qty_available', help="Futur stock for this product according to the selected location or all internal if none have been selected. Computed as: Real Stock - Outgoing + Incoming."),
+        'incoming_qty': fields.function(_product_incoming_qty, method=True, type='float', string='Incoming',multi='qty_available', help="Quantities of products that are planned to arrive in selected locations or all internal if none have been selected."),
+        'outgoing_qty': fields.function(_product_outgoing_qty, method=True, type='float', string='Outgoing',multi='qty_available', help="Quantities of products that are planned to leave in selected locations or all internal if none have been selected."),
         'track_production' : fields.boolean('Track Production Lots' , help="Force to use a Production Lot during production order"),
         'track_incoming' : fields.boolean('Track Incomming Lots', help="Force to use a Production Lot during receptions"),
         'track_outgoing' : fields.boolean('Track Outging Lots', help="Force to use a Production Lot during deliveries"),
     }
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False):
+        res = super(product_product,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar)
+        if ('location' in context) and context['location']:
+            location_info = self.pool.get('stock.location').browse(cr, uid, context['location'])
+            fields=res.get('fields',{})
+            if fields:
+                if location_info.usage == 'supplier':   
+                    if fields.get('virtual_available'):             
+                        res['fields']['virtual_available']['string'] = 'Futur Receptions'
+                    if fields.get('qty_available'):
+                        res['fields']['qty_available']['string'] = 'Received Qty'
+                    
+                if location_info.usage == 'internal':
+                    if fields.get('virtual_available'):
+                        res['fields']['virtual_available']['string'] = 'Futur Stock'
+                    
+                if location_info.usage == 'customer':
+                    if fields.get('virtual_available'):
+                        res['fields']['virtual_available']['string'] = 'Futur Deliveries'
+                    if fields.get('qty_available'):
+                        res['fields']['qty_available']['string'] = 'Delivered Qty'
+                    
+                if location_info.usage == 'inventory':
+                    if fields.get('virtual_available'):
+                        res['fields']['virtual_available']['string'] = 'Futur P&L'
+                    res['fields']['qty_available']['string'] = 'P&L Qty'
+                    
+                if location_info.usage == 'procurement':
+                    if fields.get('virtual_available'):
+                        res['fields']['virtual_available']['string'] = 'Futur Qty'
+                    if fields.get('qty_available'):
+                        res['fields']['qty_available']['string'] = 'Unplanned Qty'
+                
+                if location_info.usage == 'production':
+                    if fields.get('virtual_available'):
+                        res['fields']['virtual_available']['string'] = 'Futur Productions'
+                    if fields.get('qty_available'):
+                        res['fields']['qty_available']['string'] = 'Produced Qty'
+                
+        return res
 product_product()
 
 
-class product_product(osv.osv):
+class product_template(osv.osv):
     _name = 'product.template'
     _inherit = 'product.template'
     _columns = {
@@ -126,7 +244,7 @@ class product_product(osv.osv):
             help='This account will be used, instead of the default one, to value output stock'),
     }
 
-product_product()
+product_template()
 
 
 class product_category(osv.osv):
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 2d2565553e9..23d3a1ab2e5 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -201,69 +201,14 @@ class stock_location(osv.osv):
                     })
         return result
 
-    def _product_get_multi_location(self, cr, uid, ids, product_ids=False, context={}, states=['done'], what=('in', 'out')):
-        
-        product_obj = self.pool.get('product.product')
-        states_str = ','.join(map(lambda s: "'%s'" % s, states))
-        if not product_ids:
-            product_ids = product_obj.search(cr, uid, [])
-        res = {}.fromkeys(product_ids, 0.0)
-        if not ids:
-            return res
-
-        product2uom = {}
-        for product in product_obj.browse(cr, uid, product_ids, context=context):
-            product2uom[product.id] = product.uom_id.id
-
-        prod_ids_str = ','.join(map(str, product_ids))
-        location_ids_str = ','.join(map(str, 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>='%s' and date<=%s"%(from_date,to_date)
-        elif from_date:
-           date_str="date>='%s'"%(from_date)
-        elif to_date:
-           date_str="date<='%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 '\
-                'from stock_move '\
-                'where location_id not in ('+location_ids_str+') '\
-                'and 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,product_uom'
-            )
-            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 '\
-                'from stock_move '\
-                'where location_id in ('+location_ids_str+') '\
-                'and location_dest_id not 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,product_uom'
-            )
-            results2 = cr.fetchall()
-        uom_obj = self.pool.get('product.uom')
-        for amount, prod_id, prod_uom in results:
-            amount = uom_obj._compute_qty(cr, uid, prod_uom, amount,
-                    context.get('uom', False) or product2uom[prod_id])
-            res[prod_id] += amount
-        for amount, prod_id, prod_uom in results2:
-            amount = uom_obj._compute_qty(cr, uid, prod_uom, amount,
-                    context.get('uom', False) or product2uom[prod_id])
-            res[prod_id] -= amount
-        return res
+    def _product_get_multi_location(self, cr, uid, ids, product_ids=False, context={}, states=['done'], what=('in', 'out')):                
+        product_obj = self.pool.get('product.product')        
+        context.update({
+            'states':states,
+            'what':what,
+            'location':ids
+        })                
+        return product_obj.get_product_available(cr,uid,product_ids,context=context)
 
     def _product_get(self, cr, uid, id, product_ids=False, context={}, states=['done']):
         ids = id and [id] or []
@@ -1383,39 +1328,4 @@ class stock_picking_move_wizard(osv.osv_memory):
         return {'type':'ir.actions.act_window_close' }
             
 stock_picking_move_wizard()        
-
-class product_product(osv.osv):
-    _inherit = 'product.product'
-    
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False):
-        res = super(product_product,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar)
-        if ('location' in context) and context['location']:
-            location_info = self.pool.get('stock.location').browse(cr, uid, context['location'])
-            
-            if location_info.usage == 'supplier':
-                res['fields']['virtual_available']['string'] = 'Futur Receptions'
-                res['fields']['qty_available']['string'] = 'Received Qty'
-                
-            if location_info.usage == 'internal':
-                res['fields']['virtual_available']['string'] = 'Futur Stock'
-                
-            if location_info.usage == 'customer':
-                res['fields']['virtual_available']['string'] = 'Futur Deliveries'
-                res['fields']['qty_available']['string'] = 'Delivered Qty'
-                
-            if location_info.usage == 'inventory':
-                res['fields']['virtual_available']['string'] = 'Futur P&L'
-                res['fields']['qty_available']['string'] = 'P&L Qty'
-                
-            if location_info.usage == 'procurement':
-                res['fields']['virtual_available']['string'] = 'Futur Qty'
-                res['fields']['qty_available']['string'] = 'Unplanned Qty'
-            
-            if location_info.usage == 'production':
-                res['fields']['virtual_available']['string'] = 'Futur Productions'
-                res['fields']['qty_available']['string'] = 'Produced Qty'
-                
-        return res
-
-product_product()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From b751bebc983a1d3bb637024d2428eb33fa77fc7d Mon Sep 17 00:00:00 2001
From: Christophe Simonis <christophe@tinyerp.com>
Date: Tue, 23 Sep 2008 18:24:56 +0200
Subject: [PATCH 08/46] filter menu using actions groups

bzr revid: christophe@tinyerp.com-20080923162456-3mimhd96ve8qfs4y
---
 bin/addons/base/ir/ir_ui_menu.py | 26 +++++++++++++++++---------
 bin/addons/base/res/res_user.py  | 12 +++++++++---
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/bin/addons/base/ir/ir_ui_menu.py b/bin/addons/base/ir/ir_ui_menu.py
index a76b8ec1e76..555a5b4b7a1 100644
--- a/bin/addons/base/ir/ir_ui_menu.py
+++ b/bin/addons/base/ir/ir_ui_menu.py
@@ -66,16 +66,25 @@ class ir_ui_menu(osv.osv):
                 context=context)
         if uid==1:
             return ids
-        user_groups = self.pool.get('res.users').read(cr, uid, [uid])[0]['groups_id']
+        user_groups = set(self.pool.get('res.users').read(cr, uid, uid)['groups_id'])
         result = []
         for menu in self.browse(cr, uid, ids):
-            if not len(menu.groups_id):
-                result.append(menu.id)
+            restrict_to_groups = menu.groups_id
+            if not restrict_to_groups:
+                if menu.action:
+                    # if the menu itself has no restrictions, we get the groups of 
+                    # the action of the menu
+                    try:
+                        m, oid = menu.action.split(',', 1)
+                        data = self.pool.get(m).read(cr, uid, int(oid), context=context)
+                        if data and 'groups_id' in data:
+                            restrict_to_groups = data['groups_id']
+                    except:
+                        pass
+
+            if restrict_to_groups and not user_groups.intersection(restrict_to_groups):
                 continue
-            for g in menu.groups_id:
-                if g.id in user_groups:
-                    result.append(menu.id)
-                    break
+            result.append(menu.id)
         return result
 
     def _get_full_name(self, cr, uid, ids, name, args, context):
@@ -122,8 +131,7 @@ class ir_ui_menu(osv.osv):
             ('key2', '=', 'tree_but_open'), ('res_id', 'in', ids)],
             context=context)
         values_action = {}
-        for value in values_obj.browse(cursor, user, value_ids,
-                context=context):
+        for value in values_obj.browse(cursor, user, value_ids, context=context):
             values_action[value.res_id] = value.value
         for menu_id in ids:
             res[menu_id] = values_action.get(menu_id, False)
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index d168a69de38..35b008806e1 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -118,12 +118,18 @@ class users(osv.osv):
         'context_tz': fields.selection(_tz_get,  'Timezone', size=64)
     }
     def read(self,cr, uid, ids, fields=None, context=None, load='_classic_read'):
+        def override_password(o):
+            if 'password' in o:
+                o['password'] = '********'
+            return o
+
         result = super(users, self).read(cr, uid, ids, fields, context, load)
         canwrite = self.pool.get('ir.model.access').check(cr, uid, 'res.users', 'write', raise_exception=False)
         if not canwrite:
-            for r in result:
-                if 'password' in r:
-                    r['password'] = '********'
+            if isinstance(ids, (int, float)):
+                result = override_password(result)
+            else:
+                result = map(override_password, result)
         return result
 
     _sql_constraints = [

From 88a6b3780ce26ca3cdf98bd109162f6849754122 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 23 Sep 2008 18:27:16 +0200
Subject: [PATCH 09/46] bugfix

bzr revid: fp@tinyerp.com-20080923162716-qbaxamq0btfongpw
---
 bin/osv/orm.py | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 0c636acdd03..5bc44b4fd3d 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -775,23 +775,15 @@ class orm_template(object):
             if result:
                 node.setAttribute('string', result.decode('utf-8'))
         if node.nodeType == node.ELEMENT_NODE and node.hasAttribute('groups'):
-            groups = None
-            group_str = node.getAttribute('groups')
-            if ',' in group_str:
-                groups = group_str.split(',')
+            if node.getAttribute('groups'):
+                groups = node.getAttribute('groups').split(',')
                 readonly = False
                 access_pool = self.pool.get('ir.model.access')
                 for group in groups:
-                    readonly = readonly and access_pool.check_groups(cr, user, group)
-
-                if readonly:
-                    parent = node.parentNode
-                    parent.removeChild(node)
-
-            else:
-                if not self.pool.get('ir.model.access').check_groups(cr, user, group_str):
-                    parent = node.parentNode
-                    parent.removeChild(node)
+                    readonly = readonly or access_pool.check_groups(cr, user, group)
+                if not readonly:
+                    node.setAttribute('invisible', '1')
+            node.removeAttribute('groups')
 
         if node.nodeType == node.ELEMENT_NODE:
             # translate view
@@ -837,7 +829,6 @@ class orm_template(object):
                     button.setAttribute('readonly', '0')
 
         arch = node.toxml(encoding="utf-8").replace('\t', '')
-
         fields = self.fields_get(cr, user, fields_def.keys(), context)
         for field in fields_def:
             fields[field].update(fields_def[field])

From 23c9ff49a0c59263d7bfaa24cd1c87c61ada22ad Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 23 Sep 2008 22:56:51 +0200
Subject: [PATCH 10/46] Improvements

bzr revid: fp@tinyerp.com-20080923205651-fz3o7sgm704qndkt
---
 addons/account/account_invoice_view.xml       | 18 +++++++---------
 .../account_invoice_layout_report.xml         |  4 ++--
 addons/delivery/delivery_view.xml             |  9 ++++----
 addons/purchase/purchase_view.xml             |  2 +-
 addons/sale/sale.py                           | 21 +++++++++++++++----
 addons/sale/sale_view.xml                     |  8 +++++--
 addons/stock/product.py                       |  4 ++--
 addons/stock/product_view.xml                 |  2 +-
 addons/stock/stock_view.xml                   |  5 +++--
 9 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 46239314c40..7483cad9aa0 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -175,15 +175,14 @@
                                 </field>
                             </group>
                             <group col="4" colspan="2">
-                                <label colspan="2"/>
-                                <field name="amount_untaxed"/>
                                 <button colspan="2" name="button_reset_taxes" states="draft" string="Reset taxes" type="object"/>
-                                <field name="amount_tax"/>
+                                <field name="amount_untaxed"/>
                                 <button colspan="2" name="button_compute" states="draft" string="Compute" type="object"/>
-                                <field name="amount_total"/>
+                                <field name="amount_tax"/>
                                 <field name="reconciled"/>
-                                <field name="residual"/>
+                                <field name="amount_total"/>
                                 <field name="state" select="2"/>
+                                <field name="residual"/>
                                 <group col="3" colspan="4">
                                     <button name="invoice_open" states="draft,proforma" string="Validate"/>
                                     <button name="invoice_cancel" states="draft,proforma,sale,open" string="Cancel"/>
@@ -258,15 +257,14 @@
                                 </field>
                             </group>
                             <group col="4" colspan="2">
-                                <label colspan="2"/>
-                                <field name="amount_untaxed"/>
                                 <button colspan="2" name="button_reset_taxes" states="draft" string="Reset taxes" type="object"/>
-                                <field name="amount_tax"/>
+                                <field name="amount_untaxed"/>
                                 <button colspan="2" name="button_compute" states="draft" string="Compute" type="object"/>
-                                <field name="amount_total"/>
+                                <field name="amount_tax"/>
                                 <field name="reconciled"/>
-                                <field name="residual"/>
+                                <field name="amount_total"/>
                                 <field name="state" select="2"/>
+                                <field name="residual"/>
                                 <group col="3" colspan="4">
                                     <button name="invoice_proforma" states="draft" string="PRO-FORMA"/>
                                     <button name="invoice_open" states="draft,proforma" string="Create"/>
diff --git a/addons/account_invoice_layout/account_invoice_layout_report.xml b/addons/account_invoice_layout/account_invoice_layout_report.xml
index dcc5c5ed1a4..034e869d912 100644
--- a/addons/account_invoice_layout/account_invoice_layout_report.xml
+++ b/addons/account_invoice_layout/account_invoice_layout_report.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
 	<data>
-	<wizard	string="Formatted Inv. + Message"
+	<wizard	string="Invoice + Message"
 			model="account.invoice"
 			name="wizard.notify_message"
 			id="wizard_notify_message"
@@ -9,7 +9,7 @@
 			/>
 
 	<report id="account_invoices_1"
-			string="Formatted Inv."
+			string="Invoice"
 			model="account.invoice"
 			name="account.invoice.layout"
 			rml="account_invoice_layout/report/report_account_invoice_layout.rml"
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 7816896f771..07dec155ddf 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -58,13 +58,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Delivery grids">
+                    <field name="name" select="1"/>
+                    <field name="active" select="1"/>
+                    <field name="carrier_id" select="1"/>
+                    <field name="sequence" select="1"/>
                     <notebook>
                         <page string="Grid definition">
-                            <field name="name" select="1"/>
-                            <field name="active" select="1"/>
-                            <field name="carrier_id" select="1"/>
-                            <field name="sequence" select="1"/>
-                            <separator colspan="4" string="Grid Lines"/>
                             <field colspan="4" name="line_ids" nolabel="1" select="1"/>
                         </page>
                         <page string="Destination">
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 8d3611f9990..48a24bee967 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -169,9 +169,9 @@
                 <form string="Purchase Order Line">
                     <notebook>
                         <page string="Order Line">
+                            <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="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order)"/>
                             <field name="product_qty"/>
                             <field name="product_uom" on_change="product_uom_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order)"/>
-                            <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="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order)"/>
                             <field colspan="4" name="name"/>
                             <field name="date_planned"/>
                             <field name="price_unit"/>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 45783dd5978..9d6a9e113fc 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -214,7 +214,8 @@ class sale_order(osv.osv):
         'partner_shipping_id':fields.many2one('res.partner.address', 'Shipping Address', readonly=True, required=True, states={'draft':[('readonly',False)]}),
 
         'incoterm': fields.selection(_incoterm_get, 'Incoterm',size=3),
-        'picking_policy': fields.selection([('direct','Partial Delivery'),('one','Complete Delivery')], 'Packing Policy', required=True),
+        'picking_policy': fields.selection([('direct','Partial Delivery'),('one','Complete Delivery')],
+            'Packing Policy', required=True, help="""If you don't have enough stock available to deliver all at once, do you accept partial shippings or not."""),
         'order_policy': fields.selection([
             ('prepaid','Payment before delivery'),
             ('manual','Shipping & Manual Invoice'),
@@ -928,15 +929,27 @@ class sale_config_picking_policy(osv.osv_memory):
     _name='sale.config.picking_policy'
     _columns = {
         'name':fields.char('Name', size=64),
-        'picking_policy': fields.selection([('direct','Direct Delivery'),('one','All at once')], 'Packing Policy', required=True ),
+        'picking_policy': fields.selection([
+            ('direct','Direct Delivery'),
+            ('one','All at once')
+        ], 'Packing Policy', required=True ),
+        'order_policy': fields.selection([
+            ('manual','Invoice based on Sales Orders'),
+            ('picking','Invoice based on Deliveries'),
+        ], 'Shipping Policy', required=True, readonly=True, states={'draft':[('readonly',False)]}),
     }
     _defaults={
         'picking_policy': lambda *a: 'direct',
+        'order_policy': lambda *a: 'picking'
     }
     def set_default(self, cr, uid, ids, context=None):
-        if 'name' in context:
+        print context
+        for o in self.browse(cr, uid, ids, context=context):
+            print o.picking_policy, o.order_policy
             ir_values_obj = self.pool.get('ir.values')
-            ir_values_obj.set(cr,uid,'default',False,'picking_policy',['sale.order'],context['picking_policy'])
+            ir_values_obj.set(cr,uid,'default',False,'picking_policy',['sale.order'],o.picking_policy)
+            ir_values_obj = self.pool.get('ir.values')
+            ir_values_obj.set(cr,uid,'default',False,'order_policy',['sale.order'],o.order_policy)
         return {
                 'view_type': 'form',
                 "view_mode": 'form',
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 68cf27bddf5..3dae936a054 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -39,6 +39,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.shop</field>
             <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_shop_tree"/>
         </record>
         <menuitem id="menu_shop_configuration" name="Configuration" parent="sale.menu_sale_root" sequence="1"/>
@@ -221,6 +222,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.order</field>
             <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar,graph</field>
         </record>
         <menuitem action="action_order_form" id="menu_sale_order" parent="sale.menu_sale_root"/>
 
@@ -453,10 +455,12 @@
             <field name="model">sale.config.picking_policy</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Picking Policy for Sale Order">
-                    <separator col="4" colspan="4" string="Configure Picking Policy for Sale Order"/>
+                <form string="Sales Configuration">
+                    <separator colspan="4" string="Configure Sale Order Logistic"/>
                     <newline/>
                     <field name="picking_policy"/>
+                    <newline/>
+                    <field name="order_policy"/>
                     <group col="4" colspan="4">
                         <button icon="gtk-cancel" name="action_cancel" type="object" special="cancel" string="Cancel"/>
                         <button icon="gtk-ok" name="set_default" string="Set Default" type="object"/>
diff --git a/addons/stock/product.py b/addons/stock/product.py
index 87f4c9f8122..4861b86d380 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -32,7 +32,7 @@ from osv import fields, osv
 
 class product_product(osv.osv):
     _inherit = "product.product"
-    def view_header_get(self, cr, user, view_id, view_type, context):
+    def __old_view_header_get(self, cr, user, view_id, view_type, context):
         res = super(product_product, self).view_header_get(cr, user, view_id, view_type, context)
         if res: return res
         if (context.get('location', False)):
@@ -156,7 +156,7 @@ class product_product(osv.osv):
         'track_incoming' : fields.boolean('Track Incomming Lots', help="Force to use a Production Lot during receptions"),
         'track_outgoing' : fields.boolean('Track Outging Lots', help="Force to use a Production Lot during deliveries"),
     }
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False):
+    def __old_fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False):
         res = super(product_product,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar)
         if ('location' in context) and context['location']:
             location_info = self.pool.get('stock.location').browse(cr, uid, context['location'])
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 823f8da8d4a..736659bb9b3 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -62,7 +62,7 @@
             <field name="arch" type="xml">
                 <group name="status" position="after">
                     <group colspan="2" col="2">
-                    <separator string="Stocks" colspan="4"/>
+                        <separator string="Stocks" colspan="4"/>
                         <field name="qty_available"/>
                         <field name="virtual_available"/>
                         <field name="incoming_qty"/>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 1b149e54213..c5b01a66e8b 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -773,6 +773,7 @@
                     <field name="name"/>
                     <field name="address_id"/>
                     <field name="backorder_id"/>
+                    <field name="origin"/>
                     <field name="date"/>
                     <field name="min_date"/>
                     <field name="state"/>
@@ -940,8 +941,8 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree color="red:state=='cancel'" string="Packing list">
-                    <field colspan="4" name="name"/>
-                    <field name="address_id" select="1"/>
+                    <field name="name"/>
+                    <field name="address_id"/>
                     <field name="invoice_state"/>
                     <field name="origin"/>
                     <field name="backorder_id"/>

From f6d8f032aafe1300e61fb691d6b4cdc2538da986 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 23 Sep 2008 23:19:02 +0200
Subject: [PATCH 11/46] Better Views

bzr revid: fp@tinyerp.com-20080923211902-bajhm3mqqsgjecju
---
 addons/mrp/mrp_view.xml     |  2 +-
 addons/stock/stock.py       |  2 +-
 addons/stock/stock_view.xml | 14 ++++++++------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 50cfd1881c6..a9ecc4758b0 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -439,7 +439,7 @@
                         <page string="Finnished Products">
                             <field colspan="4" name="move_created_ids" nolabel="1"/>
                         </page>
-                        <page string="Operations">
+                        <page string="Work Orders">
                             <field colspan="4" name="workcenter_lines" nolabel="1" widget="one2many_list"/>
                         </page>
                         <page string="Extra Information">
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 23d3a1ab2e5..952bff3bda6 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -379,7 +379,7 @@ class stock_picking(osv.osv):
             ], 'Status', readonly=True, select=True),
         'min_date': fields.function(get_min_max_date, fnct_inv=_set_minimum_date, multi="min_max_date",
                  method=True,store=True, type='datetime', string='Planned Date', select=1),
-        'date':fields.datetime('Date create'),
+        'date':fields.datetime('Date Order'),
         'max_date': fields.function(get_min_max_date, fnct_inv=_set_maximum_date, multi="min_max_date",
                  method=True,store=True, type='datetime', string='Max. Planned Date', select=2),
         'move_lines': fields.one2many('stock.move', 'picking_id', 'Move lines'),
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index c5b01a66e8b..65850b1afbc 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -492,12 +492,12 @@
             <field name="arch" type="xml">
                 <tree color="red:state=='cancel'" string="Packing list">
                     <field name="name"/>
-                    <field name="address_id" select="1"/>
-                    <field name="invoice_state"/>
                     <field name="origin"/>
+                    <field name="address_id" select="1"/>
                     <field name="backorder_id"/>
                     <field name="date"/>
                     <field name="min_date"/>
+                    <field name="invoice_state"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -587,8 +587,9 @@
             <field name="arch" type="xml">
                 <tree color="red:state=='cancel'" string="Packing list">
                     <field name="name"/>
-                    <field name="address_id" select="1"/>
                     <field name="origin"/>
+                    <field name="address_id" select="1"/>
+                    <field name="backorder_id"/>
                     <field name="date" select="1"/>
                     <field name="min_date" select="1"/>
                     <field name="state" select="1"/>
@@ -771,11 +772,12 @@
             <field name="arch" type="xml">
                 <tree color="red:state=='cancel'" string="Packing list">
                     <field name="name"/>
+                    <field name="origin"/>
                     <field name="address_id"/>
                     <field name="backorder_id"/>
-                    <field name="origin"/>
                     <field name="date"/>
                     <field name="min_date"/>
+                    <field name="invoice_state"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -942,12 +944,12 @@
             <field name="arch" type="xml">
                 <tree color="red:state=='cancel'" string="Packing list">
                     <field name="name"/>
-                    <field name="address_id"/>
-                    <field name="invoice_state"/>
                     <field name="origin"/>
+                    <field name="address_id"/>
                     <field name="backorder_id"/>
                     <field name="date"/>
                     <field name="min_date"/>
+                    <field name="invoice_state"/>
                     <field name="state"/>
                 </tree>
             </field>

From 9e83fed2509dbe4113abb42237dcaabe17fe78f7 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@tinyerp.com>
Date: Wed, 24 Sep 2008 05:21:35 +0200
Subject: [PATCH 12/46] If the ids is an int or a long, convert it to array, to
 avoid an error from the orm

bzr revid: stephane@tinyerp.com-20080924032135-q52ns1968r88mdxt
---
 bin/osv/orm.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 5bc44b4fd3d..f8defece530 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1113,6 +1113,8 @@ class orm_memory(orm_template):
             fields_to_read = self._columns.keys()
         result = []
         if self.datas:
+            if isinstance(ids, (int, long)):
+                ids = [ids]
             for id in ids:
                 r = {'id': id}
                 for f in fields_to_read:
@@ -1128,6 +1130,8 @@ class orm_memory(orm_template):
                 res2 = self._columns[f].get_memory(cr, self, ids, f, user, context=context, values=result)
                 for record in result:
                     record[f] = res2[record['id']]
+            if isinstance(ids, (int, long)):
+                return result[0]
         return result
 
     def write(self, cr, user, ids, vals, context=None):

From c82b81aa0cf4286d95562a3d449462d4e5bcf78b Mon Sep 17 00:00:00 2001
From: "hda@tinyerp.com" <>
Date: Wed, 24 Sep 2008 11:34:32 +0530
Subject: [PATCH 13/46] change user action

bzr revid: hda@tinyerp.com-20080924060432-pb1ln88r9x6k310p
---
 bin/addons/base/module/module.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py
index 30b154a1145..ca25c010ccc 100644
--- a/bin/addons/base/module/module.py
+++ b/bin/addons/base/module/module.py
@@ -681,8 +681,8 @@ class module_configuration(osv.osv_memory):
                   'target':item.action_id.target,
             }
         user_action=self.pool.get('res.users').browse(cr,uid,uid)
-        act_obj=self.pool.get(user_action.action_id.type)
-        action_ids=act_obj.search(cr,uid,[('name','=',user_action.action_id.name)])
+        act_obj=self.pool.get(user_action.menu_id.type)
+        action_ids=act_obj.search(cr,uid,[('name','=',user_action.menu_id.name)])
         action_open=act_obj.browse(cr,uid,action_ids)[0]
         if context.get('menu',False):
             return{

From e443b07b62cb39b50c725865a046a5a0ba90eb4a Mon Sep 17 00:00:00 2001
From: Amit Mendapara <ame@tinyerp.com>
Date: Wed, 24 Sep 2008 12:27:49 +0530
Subject: [PATCH 14/46] Improved Process module (related resources).

bzr revid: ame@tinyerp.com-20080924065749-4dqur1irytsa07il
---
 addons/process/process.py | 88 ++++++++++++++++++++-------------------
 1 file changed, 46 insertions(+), 42 deletions(-)

diff --git a/addons/process/process.py b/addons/process/process.py
index 2f3648a86f3..99f2e512738 100644
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -72,38 +72,7 @@ class process_process(osv.osv):
         current_user = pool.get('res.users').browse(cr, uid, [uid], context)[0]
         
         expr_context = Env(current_object, current_user)
-
-        def get_resource_info(node):
-            ret = False
-
-            src_model = res_model
-            src_id = res_id
-            
-            if node.transition_in:
-                tr = node.transition_in[0]
-                src = nodes.get(tr.source_node_id.id)
-                if src['res']:
-                    src_model = src['res']['model']
-                    src_id = src['res']['id']
-                else:
-                    return False
-
-            fields = pool.get(src_model).fields_get(cr, uid, context=context)
-
-            for name, field in fields.items():
-                if node.model_id and field.get('relation', False) == node.model_id.model:
-                    src_obj = pool.get(src_model).browse(cr, uid, [src_id], context)[0]
-                    rel = src_obj[name]
-                    if rel:
-                        if isinstance(rel, (list, tuple)):
-                            rel = rel[0]
-                        ret = {}
-                        ret['name'] = rel.name_get(context)[0][1]
-                        ret['model'] = field['relation']
-                        ret['id'] = rel.id
-
-            return ret
-            
+        
         notes = process.note
         nodes = {}
         start = []
@@ -121,18 +90,11 @@ class process_process(osv.osv):
             data['notes'] = node.note
             data['active'] = False
             data['gray'] = False
-            data['res'] = get_resource_info(node)
 
             if node.menu_id:
                 data['menu'] = {'name': node.menu_id.complete_name, 'id': node.menu_id.id}
             
             if node.model_id and node.model_id.model == res_model:
-
-                data['res'] = resource = {}
-                resource['name'] = current_object.name_get(context)[0][1]
-                resource['model'] = res_model
-                resource['id'] = res_id
-
                 try:
                     data['active'] = eval(node.model_states, expr_context)
                 except Exception, e:
@@ -178,12 +140,54 @@ class process_process(osv.osv):
                     roles.append(role)
                 transitions[tr.id] = data
 
+        # now populate resource information
+        def update_relatives(nid, ref_id, ref_model):
+            relatives = []
+
+            for tid, tr in transitions.items():
+                if tr['source'] == nid:
+                    relatives.append(tr['target'])
+                if tr['target'] == nid:
+                    relatives.append(tr['source'])
+
+            if not ref_id:
+                nodes[nid]['res'] = False
+                return
+
+            nodes[nid]['res'] = resource = {'id': ref_id, 'model': ref_model}
+
+            refobj = pool.get(ref_model).browse(cr, uid, [ref_id], context)[0]
+            fields = pool.get(ref_model).fields_get(cr, uid, context=context)
+
+            resource['name'] = refobj.name_get(context)[0][1]
+
+            for r in relatives:
+                node = nodes[r]
+                if 'res' not in node:
+                    for n, f in fields.items():
+                        if node['model'] == ref_model:
+                            update_relatives(r, ref_id, ref_model)
+
+                        elif f.get('relation') == node['model']:
+                            rel = refobj[n]
+                            if rel and isinstance(rel, list) :
+                                rel = rel[0]
+                            _id = (rel or False) and rel.id
+                            _model = node['model']
+                            update_relatives(r, _id, _model)
+
+        for nid, node in nodes.items():
+            if node['active'] or node['model'] == res_model:
+                update_relatives(nid, res_id, res_model)
+                break
+
+        # calculate graph layout
         g = tools.graph(nodes.keys(), map(lambda x: (x['source'], x['target']), transitions.values()))
-        g.process(start)
-        #g.scale(100, 100, 180, 120)
-        g.scale(*scale)
+        g.process(start)        
+        g.scale(*scale) #g.scale(100, 100, 180, 120)
         graph = g.result_get()
 
+        # fix the height problem
         miny = -1
         for k,v in nodes.items():
             x = graph[k]['y']

From 1bb7a3353179e3917bb031ca16c7b24bc0a47f15 Mon Sep 17 00:00:00 2001
From: Amit Mendapara <ame@tinyerp.com>
Date: Wed, 24 Sep 2008 13:59:04 +0530
Subject: [PATCH 15/46] * Access info.

bzr revid: ame@tinyerp.com-20080924082904-b5w1llp8bolja2o8
---
 addons/process/process.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/process/process.py b/addons/process/process.py
index 99f2e512738..2aedf7843f2 100644
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -81,6 +81,8 @@ class process_process(osv.osv):
         states = dict(pool.get(res_model).fields_get(cr, uid, context=context).get('state', {}).get('selection', {}))
         title = "%s - Resource: %s, State: %s" % (process.name, current_object.name, states.get(getattr(current_object, 'state'), 'N/A'))
 
+        perm = pool.get(res_model).perm_read(cr, uid, [res_id], context)[0]
+
         for node in process.node_ids:
             data = {}
             data['name'] = node.name
@@ -160,6 +162,7 @@ class process_process(osv.osv):
             fields = pool.get(ref_model).fields_get(cr, uid, context=context)
 
             resource['name'] = refobj.name_get(context)[0][1]
+            resource['perm'] = pool.get(ref_model).perm_read(cr, uid, [ref_id], context)[0]
 
             for r in relatives:
                 node = nodes[r]
@@ -202,7 +205,7 @@ class process_process(osv.osv):
             y = v['y']
             v['y'] = min(y - miny + 10, y)
 
-        return dict(title=title, notes=notes, nodes=nodes, transitions=transitions)
+        return dict(title=title, perm=perm, notes=notes, nodes=nodes, transitions=transitions)
 
 process_process()
 

From 39ae5e399bf186d0c3be8f4775abc80e842b1b71 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 24 Sep 2008 10:46:41 +0200
Subject: [PATCH 16/46] bugfixes

bzr revid: fp@tinyerp.com-20080924084641-hlagbz0xfd8trtgs
---
 addons/account/account_bank_statement.py      |  6 ++---
 addons/hr/hr_view.xml                         |  2 +-
 addons/product/product.py                     |  1 +
 addons/project/project.py                     |  4 ++--
 addons/project_timesheet/project_timesheet.py | 23 +++++++++++--------
 addons/stock/product.py                       |  6 ++---
 6 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index e4ad52570b9..91ee7d094b1 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -167,8 +167,8 @@ class account_bank_statement(osv.osv):
 
             if not (abs(st.balance_end - st.balance_end_real) < 0.0001):
                 raise osv.except_osv(_('Error !'),
-                        _('The statement balance is incorrect !\n'
-                        'Check that the ending balance equals the computed one.'))
+                        _('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(_('Configration Error !'),
@@ -177,7 +177,7 @@ class account_bank_statement(osv.osv):
             for line in st.move_line_ids:
                 if line.state <> 'valid':
                     raise osv.except_osv(_('Error !'),
-                            _('The account entries lines are not valid.'))
+                            _('The account entries lines are not in valid state.'))
 
             for move in st.line_ids:
                 move_id = account_move_obj.create(cr, uid, {
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 5b58d7cf448..060b90fd86a 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -144,7 +144,7 @@
             </field>
         </record>
         <record id="action2" model="ir.actions.act_window">
-            <field name="name">Hierarchical view of this employee</field>
+            <field name="name">Employee Hierarchy</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.employee</field>
             <field name="domain">[('id','in',active_ids)]</field>
diff --git a/addons/product/product.py b/addons/product/product.py
index 7529b46d837..6e1e70d3e98 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -588,6 +588,7 @@ class product_supplierinfo(osv.osv):
     }
     _defaults = {
         'qty': lambda *a: 0.0,
+        'sequence': lambda *a: 1,
         'delay': lambda *a: 1,
     }
     _order = 'sequence'
diff --git a/addons/project/project.py b/addons/project/project.py
index b9878b2888c..55ed7b33df4 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -260,7 +260,7 @@ class task(osv.osv):
         'sequence': fields.integer('Sequence'),
         'type': fields.many2one('project.task.type', 'Type'),
         'state': fields.selection([('draft', 'Draft'),('open', 'Open'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'Status', readonly=True, required=True),
-        'date_start': fields.datetime('Date'),
+        'date_start': fields.datetime('Date Opened'),
         'date_deadline': fields.datetime('Deadline'),
         'date_close': fields.datetime('Date Closed', readonly=True),
         'project_id': fields.many2one('project.project', 'Project', ondelete='cascade'),
@@ -289,7 +289,7 @@ class task(osv.osv):
         'active': lambda *a: True,
         'date_start': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
     }
-    _order = "state, sequence, priority, date_deadline, id"
+    _order = "sequence, priority, date_deadline, id"
 
     #
     # Override view according to the company definition
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 2a22b337359..4016abedc44 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -14,10 +14,9 @@ class project_work(osv.osv):
         vals_line={}
         obj_task = self.pool.get('project.task').browse(cr, uid, vals['task_id'])
 
-        vals_line['name']=vals['name']
+        vals_line['name']=obj_task.name + ': ' + vals['name']
         vals_line['user_id']=vals['user_id']
-        c_date=datetime.date(int(vals['date'][:4]),int(vals['date'][5:7]),int(vals['date'][8:10]))
-        vals_line['date']=c_date
+        vals_line['date']=vals['date'][:10]
         vals_line['unit_amount']=vals['hours']
         vals_line['account_id']=obj_task.project_id.category_id.id
         vals_line['amount']=00.0
@@ -32,17 +31,21 @@ class project_work(osv.osv):
     def write(self, cr, uid, ids,vals,context={}):
         vals_line={}
 
-        line_id=self.pool.get('project.task.work').browse(cr,uid,ids)[0].hr_analytic_timesheet_id
+        task=self.pool.get('project.task.work').browse(cr,uid,ids)[0]
+        line_id=task.hr_analytic_timesheet_id
         # in case,if a record is deleted from timesheet,but we change it from tasks!
         list_avail_ids=self.pool.get('hr.analytic.timesheet').search(cr,uid,[])
         if line_id in list_avail_ids:
             obj = self.pool.get('hr.analytic.timesheet')
-            vals_line['name']=vals['name']
-            vals_line['user_id']=vals['user_id']
-            c_date=datetime.date(int(vals['date'][:4]),int(vals['date'][5:7]),int(vals['date'][8:10]))
-            vals_line['date']=c_date
-            vals_line['unit_amount']=vals['hours']
-            vals_line['amount']=(-1) * vals['hours'] * obj.browse(cr,uid,line_id).product_id.standard_price
+            if 'name' in vals:
+                vals_line['name']=task.name+': '+vals['name']
+            if 'user_id' in vals:
+                vals_line['user_id']=vals['user_id']
+            if 'date' in vals:
+                vals_line['date']=vals['date'][:10]
+            if 'hours' in vals:
+                vals_line['unit_amount']=vals['hours']
+                vals_line['amount']=(-1) * vals['hours'] * obj.browse(cr,uid,line_id).product_id.standard_price
             obj.write(cr, uid,[line_id],vals_line,{})
 
         return super(project_work,self).write(cr, uid, ids,vals,context)
diff --git a/addons/stock/product.py b/addons/stock/product.py
index 4861b86d380..d03a1c9a15c 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -32,11 +32,11 @@ from osv import fields, osv
 
 class product_product(osv.osv):
     _inherit = "product.product"
-    def __old_view_header_get(self, cr, user, view_id, view_type, context):
+    def view_header_get(self, cr, user, view_id, view_type, context):
         res = super(product_product, self).view_header_get(cr, user, view_id, view_type, context)
         if res: return res
         if (context.get('location', False)):
-            return _('Products: ')+self.pool.get('stock.location').browse(cr, uid, context['location'], context).name
+            return _('Products: ')+self.pool.get('stock.location').browse(cr, user, context['location'], context).name
         return res
 
     def get_product_available(self,cr,uid,ids,context={}):
@@ -156,7 +156,7 @@ class product_product(osv.osv):
         'track_incoming' : fields.boolean('Track Incomming Lots', help="Force to use a Production Lot during receptions"),
         'track_outgoing' : fields.boolean('Track Outging Lots', help="Force to use a Production Lot during deliveries"),
     }
-    def __old_fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False):
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False):
         res = super(product_product,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar)
         if ('location' in context) and context['location']:
             location_info = self.pool.get('stock.location').browse(cr, uid, context['location'])

From 1ba69c648183588647851205b456fd3ff607c03d Mon Sep 17 00:00:00 2001
From: Amit Mendapara <ame@tinyerp.com>
Date: Wed, 24 Sep 2008 14:18:45 +0530
Subject: [PATCH 17/46] Help URL

bzr revid: ame@tinyerp.com-20080924084845-4r4y8hr3sfpvlxoy
---
 addons/process/process.py       | 4 +++-
 addons/process/process_view.xml | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/process/process.py b/addons/process/process.py
index 2aedf7843f2..49f6c8dc83a 100644
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -92,6 +92,7 @@ class process_process(osv.osv):
             data['notes'] = node.note
             data['active'] = False
             data['gray'] = False
+            data['url'] = node.help_url
 
             if node.menu_id:
                 data['menu'] = {'name': node.menu_id.complete_name, 'id': node.menu_id.id}
@@ -224,7 +225,8 @@ class process_node(osv.osv):
         'flow_start': fields.boolean('Starting Flow'),
         'transition_in': fields.one2many('process.transition', 'target_node_id', 'Starting Transitions'),
         'transition_out': fields.one2many('process.transition', 'source_node_id', 'Ending Transitions'),
-        'condition_ids': fields.one2many('process.condition', 'node_id', 'Conditions')
+        'condition_ids': fields.one2many('process.condition', 'node_id', 'Conditions'),
+        'help_url': fields.char('Help URL', size=255)
     }
     _defaults = {
         'kind': lambda *args: 'state',
diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index d5ae44a2a55..1c5e9ef4944 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -30,6 +30,7 @@
                                     <field name="menu_id" select="2"/>                                    
                                     <newline/>
                                     <field name="kind" select="1"/>
+                                    <field name="help_url" widget="url"/>
                                     <field name="model_states"/>
                                     <field name="subflow_id"/>
                                 </group>
@@ -159,6 +160,7 @@
                     <field name="menu_id" select="2"/>                                    
                     <newline/>
                     <field name="kind" select="1"/>
+                    <field name="help_url" widget="url"/>
                     <field name="model_states"/>
                     <field name="subflow_id"/>
                 </group>

From e2808f44c3cf1dab3548fc70fdab7ab026fa83a5 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 24 Sep 2008 11:18:06 +0200
Subject: [PATCH 18/46] view improvement

bzr revid: fp@tinyerp.com-20080924091806-dburg1tq736j1khp
---
 addons/project_timesheet/project_timesheet.py | 13 ++++++++++++-
 addons/sale/sale_view.xml                     |  2 +-
 addons/stock/stock.py                         |  3 ++-
 addons/stock/stock_view.xml                   |  7 +++++--
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 4016abedc44..0ad79129889 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -65,5 +65,16 @@ class project_work(osv.osv):
 
 
 project_work()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
+class project_project(osv.osv):
+    _inherit = "project.project"
+    def name_get(self, cr, user, ids, context=None):
+        result = []
+        for project in self.browse(cr, user, ids, context):
+            if project.category_id:
+                result.append((project.id, '['+(project.category_id.code or '')+'] '+project.name))
+            else:
+                result.append((project.id, '[?] '+project.name))
+        return result
+project_project()
 
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 3dae936a054..3dfeb6d9872 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -94,7 +94,7 @@
                 <form string="Sales order">
                     <group col="6" colspan="4">
                         <field name="name" select="1"/>
-                        <field name="client_order_ref"/>
+                        <field name="client_order_ref" select="2"/>
                         <field name="shipped" select="2"/>
                         <field name="shop_id" on_change="onchange_shop_id(shop_id)" select="2"/>
                         <field name="date_order" select="1"/>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 952bff3bda6..7d5f9c3dd0a 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -380,6 +380,7 @@ class stock_picking(osv.osv):
         'min_date': fields.function(get_min_max_date, fnct_inv=_set_minimum_date, multi="min_max_date",
                  method=True,store=True, type='datetime', string='Planned Date', select=1),
         'date':fields.datetime('Date Order'),
+        'date_done':fields.datetime('Date Done'),
         'max_date': fields.function(get_min_max_date, fnct_inv=_set_maximum_date, multi="min_max_date",
                  method=True,store=True, type='datetime', string='Max. Planned Date', select=2),
         'move_lines': fields.one2many('stock.move', 'picking_id', 'Move lines'),
@@ -514,7 +515,7 @@ class stock_picking(osv.osv):
     # TODO: change and create a move if not parents
     #
     def action_done(self, cr, uid, ids, context=None):
-        self.write(cr,uid, ids, {'state':'done'})
+        self.write(cr,uid, ids, {'state':'done', 'date_done': time.strftime('%Y-%m-%d %H:%M:%S')})
         return True
 
     def action_move(self, cr, uid, ids, context={}):
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 65850b1afbc..905ba361fcd 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -568,6 +568,7 @@
                             <field name="active" select="2"/>
                             <field name="auto_picking"/>
                             <field name="invoice_state" select="2"/>
+                            <field name="date_done" select="2"/>
                             <newline/>
                             <field name="move_type"/>
                         </page>
@@ -656,8 +657,9 @@
                             <field name="auto_picking"/>
                             <field name="active" select="2"/>
                             <newline/>
-                            <field name="move_type"/>
                             <field name="date" select="1"/>
+                            <field name="date_done" select="2"/>
+                            <field name="move_type"/>
                         </page>
                     </notebook>
                 </form>
@@ -842,8 +844,9 @@
                             <field name="active" select="2"/>
                             <field name="auto_picking"/>
                             <newline/>
-                            <field name="move_type"/>
                             <field name="date" select="2"/>
+                            <field name="date_done" select="2"/>
+                            <field name="move_type"/>
                         </page>
                     </notebook>
                 </form>

From 283f140e7c4e464b1336fd21de84eed841fa2ba6 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 24 Sep 2008 11:22:17 +0200
Subject: [PATCH 19/46] improveview

bzr revid: fp@tinyerp.com-20080924092217-b80lt63ei09lq39s
---
 addons/mrp/mrp_view.xml | 47 ++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index a9ecc4758b0..f9b7fb72734 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -383,17 +383,17 @@
             </field>
         </record>
 
-		<record model="ir.ui.view" id="view_production_graph">
-			<field name="name">mrp.production.graph</field>
-			<field name="model">mrp.production</field>
-			<field name="type">graph</field>
-			<field name="arch" type="xml">
-				<graph string="Production orders" type="bar">
-					<field name="product_id"/>
-					<field name="product_qty" operator="+"/>
-				</graph>
-			</field>
-		</record>
+        <record model="ir.ui.view" id="view_production_graph">
+            <field name="name">mrp.production.graph</field>
+            <field name="model">mrp.production</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Production orders" type="bar">
+                    <field name="product_id"/>
+                    <field name="product_qty" operator="+"/>
+                </graph>
+            </field>
+        </record>
         
         
         <record id="mrp_production_form_view" model="ir.ui.view">
@@ -448,7 +448,7 @@
                             <field name="picking_id"/>
                             <field name="move_prod_id"/>
                             <field name="sale_name"/>
-                        	<field name="sale_ref"/>
+                            <field name="sale_ref"/>
                         </page>
                     </notebook>
                 </form>
@@ -623,20 +623,19 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Procurement">
+                    <group col="2" colspan="2">
+                        <separator colspan="2" string="References"/>
+                        <field name="name" select="1" string="Procurement Reason"/>
+                        <field name="origin" select="2"/>
+                    </group>
+                    <group col="2" colspan="2">
+                        <separator colspan="2" string="Planification"/>
+                        <field name="date_planned" select="1"/>
+                        <field name="procure_method" select="2"/>
+                        <field name="priority"/>
+                    </group>
                     <notebook>
                     <page string="Procurement Details">
-                        <group col="2" colspan="2">
-                            <separator colspan="2" string="References"/>
-                            <field name="name" select="1" string="Procurement Reason"/>
-                            <field name="origin" select="2"/>
-                        </group>
-                        <group col="2" colspan="2">
-                            <separator colspan="2" string="Planification"/>
-                            <field name="date_planned" select="1"/>
-                            <field name="procure_method" select="2"/>
-                            <field name="priority"/>
-                        </group>
-
                         <separator colspan="4" string="Product &amp; Location"/>
                         <field name="product_id" select="1"/>
                         <field name="location_id" select="2"/>

From e00f767a6553dd06da860c600c1138e346af3470 Mon Sep 17 00:00:00 2001
From: Amit Mendapara <ame@tinyerp.com>
Date: Wed, 24 Sep 2008 16:15:36 +0530
Subject: [PATCH 20/46] * search by model.

bzr revid: ame@tinyerp.com-20080924104536-w6sdgmueia4t9dmq
---
 addons/process/process.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/addons/process/process.py b/addons/process/process.py
index 49f6c8dc83a..1a0024af4b1 100644
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -63,6 +63,29 @@ class process_process(osv.osv):
         'active' : lambda *a: True,
     }
 
+    def search_by_model(self, cr, uid, res_model, context):
+        pool = pooler.get_pool(cr.dbname)
+
+        model_ids = pool.get('ir.model').search(cr, uid, [('model', '=', res_model)])
+        if not model_ids:
+            return []
+
+        nodes = pool.get('process.node').search(cr, uid, [('model_id', 'in', model_ids)])
+        if not nodes:
+            return []
+
+        nodes = pool.get('process.node').browse(cr, uid, nodes, context)
+
+        unique = []
+        result = []
+        
+        for node in nodes:
+            if node.process_id.id not in unique:
+                result.append((node.process_id.id, node.process_id.name))
+                unique.append(node.process_id.id)
+
+        return result
+
     def graph_get(self, cr, uid, id, res_model, res_id, scale, context):
         
         pool = pooler.get_pool(cr.dbname)

From 32518af10916aa8242c44fc33328f96ff0ffbc0d Mon Sep 17 00:00:00 2001
From: Harshad Modi <hmo@tinyerp.com>
Date: Wed, 24 Sep 2008 16:24:26 +0530
Subject: [PATCH 21/46] added wizard to open entries for analytical account by
 selecting date on Account analytical entry list view

bzr revid: hmo@tinyerp.com-20080924105426-yqf4pcm7isoezm7p
---
 addons/account/project/project_view.xml       |  6 +-
 addons/account/project/wizard/__init__.py     |  1 +
 .../wizard/wizard_account_analytic_line.py    | 86 +++++++++++++++++++
 3 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 addons/account/project/wizard/wizard_account_analytic_line.py

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 5178b07eea8..45a4307a6c9 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -150,7 +150,9 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_account_analytic_line_tree"/>
         </record>
-        <menuitem id="next_id_41" name="Analytic Entries" parent="account.menu_finance_entries"/><menuitem action="action_account_analytic_line_form" id="account_entries_analytic_entries" parent="next_id_41"/>
+		<wizard id="action_account_analytic_line" menu="False" model="account.analytic.line" name="account.analytic.line" string="Entries Encoding by Line"/>
+        <menuitem id="next_id_41" name="Analytic Entries" parent="account.menu_finance_entries"/>
+		<menuitem type="wizard" icon="STOCK_JUSTIFY_FILL" action="action_account_analytic_line" id="account_entries_analytic_entries" parent="next_id_41"/>
 
 
         <record id="action_account_tree1" model="ir.actions.act_window">
@@ -238,7 +240,7 @@
         #
 
         <record id="action_account_analytic_journal_open_form" model="ir.actions.act_window">
-            <field name="name">account.analytic.journal.open.form</field>
+            <field name="name">Entries of Open Analytic Journals</field>
             <field name="res_model">account.analytic.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/account/project/wizard/__init__.py b/addons/account/project/wizard/__init__.py
index 0e66d867caa..477e5262a00 100644
--- a/addons/account/project/wizard/__init__.py
+++ b/addons/account/project/wizard/__init__.py
@@ -34,6 +34,7 @@ import wizard_account_analytic_inverted_balance_report
 import wizard_account_analytic_cost_ledger_report
 import wizard_account_analytic_cost_ledger_for_journal_report
 import wizard_account_analytic_analytic_check
+import wizard_account_analytic_line
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account/project/wizard/wizard_account_analytic_line.py b/addons/account/project/wizard/wizard_account_analytic_line.py
new file mode 100644
index 00000000000..143737ab153
--- /dev/null
+++ b/addons/account/project/wizard/wizard_account_analytic_line.py
@@ -0,0 +1,86 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# 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 2
+# 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, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+import wizard
+import pooler
+import time
+
+def _action_open_window(self, cr, uid, data, context): 
+    domain=[]
+    from_date= data['form']['from_date']
+    to_date=data['form']['to_date']
+    if from_date and to_date:
+        domain=[('date','>=',from_date),('date','<=',to_date)]
+    elif from_date:
+        domain=[('date','>=',from_date)]
+    elif to_date:
+        domain=[('date','<=',to_date)]
+    return {
+        'name': 'Analytic Entries',
+        'view_type': 'form',
+        "view_mode": 'tree,form',
+        'res_model': 'account.analytic.line',
+        'type': 'ir.actions.act_window',
+        'domain': domain}
+
+
+class account_analytic_line(wizard.interface):
+    form1 = '''<?xml version="1.0"?>
+    <form string="View Account Analytic Lines">
+        <separator string="Account Analytic Lines Analysis" colspan="4"/>
+        <field name="from_date"/>
+        <newline/>
+        <field name="to_date"/>
+        <newline/>
+        <label string=""/>
+        <label string="(Keep empty to open the current situation)" align="0.0" colspan="3"/>
+    </form>'''
+    form1_fields = {
+             'from_date': {
+                'string': 'From',
+                'type': 'date',
+        },
+             'to_date': {
+                'string': 'To',
+                'type': 'date',
+        },
+    }
+
+    states = {
+      'init': {
+            'actions': [],
+            'result': {'type': 'form', 'arch':form1, 'fields':form1_fields, 'state': [('end', 'Cancel','gtk-cancel'),('open', 'Open Entries','gtk-ok')]}
+        },
+    'open': {
+            'actions': [],
+            'result': {'type': 'action', 'action': _action_open_window, 'state':'end'}
+        }
+    }
+account_analytic_line('account.analytic.line')

From ae6bcc5ca57d1edb2ec35cb04dbf9d1bdd01c8d7 Mon Sep 17 00:00:00 2001
From: Harshad Modi <hmo@tinyerp.com>
Date: Wed, 24 Sep 2008 17:16:07 +0530
Subject: [PATCH 22/46] on account_followup , delay expressed in levels are
 agains maturity date, not date. If maturity date is null, checked against
 date.

bzr revid: hmo@tinyerp.com-20080924114607-7jn3bupbyh3743fw
---
 addons/account_followup/wizard/wizard_followup_print.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/account_followup/wizard/wizard_followup_print.py b/addons/account_followup/wizard/wizard_followup_print.py
index 545108f578f..a1022881358 100644
--- a/addons/account_followup/wizard/wizard_followup_print.py
+++ b/addons/account_followup/wizard/wizard_followup_print.py
@@ -251,14 +251,17 @@ class followup_all_print(wizard.interface):
 
         partner_list = []
         to_update = {}
-        for partner_id, followup_line_id, date, id in move_lines:
+        for partner_id, followup_line_id, date_maturity,date, id in move_lines:
             if not partner_id:
                 continue
             if partner_id in partner_list:
                 to_update[str(id)] = fups[followup_line_id][1]
             if followup_line_id not in fups:
                 continue
-            if date <= fups[followup_line_id][0].strftime('%Y-%m-%d'):
+            if date_maturity and date_maturity <= fups[followup_line_id][0].strftime('%Y-%m-%d'):
+                partner_list.append(partner_id)
+                to_update[str(id)] = fups[followup_line_id][1]
+            elif date and date <= fups[followup_line_id][0].strftime('%Y-%m-%d'):
                 partner_list.append(partner_id)
                 to_update[str(id)] = fups[followup_line_id][1]
         return {'partner_ids': partner_list, 'to_update': to_update}

From 3988bb6ec299092fe03c66506d75ad2513c688b2 Mon Sep 17 00:00:00 2001
From: Harshad Modi <hmo@tinyerp.com>
Date: Wed, 24 Sep 2008 17:32:40 +0530
Subject: [PATCH 23/46] fixed bug on account_followup

bzr revid: hmo@tinyerp.com-20080924120240-pe5wj1b0grcf36xi
---
 addons/account_followup/wizard/wizard_followup_print.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_followup/wizard/wizard_followup_print.py b/addons/account_followup/wizard/wizard_followup_print.py
index a1022881358..aef59462735 100644
--- a/addons/account_followup/wizard/wizard_followup_print.py
+++ b/addons/account_followup/wizard/wizard_followup_print.py
@@ -212,7 +212,7 @@ class followup_all_print(wizard.interface):
     def _get_partners(self, cr, uid, data, context):
         pool = pooler.get_pool(cr.dbname)
         cr.execute(
-            "SELECT l.partner_id, l.followup_line_id, l.date, l.id "\
+            "SELECT l.partner_id, l.followup_line_id,l.date_maturity, l.date, l.id "\
             "FROM account_move_line AS l "\
                 "LEFT JOIN account_account AS a "\
                 "ON (l.account_id=a.id) "\

From e1b9e4656fac86015836beb49722f9b7b4ef62cf Mon Sep 17 00:00:00 2001
From: Jay Vora <jvo@tinyerp.com>
Date: Wed, 24 Sep 2008 17:38:14 +0530
Subject: [PATCH 24/46] Deleted unwanted file

bzr revid: jvo@tinyerp.com-20080924120814-9jzesn7fo2i2c08d
---
 .../i18n/account_budget_crossover.pot         | 310 ------------------
 1 file changed, 310 deletions(-)
 delete mode 100644 addons/account_budget/i18n/account_budget_crossover.pot

diff --git a/addons/account_budget/i18n/account_budget_crossover.pot b/addons/account_budget/i18n/account_budget_crossover.pot
deleted file mode 100644
index bdf11bb91a7..00000000000
--- a/addons/account_budget/i18n/account_budget_crossover.pot
+++ /dev/null
@@ -1,310 +0,0 @@
-# Translation of OpenERP Server.
-# This file containt the translation of the following modules:
-#	* account_budget_crossover
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-10 12:47:16+0000"
-"PO-Revision-Date: 2008-09-10 12:47:16+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
-
-#. module: account_budget_crossover
-#: field:crossovered.budget,creating_user_id:0
-msgid "Responsible User"
-msgstr ""
-
-#. module: account_budget_crossover
-#: selection:crossovered.budget,state:0
-msgid "Confirmed"
-msgstr ""
-
-#. module: account_budget_crossover
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: account_budget_crossover
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Printed at:"
-msgstr ""
-
-#. module: account_budget_crossover
-#: view:crossovered.budget:0
-msgid "Confirm"
-msgstr ""
-
-#. module: account_budget_crossover
-#: field:crossovered.budget,validating_user_id:0
-msgid "Validate User"
-msgstr ""
-
-#. module: account_budget_crossover
-#: field:crossovered.budget.lines,analytic_account_id:0
-msgid "Analytic Account Ref"
-msgstr ""
-
-#. module: account_budget_crossover
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Currency:"
-msgstr ""
-
-#. module: account_budget_crossover
-#: selection:crossovered.budget,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: account_budget_crossover
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "at"
-msgstr ""
-
-#. module: account_budget_crossover
-#: model:ir.actions.report.xml,name:account_budget_crossover.account_analytic_account_budget
-#: model:ir.actions.report.xml,name:account_budget_crossover.report_crossovered_budget
-#: model:ir.actions.wizard,name:account_budget_crossover.account_analytic_account_budget_report
-#: model:ir.actions.wizard,name:account_budget_crossover.wizard_crossovered_budget_menu
-msgid "Print Budgets"
-msgstr ""
-
-#. module: account_budget_crossover
-#: wizard_button:wizard.analytic.account.budget.report,init,report:0
-#: wizard_button:wizard.crossovered.budget,init,report:0
-#: wizard_button:wizard.crossovered.budget.summary,init,report:0
-msgid "Print"
-msgstr ""
-
-#. module: account_budget_crossover
-#: field:crossovered.budget.lines,percentage:0
-msgid "Percentage"
-msgstr ""
-
-#. module: account_budget_crossover
-#: selection:crossovered.budget,state:0
-msgid "Validated"
-msgstr ""
-
-#. module: account_budget_crossover
-#: model:ir.model,name:account_budget_crossover.model_crossovered_budget_lines
-msgid "Crossovered Budget Lines"
-msgstr ""
-
-#. module: account_budget_crossover
-#: field:crossovered.budget,name:0
-msgid "Name"
-msgstr ""
-
-#. module: account_budget_crossover
-#: field:crossovered.budget,state:0
-msgid "Status"
-msgstr ""
-
-#. module: account_budget_crossover
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "%"
-msgstr ""
-
-#. module: account_budget_crossover
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Description"
-msgstr ""
-
-#. module: account_budget_crossover
-#: rml:account.analytic.account.budget:0
-msgid "Analytic Account :"
-msgstr ""
-
-#. module: account_budget_crossover
-#: field:crossovered.budget.lines,crossovered_budget_id:0
-msgid "Budget Ref"
-msgstr ""
-
-#. module: account_budget_crossover
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "to"
-msgstr ""
-
-#. module: account_budget_crossover
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-#: field:crossovered.budget.lines,planned_amount:0
-msgid "Planned Amount"
-msgstr ""
-
-#. module: account_budget_crossover
-#: model:ir.ui.menu,name:account_budget_crossover.menu_financial_reporting_budget_budget_entries
-msgid "Entries"
-msgstr ""
-
-#. module: account_budget_crossover
-#: view:crossovered.budget:0
-msgid "Validate"
-msgstr ""
-
-#. module: account_budget_crossover
-#: wizard_view:wizard.crossovered.budget,init:0
-#: wizard_view:wizard.crossovered.budget.summary,init:0
-msgid "Select Options"
-msgstr ""
-
-#. module: account_budget_crossover
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-#: field:crossovered.budget.lines,practical_amount:0
-msgid "Practical Amount"
-msgstr ""
-
-#. module: account_budget_crossover
-#: field:crossovered.budget,date_to:0
-#: field:crossovered.budget.lines,date_to:0
-msgid "End Date"
-msgstr ""
-
-#. module: account_budget_crossover
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_budget_crossover
-#: field:crossovered.budget.lines,theoritical_amount:0
-msgid "Theoritical Amount"
-msgstr ""
-
-#. module: account_budget_crossover
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Total:"
-msgstr ""
-
-#. module: account_budget_crossover
-#: selection:crossovered.budget,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: account_budget_crossover
-#: field:crossovered.budget.lines,general_budget_id:0
-msgid "Master Budget Ref"
-msgstr ""
-
-#. module: account_budget_crossover
-#: view:account.analytic.account:0
-msgid "Lines"
-msgstr ""
-
-#. module: account_budget_crossover
-#: model:ir.actions.act_window,name:account_budget_crossover.act_crossovered_budget_view
-#: model:ir.ui.menu,name:account_budget_crossover.menu_act_crossovered_budget_view
-#: view:crossovered.budget:0
-msgid "Budget"
-msgstr ""
-
-#. module: account_budget_crossover
-#: wizard_view:wizard.analytic.account.budget.report,init:0
-msgid "Select Dates Period"
-msgstr ""
-
-#. module: account_budget_crossover
-#: field:crossovered.budget.lines,paid_date:0
-msgid "Paid Date"
-msgstr ""
-
-#. module: account_budget_crossover
-#: model:ir.ui.menu,name:account_budget_crossover.menu_financial_reporting_budget_budget
-msgid "Budgets"
-msgstr ""
-
-#. module: account_budget_crossover
-#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
-#: wizard_field:wizard.crossovered.budget,init,date_to:0
-#: wizard_field:wizard.crossovered.budget.summary,init,date_to:0
-msgid "End of period"
-msgstr ""
-
-#. module: account_budget_crossover
-#: model:ir.model,name:account_budget_crossover.model_crossovered_budget
-msgid "Crossovered Budget"
-msgstr ""
-
-#. module: account_budget_crossover
-#: wizard_field:wizard.analytic.account.budget.report,init,date_from:0
-#: wizard_field:wizard.crossovered.budget,init,date_from:0
-#: wizard_field:wizard.crossovered.budget.summary,init,date_from:0
-msgid "Start of period"
-msgstr ""
-
-#. module: account_budget_crossover
-#: model:ir.actions.wizard,name:account_budget_crossover.wizard_crossovered_budget_menu_1
-msgid "Print Summary of Budgets"
-msgstr ""
-
-#. module: account_budget_crossover
-#: field:crossovered.budget,code:0
-msgid "Code"
-msgstr ""
-
-#. module: account_budget_crossover
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Theoretical Amount"
-msgstr ""
-
-#. module: account_budget_crossover
-#: rml:crossovered.budget.report:0
-msgid "Budget :"
-msgstr ""
-
-#. module: account_budget_crossover
-#: selection:crossovered.budget,state:0
-#: view:crossovered.budget:0
-msgid "Done"
-msgstr ""
-
-#. module: account_budget_crossover
-#: model:ir.actions.act_window,name:account_budget_crossover.act_crossovered_budget_lines_view
-#: field:account.analytic.account,crossovered_budget_line:0
-#: field:account.budget.post,crossovered_budget_line:0
-#: field:crossovered.budget,crossovered_budget_line:0
-#: model:ir.ui.menu,name:account_budget_crossover.menu_act_crossovered_budget_lines_view
-#: view:crossovered.budget:0
-#: view:account.analytic.account:0
-#: view:crossovered.budget.lines:0
-msgid "Budget Lines"
-msgstr ""
-
-#. module: account_budget_crossover
-#: wizard_button:wizard.analytic.account.budget.report,init,end:0
-#: wizard_button:wizard.crossovered.budget,init,end:0
-#: wizard_button:wizard.crossovered.budget.summary,init,end:0
-#: view:crossovered.budget:0
-msgid "Cancel"
-msgstr ""
-
-#. module: account_budget_crossover
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr ""
-
-#. module: account_budget_crossover
-#: field:crossovered.budget,date_from:0
-#: field:crossovered.budget.lines,date_from:0
-msgid "Start Date"
-msgstr ""
-
-#. module: account_budget_crossover
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Analysis from"
-msgstr ""
-

From 295957b3b2e0d23424a4f8dfc35b350ea229797f Mon Sep 17 00:00:00 2001
From: Christophe Simonis <christophe@tinyerp.com>
Date: Wed, 24 Sep 2008 16:31:52 +0200
Subject: [PATCH 25/46] add restriction on menu

bzr revid: christophe@tinyerp.com-20080924143152-cusl6al1equ9smel
---
 bin/addons/base/base_security.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bin/addons/base/base_security.xml b/bin/addons/base/base_security.xml
index d109ae05e9c..c72f31418f3 100644
--- a/bin/addons/base/base_security.xml
+++ b/bin/addons/base/base_security.xml
@@ -41,6 +41,9 @@
         <field name="menu_id" ref="action_menu_admin"/>
     </record>
 
+	<record model="ir.ui.menu" id="base.menu_administration">
+		<field name="groups_id" eval="[(6,0, [ref('group_system'), ref('group_erp_manager')])]"/>
+	</record>
 </data>
 </openerp>
 

From 520e5d36301eb5e21cb885e8f08348894e5002ed Mon Sep 17 00:00:00 2001
From: Christophe Simonis <christophe@tinyerp.com>
Date: Wed, 24 Sep 2008 16:34:10 +0200
Subject: [PATCH 26/46] move file to a security folder

bzr revid: christophe@tinyerp.com-20080924143410-niiu77u8zqnrgpiw
---
 bin/addons/base/__terp__.py                        | 6 +++---
 bin/addons/base/{ => security}/base_security.xml   | 0
 bin/addons/base/{ => security}/ir.model.access.csv | 0
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename bin/addons/base/{ => security}/base_security.xml (100%)
 rename bin/addons/base/{ => security}/ir.model.access.csv (100%)

diff --git a/bin/addons/base/__terp__.py b/bin/addons/base/__terp__.py
index ae83f7ea164..d90d56a3a72 100644
--- a/bin/addons/base/__terp__.py
+++ b/bin/addons/base/__terp__.py
@@ -38,7 +38,7 @@
     "init_xml" : [
         "base_data.xml",
         "base_menu.xml",
-        "base_security.xml",
+        "security/base_security.xml",
         "res/res_security.xml",
     ],
     "demo_xml" : [
@@ -66,8 +66,8 @@
         "res/partner/crm_view.xml",
         "res/partner/partner_data.xml",
         "res/ir_property_view.xml",
-        "base_security.xml",
-        "ir.model.access.csv",
+        "security/base_security.xml",
+        "security/ir.model.access.csv",
     ],
     "active": True,
     "installable": True,
diff --git a/bin/addons/base/base_security.xml b/bin/addons/base/security/base_security.xml
similarity index 100%
rename from bin/addons/base/base_security.xml
rename to bin/addons/base/security/base_security.xml
diff --git a/bin/addons/base/ir.model.access.csv b/bin/addons/base/security/ir.model.access.csv
similarity index 100%
rename from bin/addons/base/ir.model.access.csv
rename to bin/addons/base/security/ir.model.access.csv

From bb8d92c55ab6c4d28009069952f9ea2a6232ba8a Mon Sep 17 00:00:00 2001
From: Christophe Simonis <christophe@tinyerp.com>
Date: Wed, 24 Sep 2008 17:34:10 +0200
Subject: [PATCH 27/46] remove use of global variable

bzr revid: christophe@tinyerp.com-20080924153410-hdkfx2ddzg8zjje1
---
 bin/report/interface.py               | 13 +++++----
 bin/report/printscreen/ps_form.py     | 10 +++----
 bin/report/printscreen/ps_list.py     | 10 +++----
 bin/report/render/rml2pdf/trml2pdf.py | 40 ++++++++++++++-------------
 4 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/bin/report/interface.py b/bin/report/interface.py
index fafc52367b6..95e6ec31946 100644
--- a/bin/report/interface.py
+++ b/bin/report/interface.py
@@ -64,6 +64,7 @@ class report_int(netsvc.Service):
         self.name = name
         self.id = 0
         self.name2 = '.'.join(name.split('.')[1:])
+        self.title = None
         self.joinGroup('report')
         self.exportMethod(self.create)
 
@@ -101,10 +102,10 @@ class report_rml(report_int):
         ir_actions_report_xml_obj = pool.get('ir.actions.report.xml')
         report_xml_ids = ir_actions_report_xml_obj.search(cr, uid,
         [('report_name', '=', self.name[7:])], context=context)
-        ftitle = ir_actions_report_xml_obj.browse(cr,uid,report_xml_ids)[0].name
+        self.title = ir_actions_report_xml_obj.browse(cr,uid,report_xml_ids)[0].name
         report_type = datas.get('report_type', 'pdf')
         create_doc = self.generators[report_type]
-        pdf = create_doc(rml,title=ftitle)
+        pdf = create_doc(rml, title=self.title)
         return (pdf, report_type)
 
     def create_xml(self, cr, uid, ids, datas, context=None):
@@ -196,7 +197,7 @@ class report_rml(report_int):
         result.freeDoc()
         return xml
 
-    def create_pdf(self, xml, logo=None,title=None):
+    def create_pdf(self, xml, logo=None, title=None):
         if logo:
             self.bin_datas['logo'] = logo
         else:
@@ -206,15 +207,15 @@ class report_rml(report_int):
         obj.render()
         return obj.get()
 
-    def create_html(self, xml, logo=None,title=None):
+    def create_html(self, xml, logo=None, title=None):
         obj = render.rml2html(xml, self.bin_datas)
         obj.render()
         return obj.get()
 
-    def create_raw(self, xml, logo=None,title=None):
+    def create_raw(self, xml, logo=None, title=None):
         return xml
 
-    def create_sxw(self, path, logo=None,title=None):
+    def create_sxw(self, path, logo=None, title=None):
         return path
 
 from report_sxw import report_sxw
diff --git a/bin/report/printscreen/ps_form.py b/bin/report/printscreen/ps_form.py
index 6e8b2de602f..1e7757e3f17 100644
--- a/bin/report/printscreen/ps_form.py
+++ b/bin/report/printscreen/ps_form.py
@@ -39,7 +39,7 @@ import libxml2
 import libxslt
 
 import time, os
-ftitle=""
+
 class report_printscreen_list(report_int):
     def __init__(self, name):
         report_int.__init__(self, name)
@@ -63,7 +63,6 @@ class report_printscreen_list(report_int):
         return self._parse_node(dom)
 
     def create(self, cr, uid, ids, datas, context=None):
-        global ftitle
         if not context:
             context={}
         datas['ids'] = ids
@@ -71,10 +70,10 @@ class report_printscreen_list(report_int):
         model_id = pool.get('ir.model').search(cr, uid, [('model','=',model._name)])
         if model_id:
             model_desc = pool.get('ir.model').browse(cr, uid, model_id, context).name
-            ftitle=model_desc
+            self.title = model_desc
         else:
             model_desc = model._description
-            ftitle=model_desc
+            self.title = model_desc
 
         model = pool.get(datas['model'])
         result = model.fields_view_get(cr, uid, view_type='tree', context=context)
@@ -158,8 +157,7 @@ class report_printscreen_list(report_int):
         doc = libxml2.parseDoc(new_doc.toxml())
         rml_obj = style.applyStylesheet(doc, None)
         rml = style.saveResultToString(rml_obj)
-        global ftitle
-        self.obj = render.rml(rml,ftitle)
+        self.obj = render.rml(rml, self.title)
         self.obj.render()
         return True
 report_printscreen_list('report.printscreen.form')
diff --git a/bin/report/printscreen/ps_list.py b/bin/report/printscreen/ps_list.py
index 4717fe03437..29242a3119e 100644
--- a/bin/report/printscreen/ps_list.py
+++ b/bin/report/printscreen/ps_list.py
@@ -39,7 +39,7 @@ import libxml2
 import libxslt
 
 import time, os
-ftitle=""
+
 class report_printscreen_list(report_int):
     def __init__(self, name):
         report_int.__init__(self, name)
@@ -63,7 +63,6 @@ class report_printscreen_list(report_int):
         return self._parse_node(dom)
 
     def create(self, cr, uid, ids, datas, context=None):
-        global ftitle
         if not context:
             context={}
         pool = pooler.get_pool(cr.dbname)
@@ -71,10 +70,10 @@ class report_printscreen_list(report_int):
         model_id = pool.get('ir.model').search(cr, uid, [('model','=',model._name)])
         if model_id:
             model_desc = pool.get('ir.model').browse(cr, uid, model_id[0], context).name
-            ftitle=model_desc
+            self.title = model_desc
         else:
             model_desc = model._description
-            ftitle=model_desc
+            self.title = model_desc
 
         datas['ids'] = ids
         model = pooler.get_pool(cr.dbname).get(datas['model'])
@@ -202,8 +201,7 @@ class report_printscreen_list(report_int):
         doc = libxml2.parseDoc(new_doc.toxml())
         rml_obj = style.applyStylesheet(doc, None)
         rml = style.saveResultToString(rml_obj)
-        global ftitle
-        self.obj = render.rml(rml,title=ftitle)
+        self.obj = render.rml(rml, title=self.title)
         self.obj.render()
         return True
 report_printscreen_list('report.printscreen.list')
diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py
index aeee1220d08..e0cc3cc8220 100644
--- a/bin/report/render/rml2pdf/trml2pdf.py
+++ b/bin/report/render/rml2pdf/trml2pdf.py
@@ -60,7 +60,7 @@ from reportlab import platypus
 import utils
 import color
 import os
-ftitle=""
+
 #
 # Change this to UTF-8 if you plan tu use Reportlab's UTF-8 support
 #
@@ -180,11 +180,12 @@ class _rml_styles(object):
         return style
 
 class _rml_doc(object):
-    def __init__(self, data, images={}, path='.'):
+    def __init__(self, data, images={}, path='.', title=None):
         self.dom = xml.dom.minidom.parseString(data)
         self.filename = self.dom.documentElement.getAttribute('filename')
         self.images = images
         self.path = path
+        self.title = title
 
     def docinit(self, els):
         from reportlab.lib.fonts import addMapping
@@ -229,28 +230,28 @@ class _rml_doc(object):
 
         el = self.dom.documentElement.getElementsByTagName('template')
         if len(el):
-            pt_obj = _rml_template(out, el[0], self, images=self.images, path=self.path)
+            pt_obj = _rml_template(out, el[0], self, images=self.images, path=self.path, title=self.title)
             pt_obj.render(self.dom.documentElement.getElementsByTagName('story'))
         else:
             self.canvas = canvas.Canvas(out)
             pd = self.dom.documentElement.getElementsByTagName('pageDrawing')[0]
-            pd_obj = _rml_canvas(self.canvas, None, self, self.images, path=self.path)
+            pd_obj = _rml_canvas(self.canvas, None, self, self.images, path=self.path, title=self.title)
             pd_obj.render(pd)
 
             self.canvas.showPage()
             self.canvas.save()
 
 class _rml_canvas(object):
-    def __init__(self, canvas, doc_tmpl=None, doc=None, images={}, path='.'):
+    def __init__(self, canvas, doc_tmpl=None, doc=None, images={}, path='.', title=None):
         self.canvas = canvas
         self.styles = doc.styles
         self.doc_tmpl = doc_tmpl
         self.doc = doc
         self.images = images
         self.path = path
-        global ftitle
-        if  ftitle:
-            self.canvas.setTitle(ftitle)
+        self.title = title
+        if self.title:
+            self.canvas.setTitle(self.title)
 
     def _textual(self, node, x=0, y=0):
         rc = ''
@@ -324,7 +325,7 @@ class _rml_canvas(object):
         self.canvas.circle(x_cen=utils.unit_get(node.getAttribute('x')), y_cen=utils.unit_get(node.getAttribute('y')), r=utils.unit_get(node.getAttribute('radius')), **utils.attr_get(node, [], {'fill':'bool','stroke':'bool'}))
 
     def _place(self, node):
-        flows = _rml_flowable(self.doc, images=self.images, path=self.path).render(node)
+        flows = _rml_flowable(self.doc, images=self.images, path=self.path, title=self.title).render(node)
         infos = utils.attr_get(node, ['x','y','width','height'])
 
         infos['y']+=infos['height']
@@ -450,25 +451,27 @@ class _rml_canvas(object):
                         break
 
 class _rml_draw(object):
-    def __init__(self, node, styles, images={}, path='.'):
+    def __init__(self, node, styles, images={}, path='.', title=None):
         self.node = node
         self.styles = styles
         self.canvas = None
         self.images = images
         self.path = path
+        self.canvas_title = title
 
     def render(self, canvas, doc):
         canvas.saveState()
-        cnv = _rml_canvas(canvas, doc, self.styles, images=self.images, path=self.path)
+        cnv = _rml_canvas(canvas, doc, self.styles, images=self.images, path=self.path, title=self.canvas_title)
         cnv.render(self.node)
         canvas.restoreState()
 
 class _rml_flowable(object):
-    def __init__(self, doc, images={}, path='.'):
+    def __init__(self, doc, images={}, path='.', title=None):
         self.doc = doc
         self.styles = doc.styles
         self.images = images
         self.path = path
+        self.title = title
 
     def _textual(self, node):
         rc = ''
@@ -569,7 +572,7 @@ class _rml_flowable(object):
                 return (self.width, self.height)
             def draw(self):
                 canvas = self.canv
-                drw = _rml_draw(self.node, self.styles, images=self.self2.images, path=self.self2.path)
+                drw = _rml_draw(self.node, self.styles, images=self.self2.images, path=self.self2.path, title=self.self2.title)
                 drw.render(self.canv, None)
         return Illustration(node, self.styles, self)
 
@@ -741,9 +744,10 @@ class TinyDocTemplate(platypus.BaseDocTemplate):
             self.canv._pageNumber = 0
 
 class _rml_template(object):
-    def __init__(self, out, node, doc, images={}, path='.'):
+    def __init__(self, out, node, doc, images={}, path='.', title=None):
         self.images= images
         self.path = path
+        self.title = title
         if not node.hasAttribute('pageSize'):
             pageSize = (utils.unit_get('21cm'), utils.unit_get('29.7cm'))
         else:
@@ -764,7 +768,7 @@ class _rml_template(object):
                 frames.append( frame )
             gr = pt.getElementsByTagName('pageGraphics')
             if len(gr):
-                drw = _rml_draw(gr[0], self.doc, images=images, path=self.path)
+                drw = _rml_draw(gr[0], self.doc, images=images, path=self.path, title=self.title)
                 self.page_templates.append( platypus.PageTemplate(frames=frames, onPage=drw.render, **utils.attr_get(pt, [], {'id':'str'}) ))
             else:
                 self.page_templates.append( platypus.PageTemplate(frames=frames, **utils.attr_get(pt, [], {'id':'str'}) ))
@@ -772,7 +776,7 @@ class _rml_template(object):
 
     def render(self, node_stories):
         fis = []
-        r = _rml_flowable(self.doc,images=self.images, path=self.path)
+        r = _rml_flowable(self.doc,images=self.images, path=self.path, title=self.title)
         for node_story in node_stories:
             fis += r.render(node_story)
             if node_story==node_stories[-1]:
@@ -784,9 +788,7 @@ class _rml_template(object):
         self.doc_tmpl.build(fis)
 
 def parseString(data, fout=None, images={}, path='.',title=None):
-    r = _rml_doc(data, images, path)
-    global ftitle
-    ftitle=title
+    r = _rml_doc(data, images, path, title=title)
     if fout:
         fp = file(fout,'wb')
         r.render(fp)

From 2ab70b66aad4ec1ea296d2d52b02819ee9a6b5ad Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@tinyerp.com>
Date: Thu, 25 Sep 2008 10:09:44 +0530
Subject: [PATCH 28/46] bug fix on move line and account_budget

bzr revid: mra@tinyerp.com-20080925043944-ufpmg5fy162ntrms
---
 addons/account/account_move_line.py         |  2 +-
 addons/account_budget/crossovered_budget.py | 47 +--------------------
 2 files changed, 2 insertions(+), 47 deletions(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 12f3682cf56..f9d2dea38cc 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -481,7 +481,7 @@ class account_move_line(osv.osv):
                 self_debit = -writeoff
 
             # If comment exist in context, take it
-            if context['comment']:
+            if 'comment' in context and context['comment']:
                 libelle=context['comment']
             else:
                 libelle='Write-Off'
diff --git a/addons/account_budget/crossovered_budget.py b/addons/account_budget/crossovered_budget.py
index 420926bbaf4..c5a81a2398b 100644
--- a/addons/account_budget/crossovered_budget.py
+++ b/addons/account_budget/crossovered_budget.py
@@ -208,51 +208,6 @@ class crossovered_budget_lines(osv.osv):
     }
 crossovered_budget_lines()
 
-
-
-#class account_budget_post(osv.osv): #old code
-#    _name = 'account.budget.post'
-#    _inherit = 'account.budget.post'
-#    _columns = {
-#    'crossovered_budget_line': fields.one2many('crossovered.budget.lines', 'general_budget_id', 'Budget Lines'),
-#    }
-#account_budget_post()
-#
-#class account_budget_post_dotation(osv.osv):
-#    _name = 'account.budget.post.dotation'
-#    _inherit = 'account.budget.post.dotation'
-#
-#    def _tot_planned(self, cr, uid, ids,name,args,context):
-#        res={}
-#        for line in self.browse(cr, uid, ids):
-#            if line.period_id:
-#                obj_period=self.pool.get('account.period').browse(cr, uid,line.period_id.id)
-#
-#                total_days=strToDate(obj_period.date_stop) - strToDate(obj_period.date_start)
-#                budget_id=line.post_id and line.post_id.id or False
-#                query="select id from crossovered_budget_lines where  general_budget_id= '"+ str(budget_id) + "' AND (date_from  >='"  +obj_period.date_start +"'  and date_from <= '"+obj_period.date_stop + "') OR (date_to  >='"  +obj_period.date_start +"'  and date_to <= '"+obj_period.date_stop + "') OR (date_from  <'"  +obj_period.date_start +"'  and date_to > '"+obj_period.date_stop + "')"
-#                cr.execute(query)
-#                res1=cr.fetchall()
-#
-#                tot_planned=0.00
-#                for record in res1:
-#                    obj_lines = self.pool.get('crossovered.budget.lines').browse(cr, uid,record[0])
-#                    count_days = min(strToDate(obj_period.date_stop),strToDate(obj_lines.date_to)) - max(strToDate(obj_period.date_start), strToDate(obj_lines.date_from))
-#                    days_in_period = count_days.days +1
-#                    count_days = strToDate(obj_lines.date_to) - strToDate(obj_lines.date_from)
-#                    total_days_of_rec = count_days.days +1
-#                    tot_planned += obj_lines.planned_amount/total_days_of_rec* days_in_period
-#                res[line.id]=tot_planned
-#            else:
-#                res[line.id]=0.00
-#        return res
-#
-#    _columns = {
-#    'tot_planned':fields.function(_tot_planned,method=True, string='Total Planned Amount',type='float',store=True),
-#    }
-#
-#account_budget_post_dotation()
-
 class account_analytic_account(osv.osv):
     _name = 'account.analytic.account'
     _inherit = 'account.analytic.account'
@@ -266,7 +221,7 @@ account_analytic_account()
 #--------------------------------------------------------------
 # moved from account/project/project.py
 # ---------------------------------------------------------
-# Budgets
+# Budgets.
 # ---------------------------------------------------------
 
 #class account_analytic_budget_post(osv.osv):

From b347a98ee0b576e6358391a06a2c0e40a3f77775 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@tinyerp.com>
Date: Thu, 25 Sep 2008 11:01:25 +0530
Subject: [PATCH 29/46] bug fix: - modify name_get method on
 account_move_reconcile object - account move line bug fix

bzr revid: mra@tinyerp.com-20080925053125-pdg0711nfnnhbf3f
---
 addons/account/account.py           | 20 +++++++++++++-------
 addons/account/account_move_line.py |  2 +-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 94086e86742..61c0a77be3b 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -924,15 +924,21 @@ class account_move_reconcile(osv.osv):
                 {'reconcile_id': rec.id }
             )
         return True
+
     def name_get(self, cr, uid, ids, context=None):
-        result = {}
+        if not len(ids):
+            return []
+        result = []
         for r in self.browse(cr, uid, ids, context):
             total = reduce(lambda y,t: (t.debit or 0.0) - (t.credit or 0.0) + y, r.line_partial_ids, 0.0)
             if total:
-                result[r.id] = '%s (%.2f)' % (r.name, total)
+                name = '%s (%.2f)' % (r.name, total)
+                result.append((r.id,name))
             else:
-                result[r.id] = r.name
+                result.append((r.id,r.name))
         return result
+
+
 account_move_reconcile()
 
 #----------------------------------------------------------
@@ -1510,7 +1516,7 @@ class account_config_wizard(osv.osv_memory):
         }
 
     def install_account_chart(self, cr, uid,ids, context=None):
-        for res in self.read(cr,uid,ids):            
+        for res in self.read(cr,uid,ids):
             id = res['charts']
             def install(id):
                 mod_obj = self.pool.get('ir.module.module')
@@ -1558,7 +1564,7 @@ class account_config_wizard(osv.osv_memory):
                 'target':'new',
         }
 
-    
+
 
 account_config_wizard()
 
@@ -2036,8 +2042,8 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                 'res_model': 'ir.module.module.configuration.wizard',
                 'type': 'ir.actions.act_window',
                 'target':'new',
-        }    
-        
+        }
+
 
 wizard_multi_charts_accounts()
 
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index f9d2dea38cc..e55b6d54fee 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -629,7 +629,7 @@ class account_move_line(osv.osv):
 
         if raise_ex:
             raise osv.except_osv(_('Wrong Accounting Entry!'), _('Both Credit and Debit cannot be zero!'))
-
+        account_obj = self.pool.get('account.account')
         if ('account_id' in vals) and not account_obj.read(cr, uid, vals['account_id'], ['active'])['active']:
             raise osv.except_osv(_('Bad account!'), _('You can not use an inactive account!'))
         if update_check:

From 6b589c87ad08b09fa8a01e2d9c3dcf30b911d6f2 Mon Sep 17 00:00:00 2001
From: Jay Vora <jvo@tinyerp.com>
Date: Thu, 25 Sep 2008 11:17:03 +0530
Subject: [PATCH 30/46] Bugfix :email sending and minor edit on constraint
 validation

bzr revid: jvo@tinyerp.com-20080925054703-0eui2prn54hw2q59
---
 bin/osv/orm.py    | 2 +-
 bin/tools/misc.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index f8defece530..0fb4fdfcbf2 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -647,7 +647,7 @@ class orm_template(object):
             if not fun(self, cr, uid, ids):
                 translated_msg = trans._get_source(cr, uid, self._name, 'constraint', lng, source=msg) or msg
                 error_msgs.append(
-                        _("Error occur when validation the fields %s: %s") % (','.join(fields), translated_msg)
+                        _("Error occured while validating the field(s) %s: %s") % (','.join(fields), translated_msg)
                 )
         if error_msgs:
             cr.rollback()
diff --git a/bin/tools/misc.py b/bin/tools/misc.py
index 0034a1e0bce..f29f1731ddb 100644
--- a/bin/tools/misc.py
+++ b/bin/tools/misc.py
@@ -327,7 +327,7 @@ def reverse_enumerate(l):
 #----------------------------------------------------------
 # Emails
 #----------------------------------------------------------
-def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=None, on_error=False, reply_to=False, tinycrm=False):
+def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=None, on_error=False, reply_to=False, tinycrm=False, ssl=False, debug=False):
     """Send an email."""
     if not email_cc:
         email_cc=[]

From d73304e6a5e888c102dd4f88bda08f1f65623cae Mon Sep 17 00:00:00 2001
From: Amit Mendapara <ame@tinyerp.com>
Date: Thu, 25 Sep 2008 13:18:07 +0530
Subject: [PATCH 31/46] * Fixed process copy (duplicate) problem.

bzr revid: ame@tinyerp.com-20080925074807-jrl338k65ce9vsav
---
 addons/process/process.py | 48 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/addons/process/process.py b/addons/process/process.py
index 1a0024af4b1..9417f927786 100644
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -231,6 +231,44 @@ class process_process(osv.osv):
 
         return dict(title=title, perm=perm, notes=notes, nodes=nodes, transitions=transitions)
 
+    def copy(self, cr, uid, id, default=None, context={}):
+        """ Deep copy the entire process.
+        """
+
+        if not default:
+            default = {}
+
+        pool = pooler.get_pool(cr.dbname)
+        process = pool.get('process.process').browse(cr, uid, [id], context)[0]
+
+        nodes = {}
+        transitions = {}
+
+        # first copy all nodes and and map the new nodes with original for later use in transitions
+        for node in process.node_ids:
+            for t in node.transition_in:
+                tr = transitions.setdefault(t.id, {})
+                tr['target'] = node.id
+            for t in node.transition_out:
+                tr = transitions.setdefault(t.id, {})
+                tr['source'] = node.id
+            nodes[node.id] = pool.get('process.node').copy(cr, uid, node.id, context=context)
+
+        # then copy transitions with new nodes
+        for tid, tr in transitions.items():
+            vals = {
+                'source_node_id': nodes[tr['source']],
+                'target_node_id': nodes[tr['target']]
+            }
+            tr = pool.get('process.transition').copy(cr, uid, tid, default=vals, context=context)
+
+        # and finally copy the process itself with new nodes
+        default.update({
+            'active': True,
+            'node_ids': [(6, 0, nodes.values())]
+        })
+        return super(process_process, self).copy(cr, uid, id, default, context)
+
 process_process()
 
 class process_node(osv.osv):
@@ -256,6 +294,16 @@ class process_node(osv.osv):
         'model_states': lambda *args: False,
         'flow_start': lambda *args: False,
     }
+
+    def copy(self, cr, uid, id, default=None, context={}):
+        if not default:
+            default = {}
+        default.update({
+            'transition_in': [],
+            'transition_out': []
+        })
+        return super(process_node, self).copy(cr, uid, id, default, context)
+
 process_node()
 
 class process_node_condition(osv.osv):

From a3a7e64534036d8808c7fe7633a7f7c2624ffb98 Mon Sep 17 00:00:00 2001
From: Amit Mendapara <ame@tinyerp.com>
Date: Thu, 25 Sep 2008 13:18:59 +0530
Subject: [PATCH 32/46] Fixed process.

bzr revid: ame@tinyerp.com-20080925074859-l8vqvhfms0xz3i05
---
 addons/process/process.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/process/process.py b/addons/process/process.py
index 9417f927786..e095ad041ae 100644
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -204,7 +204,7 @@ class process_process(osv.osv):
                             update_relatives(r, _id, _model)
 
         for nid, node in nodes.items():
-            if node['active'] or node['model'] == res_model:
+            if not node['gray'] and (node['active'] or node['model'] == res_model):
                 update_relatives(nid, res_id, res_model)
                 break
 

From 69e8722984911b36fddbf44559572d0e80473c13 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 25 Sep 2008 11:30:39 +0200
Subject: [PATCH 33/46] merge

bzr revid: fp@tinyerp.com-20080925093039-vym41oibvd1ezys8
---
 addons/stock/product.py              | 10 ++++++++--
 addons/stock/report/product_stock.py |  4 ++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/addons/stock/product.py b/addons/stock/product.py
index d03a1c9a15c..0e2db338b9f 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -39,7 +39,10 @@ class product_product(osv.osv):
             return _('Products: ')+self.pool.get('stock.location').browse(cr, user, context['location'], context).name
         return res
 
-    def get_product_available(self,cr,uid,ids,context={}):
+    def get_product_available(self,cr,uid,ids,context=None):
+        if not context:
+            context = {}
+        print 'CONTEXT', context
         states=context.get('states',[])
         what=context.get('what',())
         if not ids:
@@ -61,7 +64,10 @@ class product_product(osv.osv):
                 context['location'] = res2[0]
 
         if context.get('location', False):
-            location_ids = [context['location']]
+            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()]
diff --git a/addons/stock/report/product_stock.py b/addons/stock/report/product_stock.py
index 01d3d0b8290..71a13ab0490 100644
--- a/addons/stock/report/product_stock.py
+++ b/addons/stock/report/product_stock.py
@@ -79,6 +79,8 @@ class report_stock(report_int):
         for (qty, dt, prod_id) in cr.fetchall():
             if dt<=dt_from:
                 dt= (DateTime.now() + DateTime.RelativeDateTime(days=1)).strftime('%Y-%m-%d')
+            else:
+                dt = dt[:10]
             products.setdefault(prod_id, [])
             products[prod_id].append((dt,-qty))
 
@@ -86,6 +88,8 @@ class report_stock(report_int):
         for (qty, dt, prod_id) in cr.fetchall():
             if dt<=dt_from:
                 dt= (DateTime.now() + DateTime.RelativeDateTime(days=1)).strftime('%Y-%m-%d')
+            else:
+                dt = dt[:10]
             products.setdefault(prod_id, [])
             products[prod_id].append((dt,qty))
 

From b89d08b6297ffcf16c8d4b72539a5a91b7b5bf52 Mon Sep 17 00:00:00 2001
From: Amit Mendapara <ame@tinyerp.com>
Date: Thu, 25 Sep 2008 11:40:23 +0200
Subject: [PATCH 34/46] Fixed process (temporary fix).

bzr revid: ame@tinyerp.com-20080925094023-uejyduf4ivmdpt2a
---
 addons/process/process.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/addons/process/process.py b/addons/process/process.py
index e095ad041ae..d7a3eb7e369 100644
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -199,9 +199,14 @@ class process_process(osv.osv):
                             rel = refobj[n]
                             if rel and isinstance(rel, list) :
                                 rel = rel[0]
-                            _id = (rel or False) and rel.id
-                            _model = node['model']
-                            update_relatives(r, _id, _model)
+                            if isinstance(rel, basestring):
+                                print "XXX: ", rel
+                            try: # XXXXXXXXXXXXXXXXXXX
+                                _id = (rel or False) and rel.id
+                                _model = node['model']
+                                update_relatives(r, _id, _model)
+                            except:
+                                pass
 
         for nid, node in nodes.items():
             if not node['gray'] and (node['active'] or node['model'] == res_model):

From 79e22ccc72933e4f8bc7ab7fb1cb3446422172ab Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@tinyerp.com>
Date: Thu, 25 Sep 2008 15:28:52 +0530
Subject: [PATCH 35/46] solve problem : - if you make invoice in 2008 fiscal
 year and then close that year..and create new fiscal year and in new fiscal
 year you pay that invoice that time..original invoice entries does not get
 paid and reconciled...

bzr revid: mra@tinyerp.com-20080925095852-fh177c0td425yx49
---
 addons/account/account_move_line.py              | 12 +++++++++++-
 addons/account/account_view.xml                  | 14 +++++++++-----
 addons/account/wizard/wizard_fiscalyear_close.py | 10 ++++++++--
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index e55b6d54fee..abade8c579c 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -305,6 +305,8 @@ class account_move_line(osv.osv):
         'analytic_account_id' : fields.many2one('account.analytic.account', 'Analytic Account'),
 #TODO: remove this
         'amount_taxed':fields.float("Taxed Amount",digits=(16,2)),
+        'parent_move_lines':fields.many2many('account.move.line', 'account_move_line_rel', 'child_id', 'parent_id', 'Parent'),
+        'reconcile_implicit':fields.boolean('Implicit Reconciliaiton')
     }
 
     def _get_date(self, cr, uid, context):
@@ -435,7 +437,11 @@ class account_move_line(osv.osv):
         currency = 0.0
         account_id = False
         partner_id = False
+        implicit_lines = []
         for line in unrec_lines:
+            if line.parent_move_lines:
+                for i in line.parent_move_lines:
+                    implicit_lines.append(i.id)
             if line.state <> 'valid':
                 raise osv.except_osv(_('Error'),
                         _('Entry "%s" is not valid !') % line.name)
@@ -531,9 +537,13 @@ class account_move_line(osv.osv):
             'line_id': map(lambda x: (4,x,False), ids),
             'line_partial_ids': map(lambda x: (3,x,False), ids)
         })
+        wf_service = netsvc.LocalService("workflow")
+        if implicit_lines:
+            self.write(cr, uid, implicit_lines, {'reconcile_implicit':True,'reconcile_id':r_id})
+            for id in implicit_lines:
+                wf_service.trg_trigger(uid, 'account.move.line', id, cr)
         # the id of the move.reconcile is written in the move.line (self) by the create method above
         # because of the way the line_id are defined: (4, x, False)
-        wf_service = netsvc.LocalService("workflow")
         for id in ids:
             wf_service.trg_trigger(uid, 'account.move.line', id, cr)
         return r_id
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 62cb55b13e4..35d51003902 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -705,6 +705,10 @@
                         <page string="Analytic Lines">
                             <field colspan="4" name="analytic_lines" nolabel="1"/>
                         </page>
+                        <page string="Move Lines">
+	                        <field colspan="4" name="reconcile_implicit"/>
+                            <field colspan="4" name="parent_move_lines" nolabel="0"/>
+                       	</page>
                     </notebook>
                 </form>
             </field>
@@ -1354,10 +1358,10 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
-        </record>     
-         
+        </record>
+
+
 
-        
 
 
         <!-- register configuration wizard -->
@@ -1367,8 +1371,8 @@
             <field name="note">Define Fiscal Years and Select Charts of Account</field>
             <field name="action_id" ref="action_account_config_wizard_form"/>
             <field name="state">open</field>
-        </record>        
-        
+        </record>
+
 
 
         <!-- Account Templates -->
diff --git a/addons/account/wizard/wizard_fiscalyear_close.py b/addons/account/wizard/wizard_fiscalyear_close.py
index 455ab049649..e26410e1dae 100644
--- a/addons/account/wizard/wizard_fiscalyear_close.py
+++ b/addons/account/wizard/wizard_fiscalyear_close.py
@@ -110,7 +110,7 @@ def _data_save(self, cr, uid, data, context):
                 offset = 0
                 limit = 100
                 while True:
-                    cr.execute('SELECT name, quantity, debit, credit, account_id, ref, ' \
+                    cr.execute('SELECT id, name, quantity, debit, credit, account_id, ref, ' \
                                 'amount_currency, currency_id, blocked, partner_id, ' \
                                 'date_maturity, date_created ' \
                             'FROM account_move_line ' \
@@ -123,10 +123,13 @@ def _data_save(self, cr, uid, data, context):
                     if not result:
                         break
                     for move in result:
+                        parent_id = move['id']
+                        move.pop('id')
                         move.update({
                             'date': period.date_start,
                             'journal_id': new_journal.id,
                             'period_id': period.id,
+                            'parent_move_lines':[(6,0,[parent_id])]
                         })
                         pool.get('account.move.line').create(cr, uid, move, {
                             'journal_id': new_journal.id,
@@ -137,7 +140,7 @@ def _data_save(self, cr, uid, data, context):
                 offset = 0
                 limit = 100
                 while True:
-                    cr.execute('SELECT name, quantity, debit, credit, account_id, ref, ' \
+                    cr.execute('SELECT id, name, quantity, debit, credit, account_id, ref, ' \
                                 'amount_currency, currency_id, blocked, partner_id, ' \
                                 'date_maturity, date_created ' \
                             'FROM account_move_line ' \
@@ -149,10 +152,13 @@ def _data_save(self, cr, uid, data, context):
                     if not result:
                         break
                     for move in result:
+                        parent_id = move['id']
+                        move.pop('id')
                         move.update({
                             'date': period.date_start,
                             'journal_id': new_journal.id,
                             'period_id': period.id,
+                            'parent_move_lines':[(6,0,[parent_id])]
                         })
                         pool.get('account.move.line').create(cr, uid, move)
                     offset += limit

From d286f601cb4c6c36c14f28acbc0b683e5acec448 Mon Sep 17 00:00:00 2001
From: "hda@tinyerp.com" <>
Date: Thu, 25 Sep 2008 16:57:34 +0530
Subject: [PATCH 36/46] Added pricelists on product form

bzr revid: hda@tinyerp.com-20080925112734-3cu3io9c1de22em0
---
 addons/sale/__init__.py      |  1 +
 addons/sale/__terp__.py      |  1 +
 addons/sale/product.py       | 84 ++++++++++++++++++++++++++++++++++++
 addons/sale/product_view.xml | 33 ++++++++++++++
 4 files changed, 119 insertions(+)
 create mode 100644 addons/sale/product.py
 create mode 100644 addons/sale/product_view.xml

diff --git a/addons/sale/__init__.py b/addons/sale/__init__.py
index b3718c6b3d0..7b962130480 100644
--- a/addons/sale/__init__.py
+++ b/addons/sale/__init__.py
@@ -35,6 +35,7 @@
 import sale
 import stock
 import partner
+import product
 
 import wizard
 import report
diff --git a/addons/sale/__terp__.py b/addons/sale/__terp__.py
index d5bc58a98ae..f540f33ea4b 100644
--- a/addons/sale/__terp__.py
+++ b/addons/sale/__terp__.py
@@ -62,6 +62,7 @@
         "sale_report.xml",
         "sale_wizard.xml",
         "stock_view.xml",
+        "product_view.xml",
     ],
     "active": False,
     "installable": True
diff --git a/addons/sale/product.py b/addons/sale/product.py
new file mode 100644
index 00000000000..5054aabeabf
--- /dev/null
+++ b/addons/sale/product.py
@@ -0,0 +1,84 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# 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 2
+# 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, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools import config
+
+class product_pricelist(osv.osv):
+    _inherit = "product.pricelist"
+    def _compute_price(self, cr, uid, ids, field_name, arg, context):
+        res = {}
+        for id in ids:
+            res[id]=0.0
+        return res
+    _columns = {
+        'price': fields.function(_compute_price, type='float', method=True, string='Price', digits=(16, int(config['price_accuracy']))),
+        }
+product_pricelist()
+
+class product_product(osv.osv):
+    _name = 'product.product'
+    _inherit = 'product.product'
+
+    def _pricelist_sale_ids(self, cr, uid, ids, name, arg, context=None):
+        result = {}
+        if not context:
+            context={}
+        pricelist_obj=self.pool.get('product.pricelist')
+        for product in self.browse(cr, uid, ids, context):
+            pricelist_ids=pricelist_obj.search(cr,uid,[('type','=','sale')], context=context)
+            result[product.id]=pricelist_ids
+        return result
+
+    def _pricelist_purchase_ids(self, cr, uid, ids, name, arg, context=None):
+        result = {}
+        pricelist_obj=self.pool.get('product.pricelist')
+        for product in self.browse(cr, uid, ids, context):
+            pricelist_ids=pricelist_obj.search(cr,uid,[('type','=','purchase')])
+            result[product.id]=pricelist_ids
+        return result
+
+    _columns = {
+        'pricelist_sale':fields.function(
+            _pricelist_sale_ids,
+            method=True,
+            relation='product.pricelist',
+            string='Sale Pricelists',
+            type="many2many"),
+        'pricelist_purchase':fields.function(
+            _pricelist_purchase_ids,
+            method=True,
+            relation='product.pricelist',
+            string='Purchase Pricelists',
+            type="many2many"),
+    }
+
+product_product()
diff --git a/addons/sale/product_view.xml b/addons/sale/product_view.xml
new file mode 100644
index 00000000000..8282544c35e
--- /dev/null
+++ b/addons/sale/product_view.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_product_pricelists_function_form" model="ir.ui.view">
+	        <field name="name">view.product.pricelists.function.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">
+                <field colspan="4" name="seller_ids" nolabel="1" position="after">
+	                <group colspan="4" groups="base.group_extended">
+	                	<separator string="Sale Pricelists" colspan="2"/>
+	                	<separator string="Purchase Pricelists" colspan="2"/>
+	    		        <field nolabel="1" name="pricelist_sale" colspan="2">
+	                        <tree string="Sale Price List">
+			                    <field name="name"/>
+			                    <field name="price" context="{'product_id':parent.id}"/>
+			                </tree>
+			            </field>
+	    		        <field nolabel="1" name="pricelist_purchase" colspan="2" context="product_id=parent.id">
+	                        <tree string="Purchase Price List" context="product_id=parent.id">
+			                    <field name="name"/>
+			                    <field name="price" context="product_id=parent.id"/>
+			                </tree>
+			            </field>
+	                </group>
+	            </field>
+	        </field>
+	    </record>
+
+    </data>
+</openerp>
\ No newline at end of file

From 18059ab81771faadfa08db1a7896fc2863b68e28 Mon Sep 17 00:00:00 2001
From: Jay Vora <jvo@tinyerp.com>
Date: Thu, 25 Sep 2008 18:32:10 +0530
Subject: [PATCH 37/46] Bugfix :Problem of Report of Crossovered budget on
 account budget

bzr revid: jvo@tinyerp.com-20080925130210-bmi3uuq26zit9ke3
---
 addons/account_budget/crossovered_budget.py   | 22 +++++++++++++++----
 .../report/crossovered_budget_report.py       | 10 +++++----
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/addons/account_budget/crossovered_budget.py b/addons/account_budget/crossovered_budget.py
index c5a81a2398b..b8496b5ced7 100644
--- a/addons/account_budget/crossovered_budget.py
+++ b/addons/account_budget/crossovered_budget.py
@@ -138,7 +138,7 @@ crossovered_budget()
 
 class crossovered_budget_lines(osv.osv):
 
-    def _pra_amt(self, cr, uid, ids,name,args,context):
+    def _prac_amt(self, cr, uid, ids,context={}):
         res = {}
         for line in self.browse(cr, uid, ids):
             acc_ids = ','.join([str(x.id) for x in line.general_budget_id.account_ids])
@@ -157,7 +157,14 @@ class crossovered_budget_lines(osv.osv):
             res[line.id]=result
         return res
 
-    def _theo_amt(self, cr, uid, ids,name,args,context):
+    def _prac(self, cr, uid, ids,name,args,context):
+        res={}
+        for line in self.browse(cr, uid, ids):
+            res[line.id]=self._prac_amt(cr,uid,[line.id],context=context)[line.id]
+
+        return res
+
+    def _theo_amt(self, cr, uid, ids,context={}):
         res = {}
         for line in self.browse(cr, uid, ids):
             today=datetime.datetime.today()
@@ -184,6 +191,13 @@ class crossovered_budget_lines(osv.osv):
             res[line.id]=theo_amt
         return res
 
+    def _theo(self, cr, uid, ids,name,args,context):
+        res={}
+        for line in self.browse(cr, uid, ids):
+            res[line.id]=self._theo_amt(cr,uid,[line.id],context=context)[line.id]
+
+        return res
+
     def _perc(self, cr, uid, ids,name,args,context):
         res = {}
         for line in self.browse(cr, uid, ids):
@@ -202,8 +216,8 @@ class crossovered_budget_lines(osv.osv):
         'date_to': fields.date('End Date',required=True),
         'paid_date': fields.date('Paid Date'),
         'planned_amount':fields.float('Planned Amount',required=True),
-        'practical_amount':fields.function(_pra_amt,method=True, string='Practical Amount',type='float'),
-        'theoritical_amount':fields.function(_theo_amt,method=True, string='Theoritical Amount',type='float'),
+        'practical_amount':fields.function(_prac,method=True, string='Practical Amount',type='float'),
+        'theoritical_amount':fields.function(_theo,method=True, string='Theoritical Amount',type='float'),
         'percentage':fields.function(_perc,method=True, string='Percentage',type='float'),
     }
 crossovered_budget_lines()
diff --git a/addons/account_budget/report/crossovered_budget_report.py b/addons/account_budget/report/crossovered_budget_report.py
index a3de4e1a148..bbe0b54ee95 100644
--- a/addons/account_budget/report/crossovered_budget_report.py
+++ b/addons/account_budget/report/crossovered_budget_report.py
@@ -63,6 +63,7 @@ class budget_report(report_sxw.rml_parse):
 
         budgets = self.pool.get('crossovered.budget').browse(self.cr, self.uid, [object.id], self.context.copy())
 
+        c_b_lines_obj=self.pool.get('crossovered.budget.lines')
         for budget_id in budgets:
 
             res={}
@@ -90,6 +91,7 @@ class budget_report(report_sxw.rml_parse):
             self.cr.execute('select distinct(analytic_account_id) from crossovered_budget_lines where id in (%s)'%(b_line_ids))
             an_ids=self.cr.fetchall()
 
+            context={'wizard_date_from':d_from,'wizard_date_to':d_to}
             for i in range(0,len(an_ids)):
 
                 analytic_name=self.pool.get('account.analytic.account').browse(self.cr, self.uid,[an_ids[i][0]])
@@ -106,9 +108,9 @@ class budget_report(report_sxw.rml_parse):
                 }
                 result.append(res)
 
-                line_ids = self.pool.get('crossovered.budget.lines').search(self.cr, self.uid, [('id', 'in', budget_ids),('analytic_account_id','=',an_ids[i][0])])
+                line_ids = c_b_lines_obj.search(self.cr, self.uid, [('id', 'in', budget_ids),('analytic_account_id','=',an_ids[i][0])])
 
-                line_id = self.pool.get('crossovered.budget.lines').browse(self.cr,self.uid,line_ids)
+                line_id = c_b_lines_obj.browse(self.cr,self.uid,line_ids)
                 tot_theo=tot_pln=tot_prac=tot_perc=0.00
 
                 done_budget=[]
@@ -116,8 +118,8 @@ class budget_report(report_sxw.rml_parse):
 
                     if line.id in budget_lines:
                         theo=pract=0.00
-                        theo=line._theo_amt(self.cr, self.uid, [line.id],"theoritical_amount",None,context={'wizard_date_from':d_from,'wizard_date_to':d_to})[line.id]
-                        pract=line._pra_amt(self.cr, self.uid, [line.id],"practical_amount",None,context={'wizard_date_from':d_from,'wizard_date_to':d_to})[line.id]
+                        theo=c_b_lines_obj._theo_amt(self.cr, self.uid, [line.id],context)[line.id]
+                        pract=c_b_lines_obj._prac_amt(self.cr, self.uid, [line.id],context)[line.id]
 
                         if line.general_budget_id.id in done_budget:
 

From 838ab04c2fdb3e3e11138689f369f4d4d38ffb65 Mon Sep 17 00:00:00 2001
From: Amit Mendapara <ame@tinyerp.com>
Date: Thu, 25 Sep 2008 18:39:30 +0530
Subject: [PATCH 38/46] Improved Process views (added domains).

bzr revid: ame@tinyerp.com-20080925130930-dmva1nkyzxbqh1pc
---
 addons/process/process_view.xml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index 1c5e9ef4944..cee536def7d 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -21,18 +21,25 @@
                 <notebook colspan="4">
                     <page string="Nodes">
                         <field name="node_ids" colspan="4" nolabel="1">
+                            <tree string="Process Nodes">
+                                <field name="name"/>
+                                <field name="model_id" select="1"/>
+                                <field name="kind" select="1"/>
+                                <field name="flow_start"/>
+                            </tree>
                             <form string="Process Node">
                                 <group colspan="4" string="Details">
                                     <field name="name" select="1"/>
                                     <field name="flow_start"/>
-                                    <newline/>                                    
+                                    <field name="process_id" invisible="1" readonly="1" required="0"/> <!-- used by transition_out -->
+                                    <newline/>
                                     <field name="model_id" select="1"/>
                                     <field name="menu_id" select="2"/>                                    
                                     <newline/>
                                     <field name="kind" select="1"/>
                                     <field name="help_url" widget="url"/>
                                     <field name="model_states"/>
-                                    <field name="subflow_id"/>
+                                    <field name="subflow_id" domain="[('name', '!=', parent.name)]"/>
                                 </group>
                                 <notebook colspan="4">
                                     <page string="Outgoing Transitions">
@@ -45,7 +52,7 @@
                                                 <group colspan="4" string="Details">
                                                     <field name="name"/>
                                                     <newline/>
-                                                    <field name="target_node_id"/>
+                                                    <field name="target_node_id" domain="[('process_id', '=', parent.process_id)]"/>
                                                 </group>
                                                 <notebook colspan="4">
                                                     <page string="Buttons">
@@ -175,7 +182,7 @@
                                 <group colspan="4" string="Details">
                                     <field name="name"/>
                                     <newline/>
-                                    <field name="target_node_id"/>
+                                    <field name="target_node_id" domain="[('process_id', '=', parent.process_id)]"/>
                                 </group>
                                 <notebook colspan="4">
                                     <page string="Buttons">

From 7b8878f894fe4d33b1b982fd91ef29c3b595c414 Mon Sep 17 00:00:00 2001
From: Amit Mendapara <ame@tinyerp.com>
Date: Thu, 25 Sep 2008 18:58:55 +0530
Subject: [PATCH 39/46] Fixed process copy.

bzr revid: ame@tinyerp.com-20080925132855-3kn2srccbh3ilg4r
---
 addons/process/process.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/addons/process/process.py b/addons/process/process.py
index d7a3eb7e369..a5f4946b129 100644
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -356,5 +356,16 @@ class process_transition_action(osv.osv):
     _defaults = {
         'state': lambda *args: 'dummy',
     }
+
+    def copy(self, cr, uid, id, default=None, context={}):
+        if not default:
+            default = {}
+
+        state = self.pool.get('process.transition.action').browse(cr, uid, [id], context)[0].state
+        if state:
+            default['state'] = state
+
+        return super(process_transition_action, self).copy(cr, uid, id, default, context)
+
 process_transition_action()
 

From f58b7bc5788179daff8474791f3a4dee40ce9898 Mon Sep 17 00:00:00 2001
From: Jay Vora <jvo@tinyerp.com>
Date: Thu, 25 Sep 2008 19:29:45 +0530
Subject: [PATCH 40/46] Bugfix:Print Screen Float values well-aligned

bzr revid: jvo@tinyerp.com-20080925135945-xc0vponx69cmkov6
---
 bin/report/printscreen/ps_form.py | 2 ++
 bin/report/printscreen/ps_list.py | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bin/report/printscreen/ps_form.py b/bin/report/printscreen/ps_form.py
index 1e7757e3f17..e39949b7c51 100644
--- a/bin/report/printscreen/ps_form.py
+++ b/bin/report/printscreen/ps_form.py
@@ -141,6 +141,8 @@ class report_printscreen_list(report_int):
                     line[f] = line[f][1]
                 if fields[f]['type'] in ('one2many','many2many') and line[f]:
                     line[f] = '( '+str(len(line[f])) + ' )'
+                if fields[f]['type'] in ('float','integer'):
+                    line[f]=round(line[f],2)
                 col = new_doc.createElement("col")
                 col.setAttribute('tree','no')
                 if line[f] != None:
diff --git a/bin/report/printscreen/ps_list.py b/bin/report/printscreen/ps_list.py
index 29242a3119e..d0245828735 100644
--- a/bin/report/printscreen/ps_list.py
+++ b/bin/report/printscreen/ps_list.py
@@ -128,7 +128,6 @@ class report_printscreen_list(report_int):
                 t += fields[f].get('size', 80) / 28 + 1
 
             l.append(s)
-
         for pos in range(len(l)):
             if not l[pos]:
                 s = fields[fields_order[pos]].get('size', 80) / 28 + 1
@@ -152,7 +151,6 @@ class report_printscreen_list(report_int):
         count = len(fields_order)
         for i in range(0,count):
             tsum.append(0)
-
         for line in results:
             node_line = new_doc.createElement("row")
 
@@ -163,6 +161,8 @@ class report_printscreen_list(report_int):
                     line[f] = line[f][1]
                 if fields[f]['type'] in ('one2many','many2many') and line[f]:
                     line[f] = '( '+str(len(line[f])) + ' )'
+                if fields[f]['type'] in ('float','integer'):
+                    line[f]=round(line[f],2)
                 col = new_doc.createElement("col")
                 col.setAttribute('para','yes')
                 col.setAttribute('tree','no')

From 18833843b1b323788ec04e3c10b88f60b72db9b4 Mon Sep 17 00:00:00 2001
From: qdp <qdp@tinyerp.com>
Date: Thu, 25 Sep 2008 16:03:46 +0200
Subject: [PATCH 41/46] *improved the pay invoice wizard: the default value of
 the amount is now the residual and not the total field

bzr revid: qdp@tinyerp.com-20080925140346-tnijc5x0103wfczk
---
 addons/account/wizard/wizard_pay_invoice.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/wizard/wizard_pay_invoice.py b/addons/account/wizard/wizard_pay_invoice.py
index 44e4fdd065c..fe60dc4689f 100644
--- a/addons/account/wizard/wizard_pay_invoice.py
+++ b/addons/account/wizard/wizard_pay_invoice.py
@@ -124,7 +124,7 @@ def _get_period(self, cr, uid, data, context={}):
         raise wizard.except_wizard(_('Error !'), _('Can not pay draft invoice.'))
     return {
         'period_id': period_id,
-        'amount': invoice.amount_total,
+        'amount': invoice.residual,
         'date': time.strftime('%Y-%m-%d')
     }
 

From f475834cfb60438bddd050316b0a792a09aa6eb5 Mon Sep 17 00:00:00 2001
From: qdp <qdp@tinyerp.com>
Date: Thu, 25 Sep 2008 16:14:39 +0200
Subject: [PATCH 42/46] *account_account form view improved: moved 2 fields and
 added attrs

bzr revid: qdp@tinyerp.com-20080925141439-yv5366wgbcwc7hyx
---
 addons/account/account_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 35d51003902..b6493f33e1b 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -116,19 +116,19 @@
                     <field name="type" select="1"/>
                     <field name="company_id" select="2"/>
                     <field name="parent_id"/>
-                    <field name="active"/>
+                    <field name="user_type" select="1"/>
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
                             <newline/>
-                            <field name="user_type" select="1"/>
                             <field name="currency_id" select="2"/>
+                            <field name="active" select="2"/>
                             <field name="reconcile"/>
                             <field name="check_history"/>
                             <newline/>
                             <newline/>
-                            <field name="child_consol_ids" colspan="4"/>
                             <field colspan="4" name="tax_ids" domain="[('parent_id','=',False)]"/>
+                            <field name="child_consol_ids" colspan="4" attrs="{'readonly':[('type','!=','consolidation')]}"/>/>
                         </page>
                         <page string="Notes">
                             <field colspan="4" name="note" nolabel="1"/>

From 703a2410d9398fb5e0c471e2d058dd45664fc1cb Mon Sep 17 00:00:00 2001
From: qdp <qdp@tinyerp.com>
Date: Thu, 25 Sep 2008 16:17:35 +0200
Subject: [PATCH 43/46] *added computation of debit/credit/balance for
 consolidation accounts *small improvements

bzr revid: qdp@tinyerp.com-20080925141735-7loyyuoe6cq9pfgr
---
 addons/account/account.py | 45 +++++++++++++++++++++++++++++++++------
 1 file changed, 38 insertions(+), 7 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 61c0a77be3b..3dbb1877679 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -160,14 +160,29 @@ class account_account(osv.osv):
         return super(account_account,self).search(cr, uid, args, offset, limit,
                 order, context=context, count=count)
 
+    def _get_children_and_consol(self, cr, uid, ids, context={}):
+        #this function search for all the children and all consolidated children (recursively) of the given account ids
+        res = self.search(cr, uid, [('parent_id', 'child_of', ids)])
+        for id in res:
+            this = self.browse(cr, uid, id, context)
+            for child in this.child_consol_ids:
+                if child.id not in res:
+                    res.append(child.id)
+        if len(res) != len(ids):
+            return self._get_children_and_consol(cr, uid, res, context)
+        return res
+
     def __compute(self, cr, uid, ids, field_names, arg, context={}, query=''):
+        #compute the balance/debit/credit accordingly to the value of field_name for the given account ids
         mapping = {
             'balance': "COALESCE(SUM(l.debit) - SUM(l.credit), 0) as balance ",
             'debit': "COALESCE(SUM(l.debit), 0) as debit ",
             'credit': "COALESCE(SUM(l.credit), 0) as credit "
         }
-        ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
+        #get all the necessary accounts
+        ids2 = self._get_children_and_consol(cr, uid, ids, context)
         acc_set = ",".join(map(str, ids2))
+        #compute for each account the balance/debit/credit from the move lines
         accounts = {}
         if ids2:
             query = self.pool.get('account.move.line')._query_get(cr, uid,
@@ -184,13 +199,29 @@ class account_account(osv.osv):
             for res in cr.dictfetchall():
                 accounts[res['id']] = res
 
+        #for the asked accounts, get from the dictionnary 'accounts' the value of it
         res = {}
         for id in ids:
-            res[id] = {}.fromkeys(field_names, 0.0)
-            ids2 = self.search(cr, uid, [('parent_id', 'child_of', [id])])
+            res[id] = self._get_account_values(cr, uid, id, accounts, field_names, context)
+        return res
+
+    def _get_account_values(self, cr, uid, id, accounts, field_names, context={}):
+        res = {}.fromkeys(field_names, 0.0)
+        browse_rec = self.browse(cr, uid, id)
+        if browse_rec.type == 'consolidation':
+            ids2 = self.read(cr, uid, [browse_rec.id], ['child_consol_ids'], context)[0]['child_consol_ids']
+            for t in self.search(cr, uid, [('parent_id', 'child_of', [browse_rec.id])]):
+                if t not in ids2 and t != browse_rec.id:
+                    ids2.append(t)
+            for i in ids2:
+                tmp = self._get_account_values(cr, uid, i, accounts, field_names, context)
+                for a in field_names:
+                    res[a] += tmp[a]
+        else:
+            ids2 = self.search(cr, uid, [('parent_id', 'child_of', [browse_rec.id])])
             for i in ids2:
                 for a in field_names:
-                    res[id][a] += accounts.get(i, {}).get(a, 0.0)
+                    res[a] += accounts.get(i, {}).get(a, 0.0)
         return res
 
     def _get_company_currency(self, cr, uid, ids, field_name, arg, context={}):
@@ -216,7 +247,7 @@ class account_account(osv.osv):
     _columns = {
         'name': fields.char('Name', size=128, required=True, select=True),
         'currency_id': fields.many2one('res.currency', 'Secondary Currency', help="Force all moves for this account to have this secondary currency."),
-        'code': fields.char('Code', size=64),
+        'code': fields.char('Code', size=64, required=True),
         'type': fields.selection([
             ('receivable','Receivable'),
             ('payable','Payable'),
@@ -229,7 +260,7 @@ class account_account(osv.osv):
         'user_type': fields.many2one('account.account.type', 'Account Type', required=True),
         'parent_id': fields.many2one('account.account','Parent', ondelete='cascade'),
         'child_parent_ids':fields.one2many('account.account','parent_id','Children'),
-        'child_consol_ids':fields.many2many('account.account', 'account_account_consol_rel', 'child_id', 'parent_id', 'Consolidated Children',domain=[('type', '=', 'consolidation')]),
+        'child_consol_ids':fields.many2many('account.account', 'account_account_consol_rel', 'child_id', 'parent_id', 'Consolidated Children'),
         'child_id': fields.function(_get_child_ids, method=True, type='many2many',relation="account.account",string="Children Accounts"),
         'balance': fields.function(__compute, digits=(16,2), method=True, string='Balance', multi='balance'),
         'credit': fields.function(__compute, digits=(16,2), method=True, string='Credit', multi='balance'),
@@ -245,7 +276,7 @@ class account_account(osv.osv):
 
         'parent_left': fields.integer('Parent Left', select=1),
         'parent_right': fields.integer('Parent Right', select=1),
-        'check_history': fields.boolean('Display History', help="Check this box if you want to print all entries otherwise it will print balance of this account")
+        'check_history': fields.boolean('Display History', help="Check this box if you want to print all entries when printing the General Ledger, otherwise it will only print its balance.")
     }
 
     def _default_company(self, cr, uid, context={}):

From 0d0e87c941b065f1e27ab98d84cdf47fb899d290 Mon Sep 17 00:00:00 2001
From: Jay Vora <jvo@tinyerp.com>
Date: Thu, 25 Sep 2008 19:47:14 +0530
Subject: [PATCH 44/46] Bugfix on account move line and minor edit on account
 budget

bzr revid: jvo@tinyerp.com-20080925141714-o0dfv75tel6wzxdd
---
 addons/account/account_view.xml             | 4 +++-
 addons/account_budget/crossovered_budget.py | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index b6493f33e1b..70709be18f5 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -654,6 +654,7 @@
                     <field name="state"/>
                     <field name="reconcile_id"/>
                     <field name="reconcile_partial_id"/>
+                    <field colspan="4" name="reconcile_implicit"/>
                 </tree>
             </field>
         </record>
@@ -748,7 +749,7 @@
                             <newline/>
                             <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
                             <field name="analytic_account_id"/>
-
+							<field colspan="4" name="reconcile_implicit"/>
                             <separator colspan="4" string="State"/>
                             <newline/>
                             <field name="reconcile_id"/>
@@ -1289,6 +1290,7 @@
                     <field name="credit" sum="Total credit"/>
                     <field name="account_tax_id"/>
                     <field name="analytic_account_id"/>
+                    <field colspan="4" name="reconcile_implicit"/>
                     <field name="state"/>
                 </tree>
             </field>
diff --git a/addons/account_budget/crossovered_budget.py b/addons/account_budget/crossovered_budget.py
index b8496b5ced7..dfb018d82e8 100644
--- a/addons/account_budget/crossovered_budget.py
+++ b/addons/account_budget/crossovered_budget.py
@@ -215,9 +215,9 @@ class crossovered_budget_lines(osv.osv):
         'date_from': fields.date('Start Date',required=True),
         'date_to': fields.date('End Date',required=True),
         'paid_date': fields.date('Paid Date'),
-        'planned_amount':fields.float('Planned Amount',required=True),
-        'practical_amount':fields.function(_prac,method=True, string='Practical Amount',type='float'),
-        'theoritical_amount':fields.function(_theo,method=True, string='Theoritical Amount',type='float'),
+        'planned_amount':fields.float('Planned Amount',required=True,digits=(16,2)),
+        'practical_amount':fields.function(_prac,method=True, string='Practical Amount',type='float',digits=(16,2)),
+        'theoritical_amount':fields.function(_theo,method=True, string='Theoritical Amount',type='float',digits=(16,2)),
         'percentage':fields.function(_perc,method=True, string='Percentage',type='float'),
     }
 crossovered_budget_lines()

From d189e17e71b2e9bc4ee238ca29c8047888493293 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 25 Sep 2008 21:40:50 +0200
Subject: [PATCH 45/46] bugfixes

bzr revid: fp@tinyerp.com-20080925194050-enw8gayfgjm0b0jc
---
 bin/osv/fields.py       |  1 -
 bin/report/interface.py | 10 +++++++---
 bin/tools/misc.py       |  4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/bin/osv/fields.py b/bin/osv/fields.py
index daee0e4e40a..6ddef4a5338 100644
--- a/bin/osv/fields.py
+++ b/bin/osv/fields.py
@@ -676,7 +676,6 @@ class related(function):
         return res
 
     def __init__(self,*arg,**args):
-        print arg
         self.arg = arg
         super(related, self).__init__(self._fnct_read, arg, fnct_inv_arg=arg,method=True, fnct_search=self._fnct_search,**args)
 
diff --git a/bin/report/interface.py b/bin/report/interface.py
index 95e6ec31946..3e133310476 100644
--- a/bin/report/interface.py
+++ b/bin/report/interface.py
@@ -100,9 +100,13 @@ class report_rml(report_int):
 #       file('/tmp/terp.rml','wb+').write(rml)
         pool = pooler.get_pool(cr.dbname)
         ir_actions_report_xml_obj = pool.get('ir.actions.report.xml')
-        report_xml_ids = ir_actions_report_xml_obj.search(cr, uid,
-        [('report_name', '=', self.name[7:])], context=context)
-        self.title = ir_actions_report_xml_obj.browse(cr,uid,report_xml_ids)[0].name
+        try:
+            report_xml_ids = ir_actions_report_xml_obj.search(cr, uid,
+                [('report_name', '=', self.name[7:])], context=context)
+            self.title = ir_actions_report_xml_obj.browse(cr,uid,report_xml_ids)[0].name
+        except:
+            print 'Report not Found !'
+            self.title = 'Unknown'
         report_type = datas.get('report_type', 'pdf')
         create_doc = self.generators[report_type]
         pdf = create_doc(rml, title=self.title)
diff --git a/bin/tools/misc.py b/bin/tools/misc.py
index f29f1731ddb..d01fa4f293d 100644
--- a/bin/tools/misc.py
+++ b/bin/tools/misc.py
@@ -358,12 +358,12 @@ def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=Non
 
         if debug:
             s.debuglevel = 5
+        s.connect(config['smtp_server'], config['smtp_port'])
         if ssl:
             s.ehlo()
             s.starttls()
             s.ehlo()
 
-        s.connect(config['smtp_server'], config['smtp_port'])
         if config['smtp_user'] or config['smtp_password']:
             s.login(config['smtp_user'], config['smtp_password'])
         s.sendmail(email_from, flatten([email_to, email_cc, email_bcc]), msg.as_string())
@@ -423,12 +423,12 @@ def email_send_attach(email_from, email_to, subject, body, email_cc=None, email_
 
         if debug:
             s.debuglevel = 5
+        s.connect(config['smtp_server'], config['smtp_port'])
         if ssl:
             s.ehlo()
             s.starttls()
             s.ehlo()
 
-        s.connect(config['smtp_server'], config['smtp_port'])
         if config['smtp_user'] or config['smtp_password']:
             s.login(config['smtp_user'], config['smtp_password'])
         s.sendmail(email_from, flatten([email_to, email_cc, email_bcc]), msg.as_string())

From 144766a8e16698115f47e1a2946b0542393e8aca Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 25 Sep 2008 21:46:51 +0200
Subject: [PATCH 46/46] changedtabtospace

bzr revid: fp@tinyerp.com-20080925194651-x7crj9z5tru5bry6
---
 addons/sale/product_view.xml | 50 ++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/addons/sale/product_view.xml b/addons/sale/product_view.xml
index 8282544c35e..582bffa3cd9 100644
--- a/addons/sale/product_view.xml
+++ b/addons/sale/product_view.xml
@@ -3,31 +3,31 @@
     <data>
 
         <record id="view_product_pricelists_function_form" model="ir.ui.view">
-	        <field name="name">view.product.pricelists.function.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">
+            <field name="name">view.product.pricelists.function.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">
                 <field colspan="4" name="seller_ids" nolabel="1" position="after">
-	                <group colspan="4" groups="base.group_extended">
-	                	<separator string="Sale Pricelists" colspan="2"/>
-	                	<separator string="Purchase Pricelists" colspan="2"/>
-	    		        <field nolabel="1" name="pricelist_sale" colspan="2">
-	                        <tree string="Sale Price List">
-			                    <field name="name"/>
-			                    <field name="price" context="{'product_id':parent.id}"/>
-			                </tree>
-			            </field>
-	    		        <field nolabel="1" name="pricelist_purchase" colspan="2" context="product_id=parent.id">
-	                        <tree string="Purchase Price List" context="product_id=parent.id">
-			                    <field name="name"/>
-			                    <field name="price" context="product_id=parent.id"/>
-			                </tree>
-			            </field>
-	                </group>
-	            </field>
-	        </field>
-	    </record>
+                    <group colspan="4" groups="base.group_extended">
+                        <separator string="Sale Pricelists" colspan="2"/>
+                        <separator string="Purchase Pricelists" colspan="2"/>
+                        <field nolabel="1" name="pricelist_sale" colspan="2">
+                            <tree string="Sale Price List">
+                                <field name="name"/>
+                                <field name="price" context="{'product_id':parent.id}"/>
+                            </tree>
+                        </field>
+                        <field nolabel="1" name="pricelist_purchase" colspan="2" context="product_id=parent.id">
+                            <tree string="Purchase Price List" context="product_id=parent.id">
+                                <field name="name"/>
+                                <field name="price" context="product_id=parent.id"/>
+                            </tree>
+                        </field>
+                    </group>
+                </field>
+            </field>
+        </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>