diff -rupN ./account_fstr/account_fstr_category.py ./account_fstr_mod/account_fstr_category.py
--- ./account_fstr/account_fstr_category.py 2011-07-02 12:00:24.000000000 +0800
+++ ./account_fstr_mod/account_fstr_category.py 2012-08-19 13:34:03.387435000 +0800
@@ -155,8 +155,8 @@ class account_fstr_category(osv.osv):
_columns = {
- 'progenitor_id': fields.function(_get_progenitor_id, method=True, string='Progenitor', type='related', store={ 'account_fstr.category': (_get_childs, ['parent_id'], 1)}, multi=True),
- 'progenitor_name': fields.function(_get_progenitor_id, method=True, string='Progenitor', type='related', store={ 'account_fstr.category': (_get_childs, ['parent_id'], 1)}, multi=True),
+ 'progenitor_id': fields.function(_get_progenitor_id, method=True, string='Progenitor', type='integer', store={ 'account_fstr.category': (_get_childs, ['parent_id'], 1)}, multi=True),
+ 'progenitor_name': fields.function(_get_progenitor_id, method=True, string='Progenitor', type='char', store={ 'account_fstr.category': (_get_childs, ['parent_id'], 1)}, multi=True),
}
diff -rupN ./account_fstr/account_fstr_view.xml ./account_fstr_mod/account_fstr_view.xml
--- ./account_fstr/account_fstr_view.xml 2011-07-02 12:00:24.000000000 +0800
+++ ./account_fstr_mod/account_fstr_view.xml 2012-08-20 10:02:47.504181000 +0800
@@ -75,9 +75,8 @@
account_fstr.category.tree
account_fstr.category
tree
- child_id
-
+
@@ -102,6 +101,36 @@
+
+ account_fstr.category.structree
+ account_fstr.category
+ tree
+ child_id
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
view.account_fstr.category.search
account_fstr.category
@@ -128,7 +157,7 @@
account_fstr.category
tree
tree
-
+
[('parent_id','=',False)]
diff -rupN ./account_fstr/__openerp__.py ./account_fstr_mod/__openerp__.py
--- ./account_fstr/__openerp__.py 2011-07-02 12:00:24.000000000 +0800
+++ ./account_fstr_mod/__openerp__.py 2012-08-20 10:14:06.944174040 +0800
@@ -35,6 +35,7 @@ User documentation can be found here - h
Free end-user support is offered by emailing - support@publicus-solutions.com
+Patched by eXcec to make it work in 6.1
''',
'website' : 'http://www.publicus-solutions.com/',
'category' : 'Accounting',
diff -rupN ./account_fstr/wizard/account_fstr_wizard.py ./account_fstr_mod/wizard/account_fstr_wizard.py
--- ./account_fstr/wizard/account_fstr_wizard.py 2011-07-02 12:00:24.000000000 +0800
+++ ./account_fstr_mod/wizard/account_fstr_wizard.py 2012-08-19 22:17:50.288682116 +0800
@@ -21,6 +21,7 @@
from osv import fields, osv
+
class account_fstr_wizard(osv.osv_memory):
_name = 'account_fstr.wizard'
@@ -90,12 +91,12 @@ class account_fstr_wizard(osv.osv_memory
result = act_obj.read(cr, uid, [id], context=context)[0]
result['periods'] = []
if data['period_from'] and data['period_to']:
- result['periods'] = period_obj.build_ctx_periods(cr, uid, data['period_from'], data['period_to'])
- result['context'] = str({'fiscalyear': data['fiscalyear'], 'periods': result['periods'], \
+ result['periods'] = period_obj.build_ctx_periods(cr, uid, data['period_from'][0], data['period_to'][0])
+ result['context'] = str({'fiscalyear': data['fiscalyear'][0], 'periods': result['periods'], \
'state': data['target_move']})
if data['fiscalyear']:
- result['name'] += ':' + fy_obj.read(cr, uid, [data['fiscalyear']], context=context)[0]['code']
- result['domain'] = [('id', '=', data['root_node'])]
+ result['name'] += ':' + fy_obj.read(cr, uid, [data['fiscalyear'][0]], context=context)[0]['code']
+ result['domain'] = [('id', '=', data['root_node'][0])]
return result
def print_template(self, cr, uid, ids, context={}):
@@ -104,13 +105,13 @@ class account_fstr_wizard(osv.osv_memory
data_obj = self.browse(cr, uid, ids, context=context)[0]
datas = {'periods': [], 'ids': ids}
if data['period_from'] and data['period_to']:
- context['periods'] = period_obj.build_ctx_periods(cr, uid, data['period_from'], data['period_to'])
- datas['context'] = str({'fiscalyear': data['fiscalyear'], 'periods': datas['periods'], \
+ context['periods'] = period_obj.build_ctx_periods(cr, uid, data['period_from'][0], data['period_to'][0])
+ datas['context'] = str({'fiscalyear': data['fiscalyear'][0], 'periods': datas['periods'], \
'state': data['target_move']})
datas['period_from'] = data_obj.period_from.name
datas['period_to'] = data_obj.period_to.name
datas['fiscalyear'] = data_obj.fiscalyear.name
- context['account_fstr_root_node'] = data['root_node']
+ context['account_fstr_root_node'] = data['root_node'][0]
context['hide_zero'] = data['hide_zero']
return {
'type': 'ir.actions.report.xml',