Merge lp:~robertolizana/ocb-addons/6.1-fix-unknow_field_reconcil_partial_id into lp:ocb-addons/6.1

[Roberto Lizana (trey.es)]

[FIX] When create an account.move with line_id value don't reset information of partial conciliation, the field name reconcil_partial_id is incorrect

[Stefan Rijnhart (Opener) (stefan-opener)]

Thanks Roberto! That is a very useful fix.

One thing: if I am correct, the only line that has actually changed is line 36. But the diff shows some whitespace changes. Could you please revert these changes?

review: Needs Fixing

[Roberto Lizana (trey.es) (robertolizana)]

Stefan, fixed whitespace changes.

I resubmit proposal to merge for update diff.

[Stefan Rijnhart (Opener) (stefan-opener)]

Sorry Roberto, it didn't work :-(.

You could try getting a version of this file from a fresh branch of ocb-addons/6.1 and reapply the changes. Commit that file on top of this branch.

review: Needs Fixing

Unmerged revisions

6764. By Roberto Lizana (trey.es) on 2013-07-23

FIX. Unknow field reconcil_partial_id to create account.move

=== modified file 'account/account.py'
--- account/account.py	2013-07-15 13:14:07 +0000
+++ account/account.py	2013-07-25 02:00:41 +0000
@@ -134,7 +134,7 @@
 
     def _get_current_report_type(self, cr, uid, ids, name, arg, context=None):
         obj_data = self.pool.get('ir.model.data')
-        obj_financial_report = self.pool.get('account.financial.report') 
+        obj_financial_report = self.pool.get('account.financial.report')
         res = {}
         financial_report_ref = {
             'asset': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_assets0')[1], context=context),
@@ -152,7 +152,7 @@
 
     def _save_report_type(self, cr, uid, account_type_id, field_name, field_value, arg, context=None):
         obj_data = self.pool.get('ir.model.data')
-        obj_financial_report = self.pool.get('account.financial.report') 
+        obj_financial_report = self.pool.get('account.financial.report')
         #unlink if it exists somewhere in the financial reports related to BS or PL
         financial_report_ref = {
             'asset': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_assets0')[1], context=context),
@@ -177,7 +177,7 @@
  'Balance' will generally be used for cash accounts.
  'Detail' will copy each existing journal item of the previous year, even the reconciled ones.
  'Unreconciled' will copy only the journal items that were unreconciled on the first day of the new fiscal year."""),
-        'report_type': fields.function(_get_current_report_type, fnct_inv=_save_report_type, type='selection', string='P&L / BS Category', 
+        'report_type': fields.function(_get_current_report_type, fnct_inv=_save_report_type, type='selection', string='P&L / BS Category',
             selection= [('none','/'),
                         ('income', _('Profit & Loss (Income account)')),
                         ('expense', _('Profit & Loss (Expense account)')),
@@ -1397,7 +1397,7 @@
                 if not l[0]:
                     l[2].update({
                         'reconcile_id':False,
-                        'reconcil_partial_id':False,
+                        'reconcile_partial_id':False,
                         'analytic_lines':False,
                         'invoice':False,
                         'ref':False,
@@ -1862,14 +1862,14 @@
             return result in the context
             Ex: result=round(price_unit*0.21,4)
     """
- 
+
     def copy_data(self, cr, uid, id, default=None, context=None):
         if default is None:
-            default = {} 
+            default = {}
         name = self.read(cr, uid, id, ['name'], context=context)['name']
         default = default.copy()
         default.update({'name': name + _(' (Copy)')})
-        return super(account_tax, self).copy_data(cr, uid, id, default=default, context=context)    
+        return super(account_tax, self).copy_data(cr, uid, id, default=default, context=context)
 
     def get_precision_tax():
         def change_digit_tax(cr):
@@ -2776,7 +2776,7 @@
     _columns={
         'name': fields.char('Name', size=64, required=True),
         'parent_id': fields.many2one('account.chart.template', 'Parent Chart Template'),
-        'code_digits': fields.integer('# of Digits', required=True, help="No. of Digits to use for account code"), 
+        'code_digits': fields.integer('# of Digits', required=True, help="No. of Digits to use for account code"),
         'visible': fields.boolean('Can be Visible?', help="Set this to False if you don't want this template to be used actively in the wizard that generate Chart of Accounts from templates, this is useful when you want to generate accounts of this template only when loading its child template."),
         'complete_tax_set': fields.boolean('Complete Set of Taxes', help='This boolean helps you to choose if you want to propose to the user to encode the sale and purchase rates or choose from list of taxes. This last choice assumes that the set of tax defined on this template is complete'),
         'account_root_id': fields.many2one('account.account.template', 'Root Account', domain=[('parent_id','=',False)]),
@@ -3060,7 +3060,7 @@
         return res
 
     def default_get(self, cr, uid, fields, context=None):
-        res = super(wizard_multi_charts_accounts, self).default_get(cr, uid, fields, context=context) 
+        res = super(wizard_multi_charts_accounts, self).default_get(cr, uid, fields, context=context)
         tax_templ_obj = self.pool.get('account.tax.template')
 
         if 'bank_accounts_id' in fields:
@@ -3137,7 +3137,7 @@
             # Get the analytic journal
             data = False
             if journal_type in ('sale', 'sale_refund'):
-                data = obj_data.get_object_reference(cr, uid, 'account', 'analytic_journal_sale') 
+                data = obj_data.get_object_reference(cr, uid, 'account', 'analytic_journal_sale')
             elif journal_type in ('purchase', 'purchase_refund'):
                 pass
             elif journal_type == 'general':
@@ -3163,7 +3163,7 @@
             if journal_type in ('general', 'situation'):
                 data = obj_data.get_object_reference(cr, uid, 'account', 'account_journal_view')
             elif journal_type in ('sale_refund', 'purchase_refund'):
-                data = obj_data.get_object_reference(cr, uid, 'account', 'account_sp_refund_journal_view') 
+                data = obj_data.get_object_reference(cr, uid, 'account', 'account_sp_refund_journal_view')
             else:
                 data = obj_data.get_object_reference(cr, uid, 'account', 'account_sp_journal_view')
             return data and data[1] or False
@@ -3400,7 +3400,7 @@
 
     def _prepare_bank_journal(self, cr, uid, line, current_num, default_account_id, company_id, context=None):
         '''
-        This function prepares the value to use for the creation of a bank journal created through the wizard of 
+        This function prepares the value to use for the creation of a bank journal created through the wizard of
         generating COA from templates.
 
         :param line: dictionary containing the values encoded by the user related to his bank account
@@ -3418,9 +3418,9 @@
         tmp = obj_data.get_object_reference(cr, uid, 'account', 'account_journal_bank_view')
         view_id_cash = tmp and tmp[1] or False
 
-        # we need to loop again to find next number for journal code 
+        # we need to loop again to find next number for journal code
         # because we can't rely on the value current_num as,
-        # its possible that we already have bank journals created (e.g. by the creation of res.partner.bank) 
+        # its possible that we already have bank journals created (e.g. by the creation of res.partner.bank)
         # and the next number for account code might have been already used before for journal
         for num in xrange(current_num, 100):
             # journal_code has a maximal size of 5, hence we can enforce the boundary num < 100