clearcorp team mailing list archive

[Miguel Gutierrez <miguel.gutierrez@xxxxxxxxxxx>]

Miguel Gutierrez has proposed merging lp:~ss-dtic/openerp-ccorp-addons/6.1-openerp-ccorp-addons into lp:openerp-ccorp-addons.

Requested reviews:
  CLEARCORP drivers (clearcorp-drivers)

For more details, see:
https://code.launchpad.net/~ss-dtic/openerp-ccorp-addons/6.1-openerp-ccorp-addons/+merge/143189
-- 
https://code.launchpad.net/~ss-dtic/openerp-ccorp-addons/6.1-openerp-ccorp-addons/+merge/143189
Your team CLEARCORP development team is subscribed to branch lp:openerp-ccorp-addons.

=== modified file 'account_invoice_journal_defaults/account_invoice_journal_defaults.py'
--- account_invoice_journal_defaults/account_invoice_journal_defaults.py	2012-12-05 16:36:50 +0000
+++ account_invoice_journal_defaults/account_invoice_journal_defaults.py	2013-01-14 21:59:20 +0000
@@ -27,21 +27,21 @@
 
 class AccountInvoice(orm.Model):
     _inherit = 'account.invoice'
-    
+
     def onchange_partner_id(self, cr, uid, ids, type, partner_id,\
             date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False):
-        
+
         result = super(AccountInvoice, self).onchange_partner_id(cr, uid, ids, type, partner_id, date_invoice, payment_term, partner_bank_id, company_id)
-        
-        del result['value']['account_id']
-        
+        if 'account_id' in result['value']:
+            del result['value']['account_id']
+
         return result
 
     def onchange_journal_id(self, cr, uid, ids, journal_id=False, context=None):
         result = super(AccountInvoice, self).onchange_journal_id(cr, uid, ids, journal_id, context)
-        
+
         journal = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context)
-        
+
         if journal.type == 'sale':
             acc_id = journal.default_receivable_account_id.id
         elif journal.type == 'purchase':
@@ -50,17 +50,17 @@
             acc_id = journal.default_payable_account_id.id
         elif journal.type == 'purchase_refund':
             acc_id = journal.default_receivable_account_id.id
-            
+
         result['value']['account_id'] = acc_id
-        
+
         return result
-    
+
     def create(self, cr, uid, vals, context=None):
         if 'journal_id' in vals:
             journal_val_id = vals['journal_id']
             journal_id = self.pool.get('account.journal').search(cr,uid,[('id','=',journal_val_id)])
             journal_obj = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context)
-            
+
             for journal in journal_obj:
                 if journal.type == 'sale':
                     acc_id = journal.default_receivable_account_id.id
@@ -70,27 +70,27 @@
                     acc_id = journal.default_payable_account_id.id
                 elif journal.type == 'purchase_refund':
                     acc_id = journal.default_receivable_account_id.id
-                
-                if journal and journal.id:   
+
+                if journal and journal.id:
                     currency_id = journal.currency and journal.currency.id or journal.company_id.currency_id.id
                 else:
                     currency_id = False
-                        
+
             if not 'account_id' in vals:
                 vals['account_id'] = acc_id
-                
+
             if not 'currency_id' in vals:
                 vals['currency_id'] = currency_id
-        
+
         return super(AccountInvoice, self).create(cr, uid, vals, context=context)
-    
+
     def write(self, cr, uid, ids, vals, context=None):
-        
+
         if 'journal_id' in vals:
             journal_val_id = vals['journal_id']
             journal_id = self.pool.get('account.journal').search(cr,uid,[('id','=',journal_val_id)])
             journal_obj = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context)
-        
+
             for journal in journal_obj:
                 if journal.type == 'sale':
                     acc_id = journal.default_receivable_account_id.id
@@ -100,23 +100,23 @@
                     acc_id = journal.default_payable_account_id.id
                 elif journal.type == 'purchase_refund':
                     acc_id = journal.default_receivable_account_id.id
-                
-                if journal and journal.id:  
+
+                if journal and journal.id:
                     currency_id = journal.currency and journal.currency.id or journal.company_id.currency_id.id
                 else:
                     currency_id = False
-            
+
             if not 'account_id' in vals:
                 vals['account_id'] = acc_id
-                
+
             if not 'currency_id' in vals:
                 vals['currency_id'] = currency_id
-        
+
         return super(AccountInvoice, self).write(cr, uid, ids, vals, context=context)
 
 class AccountJournal(orm.Model):
     _inherit = 'account.journal'
-    
+
     _columns = {
         'default_receivable_account_id': fields.many2one('account.account', 'Default Receivable Account', domain="[('type','!=','view')]", help="It acts as a default receivable account"),
         'default_payable_account_id': fields.many2one('account.account', 'Default Payable Account', domain="[('type','!=','view')]", help="It acts as a default payable account"),