Merge lp:~serpent-consulting-services/openerp-usa/openerp-usa-6.1-SerpentCS into lp:openerp-usa/6.1.x

[Serpent Consulting Services]

[Serpent Consulting Services (serpent-consulting-services)]

Thanks for the merge.

=== modified file 'account_payment_ccapi_authdotnet/__init__.py'
--- account_payment_ccapi_authdotnet/__init__.py	2012-08-06 11:40:00 +0000
+++ account_payment_ccapi_authdotnet/__init__.py	2012-08-14 13:27:53 +0000
@@ -19,7 +19,9 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>
 #
 ##############################################################################
+
 import account_voucher
 import cc_auth_api
 import stock_return_picking
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account_payment_ccapi_authdotnet/account_voucher.py'
--- account_payment_ccapi_authdotnet/account_voucher.py	2012-08-06 12:57:20 +0000
+++ account_payment_ccapi_authdotnet/account_voucher.py	2012-08-14 13:27:53 +0000
@@ -27,7 +27,7 @@
     _inherit = 'account.voucher'
     
     _columns = {
-        'origin':fields.char('Origin', size=16, readonly=True)
+        'origin':fields.char('Origin', size=16, readonly=True),
     }
 
 account_voucher()

=== modified file 'account_payment_ccapi_authdotnet/account_voucher.xml'
--- account_payment_ccapi_authdotnet/account_voucher.xml	2012-08-06 11:40:00 +0000
+++ account_payment_ccapi_authdotnet/account_voucher.xml	2012-08-14 13:27:53 +0000
@@ -1,18 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
     <data>
-        <record id="account_voucher_changes_for_credit_card_02_inherit" model="ir.ui.view">
-            <field name="name">account_voucher_changes_for_credit_card_02.inherit</field>
-            <field name="model">account.voucher</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="account_payment_creditcard.account_voucher_changes_for_credit_card_02"/>
-            <field name="arch" type="xml">
-                <xpath expr="//button[@name='authorize']" position="after">
-					<!-- button name="authorize" string="Authorize"  type="object" colspan="2" attrs="{'readonly': [('state','!=','draft') ]  }"/ -->
-				</xpath>
-            </field>
-        </record>
-        
         <record id="view_sale_receipt_form_inherit_id" model="ir.ui.view">
             <field name="name">account.voucher.sale.form.inherit</field>
             <field name="model">account.voucher</field>

=== modified file 'account_payment_ccapi_authdotnet/cc_auth_api.py'
--- account_payment_ccapi_authdotnet/cc_auth_api.py	2012-08-06 13:01:00 +0000
+++ account_payment_ccapi_authdotnet/cc_auth_api.py	2012-08-14 13:27:53 +0000
@@ -22,7 +22,6 @@
 
 
 from osv import osv, fields
-import pooler
 import socket
 import sys
 import urllib
@@ -66,19 +65,20 @@
         return False
 
     def validate_sales_reciept(self, cr, uid, ids, context={}):
+        voucher_obj = self.pool.get('account.voucher')
         if type(ids) == type([]):
-            voucher_objs = self.pool.get('account.voucher').browse(cr, uid, ids, context=context)
+            voucher_objs = voucher_obj.browse(cr, uid, ids, context=context)
         else:
-            voucher_objs = self.pool.get('account.voucher').browse(cr, uid, [ids], context=context)
+            voucher_objs = voucher_obj.browse(cr, uid, [ids], context=context)
         for voucher_obj in voucher_objs:
             rel_sale_order_id = voucher_obj.rel_sale_order_id.id
-            sale_reciepts_ids = self.pool.get('account.voucher').search(cr, uid, [('type', '=', 'sale'), ('rel_sale_order_id', '=', rel_sale_order_id), ('state', 'in', ['draft'])])
+            sale_reciepts_ids = voucher_obj.search(cr, uid, [('type', '=', 'sale'), ('rel_sale_order_id', '=', rel_sale_order_id), ('state', 'in', ['draft'])])
             
             if sale_reciepts_ids:
-                self.pool.get('account.voucher').action_move_line_create(cr, uid, sale_reciepts_ids, context=context)
+                voucher_obj.action_move_line_create(cr, uid, sale_reciepts_ids, context=context)
             else:
                 sale_reciepts_id = self.pool.get('sale.order').create_sales_reciept(cr, uid, [rel_sale_order_id], context=context)
-                self.pool.get('account.voucher').action_move_line_create(cr, uid, [sale_reciepts_id], context=context)
+                voucher_obj.action_move_line_create(cr, uid, [sale_reciepts_id], context=context)
         return True
 
     def _get_prod_deb_acc(self, product_id, journal_obj, context=False):
@@ -90,6 +90,7 @@
             if journal_obj.default_debit_account_id:
                 return journal_obj.default_debit_account_id.id
         return False
+    
     def cancel_sales_reciept(self, cr, uid, ids, context={}):
         voucher_obj = self.pool.get('account.voucher')
         sale_obj = self.browse(cr, uid, ids, context=context)
@@ -144,12 +145,15 @@
         '''
 
         ret = False
+        voucher_obj = self.pool.get('account.voucher')
+        partner_bank_obj = self.pool.get('res.partner.bank')
+        
         wf_service = netsvc.LocalService("workflow")
         if type([]) == type(ids):
-           acc_voucher_obj = pooler.get_pool(cr.dbname).get('account.voucher').browse(cr, uid, ids[0], context={'cc_no':'no_mask'})
+            acc_voucher_obj = voucher_obj.browse(cr, uid, ids[0], context={'cc_no':'no_mask'})
         else:
-            acc_voucher_obj = pooler.get_pool(cr.dbname).get('account.voucher').browse(cr, uid, ids, context={'cc_no':'no_mask'})
-        user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid)
+            acc_voucher_obj = voucher_obj.browse(cr, uid, ids, context={'cc_no':'no_mask'})
+        user = self.pool.get('res.users').browse(cr, uid, uid)
         creditcard = acc_voucher_obj.cc_number#  CREDIT CARD NUMBER
         expiration = acc_voucher_obj.cc_e_d_month + acc_voucher_obj.cc_e_d_year ################ EXPIRATION DATE MM + YY
         total = acc_voucher_obj.cc_order_amt ############## ORDER AMOUNT
@@ -158,8 +162,8 @@
             if not acc_voucher_obj.cc_bank:
                 raise osv.except_osv(_('No Bank selected!'), _("Please select the bank to save credit card details on customer bank details."))
             else:
-                if not pooler.get_pool(cr.dbname).get('res.partner.bank').search(cr, uid, [('cc_number', '=', creditcard), ('partner_id', '=', acc_voucher_obj.partner_id.id)]):
-                    pooler.get_pool(cr.dbname).get('res.partner.bank').create(cr, uid, {'state':'bank',
+                if not partner_bank_obj.search(cr, uid, [('cc_number', '=', creditcard), ('partner_id', '=', acc_voucher_obj.partner_id.id)]):
+                    partner_bank_obj.create(cr, uid, {'state':'bank',
                                                                      'acc_number':'nil',
                                                                      'cc_number':creditcard,
                                                                      'cc_e_d_month':acc_voucher_obj.cc_e_d_month,
@@ -174,18 +178,18 @@
                 raise osv.except_osv(_('No Transaction ID!'), _(" Unable to find transaction id for refund."))
             if not acc_voucher_obj.journal_id.cc_allow_refunds:
                 raise osv.except_osv(_('Unable to do Refund!'), _("Please check \"Allow Credit Card Refunds\" on journal to do refund."))
+        
         elif acc_voucher_obj.cc_p_authorize:
-             x_type = 'AUTH_ONLY'
+            x_type = 'AUTH_ONLY'
 
         elif acc_voucher_obj.cc_charge:
             x_type = 'AUTH_CAPTURE'
         else:
             raise osv.except_osv(_('No "Type of transaction"!'), _("No Transaction type selected. Please select pre-authorize or charge from \"Type of transaction\" section."))
 
+        cvv = None
         if acc_voucher_obj.cc_v:
             cvv = acc_voucher_obj.cc_v
-        else:
-            cvv = None
 
         tax = '0.00'
         
@@ -206,7 +210,7 @@
             #raise AuthnetAIMError('Invalid value for testmode. Must be True or False. "{0}" given.'.format(testmode))
 
         parameters = {}
-        proxy = None;
+        proxy = None
         delimiter = '|'
         results = []
         error = True
@@ -215,16 +219,16 @@
 
         ############ initialize
         parameters = {}
-        parameters = pooler.get_pool(cr.dbname).get('account.voucher').setParameter(parameters, 'x_delim_data', 'true')
-        parameters = pooler.get_pool(cr.dbname).get('account.voucher').setParameter(parameters, 'x_delim_data', 'true')
-        parameters = pooler.get_pool(cr.dbname).get('account.voucher').setParameter(parameters, 'x_delim_char', delimiter)
-        parameters = pooler.get_pool(cr.dbname).get('account.voucher').setParameter(parameters, 'x_relay_response', 'FALSE')
-        parameters = pooler.get_pool(cr.dbname).get('account.voucher').setParameter(parameters, 'x_url', 'FALSE')
-        parameters = pooler.get_pool(cr.dbname).get('account.voucher').setParameter(parameters, 'x_version', '3.1')
-        parameters = pooler.get_pool(cr.dbname).get('account.voucher').setParameter(parameters, 'x_method', 'CC')
-        parameters = pooler.get_pool(cr.dbname).get('account.voucher').setParameter(parameters, 'x_type', x_type)
-        parameters = pooler.get_pool(cr.dbname).get('account.voucher').setParameter(parameters, 'x_login', login)
-        parameters = pooler.get_pool(cr.dbname).get('account.voucher').setParameter(parameters, 'x_tran_key', transkey)
+        parameters = voucher_obj.setParameter(parameters, 'x_delim_data', 'true')
+        parameters = voucher_obj.setParameter(parameters, 'x_delim_data', 'true')
+        parameters = voucher_obj.setParameter(parameters, 'x_delim_char', delimiter)
+        parameters = voucher_obj.setParameter(parameters, 'x_relay_response', 'FALSE')
+        parameters = voucher_obj.setParameter(parameters, 'x_url', 'FALSE')
+        parameters = voucher_obj.setParameter(parameters, 'x_version', '3.1')
+        parameters = voucher_obj.setParameter(parameters, 'x_method', 'CC')
+        parameters = voucher_obj.setParameter(parameters, 'x_type', x_type)
+        parameters = voucher_obj.setParameter(parameters, 'x_login', login)
+        parameters = voucher_obj.setParameter(parameters, 'x_tran_key', transkey)
 
         ########## setTransaction
         if str(creditcard).strip() == '' or creditcard == None:
@@ -238,25 +242,25 @@
 
             #raise AuthnetAIMError('No total amount passed to setTransaction(): {0}').format(total)
 
-        parameters = pooler.get_pool(cr.dbname).get('account.voucher').setParameter(parameters, 'x_card_num', creditcard)
-        parameters = pooler.get_pool(cr.dbname).get('account.voucher').setParameter(parameters, 'x_exp_date', expiration)
-        parameters = pooler.get_pool(cr.dbname).get('account.voucher').setParameter(parameters, 'x_amount', total)
+        parameters = voucher_obj.setParameter(parameters, 'x_card_num', creditcard)
+        parameters = voucher_obj.setParameter(parameters, 'x_exp_date', expiration)
+        parameters = voucher_obj.setParameter(parameters, 'x_amount', total)
         if cvv != None:
-            parameters = pooler.get_pool(cr.dbname).get('account.voucher').setParameter(parameters, 'x_card_code', cvv)
+            parameters = voucher_obj.setParameter(parameters, 'x_card_code', cvv)
         if tax != None:
-            parameters = pooler.get_pool(cr.dbname).get('account.voucher').setParameter(parameters, 'x_tax', tax)
+            parameters = voucher_obj.setParameter(parameters, 'x_tax', tax)
         if invoice != None:
-            parameters = pooler.get_pool(cr.dbname).get('account.voucher').setParameter(parameters, 'x_invoice_num', invoice)
+            parameters = voucher_obj.setParameter(parameters, 'x_invoice_num', invoice)
 
         ##################initialize
-        parameters = pooler.get_pool(cr.dbname).get('account.voucher').setParameter(parameters, 'x_duplicate_window', 180)
-        parameters = acc_voucher_obj.cc_name and pooler.get_pool(cr.dbname).get('account.voucher').setParameter(parameters, 'x_first_name', acc_voucher_obj.cc_name or None) or parameters
-        parameters = acc_voucher_obj.cc_b_addr_1 and pooler.get_pool(cr.dbname).get('account.voucher').setParameter(parameters, 'x_address', acc_voucher_obj.cc_b_addr_1 or None) or parameters
-        parameters = acc_voucher_obj.cc_city and pooler.get_pool(cr.dbname).get('account.voucher').setParameter(parameters, 'x_city', acc_voucher_obj.cc_city or None) or parameters
-        parameters = acc_voucher_obj.cc_state and pooler.get_pool(cr.dbname).get('account.voucher').setParameter(parameters, 'x_state', acc_voucher_obj.cc_state or None) or parameters
-        parameters = acc_voucher_obj.cc_zip and pooler.get_pool(cr.dbname).get('account.voucher').setParameter(parameters, 'x_zip', acc_voucher_obj.cc_zip or None) or parameters
-        parameters = acc_voucher_obj.cc_country and pooler.get_pool(cr.dbname).get('account.voucher').setParameter(parameters, 'x_country', acc_voucher_obj.cc_country or None) or parameters
-        parameters = pooler.get_pool(cr.dbname).get('account.voucher').setParameter(parameters, 'x_customer_ip', socket.gethostbyname(socket.gethostname()))
+        parameters = voucher_obj.setParameter(parameters, 'x_duplicate_window', 180)
+        parameters = acc_voucher_obj.cc_name and voucher_obj.setParameter(parameters, 'x_first_name', acc_voucher_obj.cc_name or None) or parameters
+        parameters = acc_voucher_obj.cc_b_addr_1 and voucher_obj.setParameter(parameters, 'x_address', acc_voucher_obj.cc_b_addr_1 or None) or parameters
+        parameters = acc_voucher_obj.cc_city and voucher_obj.setParameter(parameters, 'x_city', acc_voucher_obj.cc_city or None) or parameters
+        parameters = acc_voucher_obj.cc_state and voucher_obj.setParameter(parameters, 'x_state', acc_voucher_obj.cc_state or None) or parameters
+        parameters = acc_voucher_obj.cc_zip and voucher_obj.setParameter(parameters, 'x_zip', acc_voucher_obj.cc_zip or None) or parameters
+        parameters = acc_voucher_obj.cc_country and voucher_obj.setParameter(parameters, 'x_country', acc_voucher_obj.cc_country or None) or parameters
+        parameters = voucher_obj.setParameter(parameters, 'x_customer_ip', socket.gethostbyname(socket.gethostname()))
 
     #           Actual Processing
 
@@ -283,7 +287,7 @@
                 so_vals = {'cc_pre_auth':True, 'rel_account_voucher_id':acc_voucher_obj.id}
             else:
                 so_vals = {'state':'cc_auth', 'cc_pre_auth':True, 'rel_account_voucher_id':acc_voucher_obj.id}
-            pooler.get_pool(cr.dbname).get('sale.order').write(cr, uid, [acc_voucher_obj.rel_sale_order_id.id], so_vals)
+            self.pool.get('sale.order').write(cr, uid, [acc_voucher_obj.rel_sale_order_id.id], so_vals)
         
         ret_dic = {'cc_auth_code':results[4],
                  'cc_trans_id':results[6]
@@ -291,32 +295,32 @@
         if x_type == 'AUTH_ONLY':
              status = 'Authorization: ' + str(results[3])
              ret_dic['cc_status'] = status
-             pooler.get_pool(cr.dbname).get('account.voucher').write(cr, uid, ids, ret_dic)
+             voucher_obj.write(cr, uid, ids, ret_dic)
+             
         elif x_type == 'AUTH_CAPTURE':
              status = 'Prior Authorization and Capture: ' + str(results[3])
              ret_dic['amount'] = acc_voucher_obj.cc_order_amt
              ret_dic['cc_status'] = status
              ret_dic['cc_transaction'] = True
 
-             pooler.get_pool(cr.dbname).get('account.voucher').write(cr, uid, ids, ret_dic)
+             voucher_obj.write(cr, uid, ids, ret_dic)
              cr.commit()
              if results[0] == '1':
                  '''
-                     Validating sales reciept
+                     Validating sales receipt
                  '''
                  #self.validate_sales_reciept(cr, uid, ids, context=context)
 
                  '''
                      Posting payment voucher
                  '''
-                 pooler.get_pool(cr.dbname).get('account.voucher').action_move_line_create(cr, uid, ids, context)
+                 voucher_obj.action_move_line_create(cr, uid, ids, context)
                  ret = True
+        
         elif x_type == 'CREDIT':
-            print "1" * 10, x_type
             status = 'Refund: ' + str(results[3])
             ret_dic['cc_status'] = status
             if results[0] == '1':
-
                 ret_dic['cc_transaction'] = False
 
                 #Domain : [('type','=','out_refund')]
@@ -336,34 +340,34 @@
                                     'type'      : 'out_refund',
                                     'journal_id': refund_journal_id,
                                     'partner_id': acc_voucher_obj.partner_id.id,
-                                    'shipcharge': context.get('cc_ship_refund'),
-                                    'ship_method_id' : context.get('ship_method_id')
+#                                    'shipcharge': context.get('cc_ship_refund'),
+#                                    'ship_method_id' : context.get('ship_method_id')
                                 }
-                    if context.get('ship_method_id'):
-                        ship_method = self.pool.get('shipping.rate.config').browse(cr, uid, context.get('ship_method_id'), context=context)
-                        inv_vals['sale_account_id'] = ship_method.account_id and ship_method.account_id.id,
+#                    if context.get('ship_method_id'):
+#                        ship_method = self.pool.get('shipping.rate.config').browse(cr, uid, context.get('ship_method_id'), context=context)
+#                        inv_vals['sale_account_id'] = ship_method.account_id and ship_method.account_id.id,
                         
                     inv_vals.update(invoice_obj.onchange_partner_id(cr, uid, [], 'out_refund', acc_voucher_obj.partner_id.id, '', '', '', '')['value'])
                     inv_lines = []
-                    for line in context['cc_refund']:
+                    refund_lines = context.get('cc_refund',[])
+                    for line in refund_lines:
                         
                         inv_line_vals = {
                                             'quantity'   : line['qty'],
                                             'product_id'    : line['product_id'],
-                                         }
+                        }
                         
                         onchage_vals = invoice_line_obj.product_id_change(cr, uid, [], line['product_id'], False, line['qty'], '', 'out_refund', inv_vals['partner_id'], False , inv_vals['address_invoice_id'] , False, False, {})['value']
                         onchage_vals['price_unit'] = line['price_unit']
                         inv_line_vals.update(onchage_vals)
                         
                         inv_lines.append((0, 0, inv_line_vals))
-                    inv_vals['abstract_line_ids'] = inv_lines
-                    
-                    print "Creating with val : ", inv_vals
+                    
+                    inv_vals['invoice_line'] = inv_lines
+                    
                     invoice_id = invoice_obj.create(cr, uid, inv_vals, context=context)
                     wf_service.trg_validate(uid, 'account.invoice', invoice_id, 'invoice_open', cr)
                     
-                    print "Created refund invoice and validated ", invoice_id
 #                ret = True
 #                voucher_obj = self.pool.get('account.voucher')
 #                
@@ -458,12 +462,10 @@
 #                if not refund_voucher:      
 #                    wf_service = netsvc.LocalService('workflow')
 #                    wf_service.trg_validate(uid, 'account.voucher', voucher_id, 'proforma_voucher', cr)
-
-
                 
             else:
                 ret_dic['cc_transaction'] = True
-            pooler.get_pool(cr.dbname).get('account.voucher').write(cr, uid, ids, ret_dic)
+            voucher_obj.write(cr, uid, ids, ret_dic)
         else:
             status = ''
 
@@ -480,7 +482,11 @@
     '''
 
     def authorize(self, cr, uid, ids, context=None):
-        return self.pool.get('auth.net.cc.api').do_this_transaction(cr, uid, ids, refund=False, context=context)
+        res = self.pool.get('auth.net.cc.api').do_this_transaction(cr, uid, ids, refund=False, context=context)
+        if res:
+            wf_service = netsvc.LocalService("workflow")
+            wf_service.trg_validate(uid, 'account.voucher', ids[0], 'proforma_voucher', cr)
+        return True
     
     def cc_refund(self, cr, uid, ids, context=None):
         return self.pool.get('auth.net.cc.api').do_this_transaction(cr, uid, ids, refund=True, context=context)
@@ -522,7 +528,6 @@
                 cr_ids['partner_id'] = sale_obj.partner_id.id
                 cr_ids['name'] = 'Shipping Charge for %s' % sale_line.name
                 cr_ids_list.append(cr_ids.copy())
-                
 
         else:
             vals['journal_id'] = False

=== modified file 'account_payment_ccapi_authdotnet/stock_return_picking.py'
--- account_payment_ccapi_authdotnet/stock_return_picking.py	2012-08-06 11:40:00 +0000
+++ account_payment_ccapi_authdotnet/stock_return_picking.py	2012-08-14 13:27:53 +0000
@@ -19,17 +19,18 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>
 #
 ##############################################################################
-import netsvc
 import time
 
-from osv import osv,fields
+from osv import osv, fields
 from tools.translate import _
 
-
 class stock_return_picking(osv.osv_memory):
     _inherit = 'stock.return.picking'
-    _description = 'Return Picking'
-    _columns = { 'cc_ship_refund' : fields.boolean(string='Refund Shipcharge', required=True) }
+    _columns = { 
+        'cc_ship_refund' : fields.boolean(string='Refund Shipcharge', required=True),
+        'invoice_state': fields.selection([('2binvoiced', 'To be refunded/invoiced'), ('none', 'No invoicing'),('cc_refund','Credit Card Refund')], 'Invoicing',required=True),
+    }
+    
     def default_get(self, cr, uid, fields, context=None):
         """
          To get default values for the object.
@@ -52,83 +53,6 @@
                     res['invoice_state'] = 'cc_refund'
         return res
 
-    def view_init(self, cr, uid, fields_list, context=None):
-        """
-         Creates view dynamically and adding fields at runtime.
-         @param self: The object pointer.
-         @param cr: A database cursor
-         @param uid: ID of the user currently logged in
-         @param context: A standard dictionary
-         @return: New arch of view with new columns.
-        """
-
-        if context is None:
-            context = {}
-        res = super(stock_return_picking, self).view_init(cr, uid, fields_list, context=context)
-        record_id = context and context.get('active_id', False)
-        if record_id:
-            pick_obj = self.pool.get('stock.picking')
-            pick = pick_obj.browse(cr, uid, record_id, context=context)
-            if 'invoice_state' in self._columns and pick.cc_pre_auth:
-                invoice_state_vals = [('2binvoiced', _('To be refunded/invoiced')), ('none', _('No invoicing')), ('cc_refund','Credit Card Refund')]
-                self._columns['invoice_state'] = fields.selection(invoice_state_vals, string='Invoicing', required=True)
-                
-               # if pick.sale_id and pick.sale_id.shipcharge and  not pick.sale_id.cc_ship_refund :
-               #     self._columns['cc_ship_refund'] =  fields.boolean(string='Refund Shipcharge', required=True),
-
-        return res
-
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        """
-         Changes the view dynamically
-         @param self: The object pointer.
-         @param cr: A database cursor
-         @param uid: ID of the user currently logged in
-         @param context: A standard dictionary
-         @return: New arch of view.
-        """
-        res = super(stock_return_picking, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
-        record_id = context and context.get('active_id', False)
-        active_model = context.get('active_model')
-        if  active_model != 'stock.picking':
-            return res
-        if record_id:
-            pick_obj = self.pool.get('stock.picking')
-            pick = pick_obj.browse(cr, uid, record_id)
-            return_history = {}
-            res['fields'].clear()
-            arch_lst=['<?xml version="1.0"?>', '<form string="%s">' % _('Return lines'), '<label string="%s" colspan="4"/>' % _('Provide the quantities of the returned products.')]
-            for m in pick.move_lines:
-                return_history[m.id] = 0
-
-                #print m.move_history_ids2
-
-                for rec in m.move_history_ids2:
-                    if m.id != rec.id:
-                        return_history[m.id] += rec.product_qty
-                quantity = m.product_qty
-                if m.state=='done' and quantity > return_history[m.id]:
-                    arch_lst.append('<field name="return%s"/>\n<newline/>' % (m.id,))
-                    res['fields']['return%s' % m.id]={'string':m.name, 'type':'float', 'required':True}
-                    res.setdefault('returns', []).append(m.id)
-                    #print "1" * 10,  res
-            arch_lst.append('<field name="invoice_state"/>\n<newline/>')
-            invoice_state_vals = [('2binvoiced', _('To be refunded/invoiced')), ('none', _('No invoicing'))]
-            if pick.cc_pre_auth:
-                invoice_state_vals.append(('cc_refund','Credit Card Refund'))
-                if pick.sale_id and pick.sale_id.shipcharge  and not pick.sale_id.cc_ship_refund :
-                    res['fields']['cc_ship_refund'] = {'string':'Refund Shipcharge','type':'boolean'}
-                    arch_lst.append('<field name="cc_ship_refund"/>\n<newline/>')
-            res['fields']['invoice_state']={'string':_('Invoicing'), 'type':'selection','required':True, 'selection':invoice_state_vals}
-            arch_lst.append('<group col="2" colspan="4">')
-            arch_lst.append('<button icon="gtk-cancel" special="cancel" string="Cancel" />')
-            arch_lst.append('<button name="create_returns" string="Return" colspan="1" type="object" icon="gtk-apply" />')
-            arch_lst.append('</group>')
-            arch_lst.append('</form>')
-            res['arch'] = '\n'.join(arch_lst)
-        return res
-
-    
     def create_returns(self, cr, uid, ids, context=None):
         """ 
          Creates return picking.
@@ -140,31 +64,31 @@
          @return: A dictionary which of fields with values.
         """
         if context is None:
-            context = {} 
+            context = {}
+        
+        res = super(stock_return_picking, self).create_returns(cr, uid, ids, context)
+        
         record_id = context and context.get('active_id', False) or False
         move_obj = self.pool.get('stock.move')
         pick_obj = self.pool.get('stock.picking')
-        uom_obj = self.pool.get('product.uom')
-        seq_obj = self.pool.get('ir.sequence')
-        loc_obj = self.pool.get('stock.location')
-        warehouse_obj = self.pool.get('stock.warehouse')
-
-        wf_service = netsvc.LocalService("workflow")
-
+        data_obj = self.pool.get('stock.return.picking.memory')
+        voucher_obj = self.pool.get('account.voucher')
         pick = pick_obj.browse(cr, uid, record_id, context=context)
-        data = self.read(cr, uid, ids[0])
-
-        res =  super(stock_return_picking, self).create_returns( cr, uid, ids, context)
-
-        ctx=[]
-
+        data = self.read(cr, uid, ids[0], context=context)
+        new_picking = None
+
+        vch_lines = []
+        move_lines = data['product_return_moves']
         #@ Moving the refund process to On Delivery process of related incoming shipment
         if data['invoice_state'] == 'cc_refund':
-            amount=0.00
-            for move in pick.move_lines:
-                new_qty = data['return%s' % move.id]
+            amount = 0.00
+            for move in move_lines:
+                return_line = data_obj.browse(cr, uid, move, context=context)
+                mov_id = return_line.move_id.id
+                new_qty = return_line.quantity
+                move = move_obj.browse(cr, uid, mov_id, context=context)
                 amount = amount + new_qty * move.product_id.list_price
-                line ={}
+                line = {}
                 line['product_id'] = move.product_id.id
                 line['qty'] = new_qty
                 line['price_unit'] = move.product_id.list_price
@@ -173,60 +97,39 @@
                         if sale_line.product_id and sale_line.product_id.id == move.product_id.id:
                              line['price_unit'] = sale_line.price_unit
                              break
+                vch_lines.append(line)
 
-                ctx.append(line)
-            if pick.sale_id and pick.sale_id.shipcharge and  data.get('cc_ship_refund') and not pick.sale_id.cc_ship_refund :
-                amount=amount+pick.sale_id.shipcharge
-                context['cc_ship_refund'] = pick.sale_id.shipcharge
-                context['ship_method_id'] = pick.sale_id.ship_method_id and pick.sale_id.ship_method_id.id or False
             if amount:
-                voucher_obj = self.pool.get('account.voucher')
-                voucher_ids = voucher_obj.search(cr,uid,[('rel_sale_order_id','=', pick.sale_id.id),('state','=','posted'),('type','=','receipt'),('cc_charge','=',True)], order="id desc",context=context)
+                voucher_ids = voucher_obj.search(cr, uid, [('rel_sale_order_id', '=', pick.sale_id.id), ('state', '=', 'posted'), ('type', '=', 'receipt'), ('cc_charge', '=', True)], order="id desc", context=context)
                 if voucher_ids:
-                    voucher_obj.write(cr, uid, [voucher_ids[0]], {'cc_order_amt':amount}, context )
-                    context['cc_refund'] = ctx
+                    voucher_obj.write(cr, uid, [voucher_ids[0]], {'cc_order_amt':amount}, context=context)
+                    context['cc_refund'] = vch_lines
                     
-                    #self.pool.get('auth.net.cc.api').do_this_transaction(cr, uid, [voucher_ids[0]] , refund=True, context=context)
+#                    self.pool.get('auth.net.cc.api').do_this_transaction(cr, uid, [voucher_ids[0]] , refund=True, context=context)
                     #voucher = voucher_obj.browse(cr, uid, voucher_ids[0] , context)
 
                     #@ Get picking id and write voucher_id
                     domain = res.get('domain') and eval(res['domain'])
                     new_pick_id = False
-                    if domain and len(domain) and len(domain[0])==3:
+                    if domain and len(domain) and len(domain[0]) == 3:
                         new_pick_id = domain[0][2][0]
                     if new_pick_id:
-                        self.pool.get('stock.picking').write(cr, uid, new_pick_id , {'voucher_id':voucher_ids[0]},context=context )
-
+                        self.pool.get('stock.picking').write(cr, uid, new_pick_id, {'voucher_id':voucher_ids[0]}, context=context)
         return res
 
-
 stock_return_picking()
 
 class stock_picking(osv.osv):
     _inherit = "stock.picking"
     _columns = {
-            
-        'invoice_state': fields.selection([
-            ("invoiced", "Invoiced"),
-            ("2binvoiced", "To Be Invoiced"),
-            ("none", "Not Applicable"),
-            ("credit_card", "Credit Card"),
-            ("cc_refund", "Credit Card Refund")
-            ], "Invoice Control",  select=True, required=True, readonly=True, states={'draft': [('readonly', False)]}),
-         'voucher_id' : fields.many2one('account.voucher','Refund Voucher', readonly=True)
-
-        }
+         'voucher_id' : fields.many2one('account.voucher', 'Refund Voucher', readonly=True)
+    }
 
     def do_partial(self, cr, uid, ids, partial_datas, context=None):
         res = super(stock_picking, self).do_partial(cr, uid, ids, partial_datas, context=context)
         for pick in self.pool.get('stock.picking').browse(cr, uid, ids, context=context):
-            if pick.state =='done' and pick.invoice_state=='cc_refund' and pick.voucher_id:
+            if pick.state == 'done' and pick.invoice_state == 'cc_refund' and pick.voucher_id:
                 self.pool.get('auth.net.cc.api').do_this_transaction(cr, uid, [pick.voucher_id.id] , refund=True, context=context)
         return res
-#    def _get_invoice_type(self, pick):
-#        
-#        if pick.sale_id and pick.sale_id.order_policy=='credit_card':
-#            return 'credit_card'
-#        return super(stock_picking, self)._get_invoice_type(pick)
 stock_picking()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account_payment_ccapi_authdotnet/stock_view.xml'
--- account_payment_ccapi_authdotnet/stock_view.xml	2012-08-06 11:40:00 +0000
+++ account_payment_ccapi_authdotnet/stock_view.xml	2012-08-14 13:27:53 +0000
@@ -8,7 +8,7 @@
 			<field name="inherit_id" ref="stock.view_picking_form" />
 			<field name="arch" type="xml">
 				<xpath expr="//button[@name=%(stock.action_stock_invoice_onshipping)d]" position="replace">
-					<button name="%(stock.action_stock_invoice_onshipping)d" string="Create Invoice"  attrs="{'invisible': ['|',('state','&lt;&gt;','done'),('invoice_state','=',[invoiced','none','cc_refund','credit_card']}"  type="action" icon="terp-gtk-go-back-rtl" />
+					<button name="%(stock.action_stock_invoice_onshipping)d" string="Create Invoice"  attrs="{'invisible': ['|',('state','&lt;&gt;','done'),('invoice_state','=',['invoiced','none','cc_refund','credit_card'])]}"  type="action" icon="terp-gtk-go-back-rtl" />
 				</xpath>
 			</field>
 		</record>
@@ -20,7 +20,7 @@
 			<field name="inherit_id" ref="stock.view_picking_out_form" />
 			<field name="arch" type="xml">
 				<xpath expr="//button[@name=%(stock.action_stock_invoice_onshipping)d]" position="replace">
-					<button name="%(stock.action_stock_invoice_onshipping)d" string="Create Invoice"  attrs="{'invisible': ['|',('state','&lt;&gt;','done'),('invoice_state','=',['invoiced','none','cc_refund','credit_card']}"  type="action" icon="terp-gtk-go-back-rtl" />
+					<button name="%(stock.action_stock_invoice_onshipping)d" string="Create Invoice"  attrs="{'invisible': ['|',('state','&lt;&gt;','done'),('invoice_state','=',['invoiced','none','cc_refund','credit_card'])]}"  type="action" icon="terp-gtk-go-back-rtl" />
 				</xpath>
 			</field>
 		</record>

=== modified file 'account_payment_creditcard/account_voucher.py'
--- account_payment_creditcard/account_voucher.py	2012-08-06 13:48:04 +0000
+++ account_payment_creditcard/account_voucher.py	2012-08-14 13:27:53 +0000
@@ -67,7 +67,7 @@
         return False
 
     def cc_refund(self, cr, uid, ids, context=None):
-        self.do_transaction(cr, uid, ids, refund=True,context=context)
+#        self.do_transaction(cr, uid, ids, refund=True,context=context)
         return True
 
     def _get_zip(self, cr, uid, ids, zip_id, context={}):
@@ -222,8 +222,8 @@
         'cc_auth_code':fields.char('Authorization Code', size=32),
         'cc_save_card_details':fields.boolean('Save Credit Card details'),
         'cc_ecommerce_sale':fields.boolean('Ecommerce sale'),
-        'cc_p_authorize':fields.boolean('pre-authorize'),
-        'cc_charge':fields.boolean('charge'),
+        'cc_p_authorize':fields.boolean('Pre-authorize'),
+        'cc_charge':fields.boolean('Charge'),
         'cc_info_hide':fields.boolean('Credit Info Hide'),
         'cc_status':fields.text('Status Message'),
         'cc_details_autofill':fields.boolean('Credit Card Details Auto Fill'),
@@ -240,7 +240,6 @@
         'cc_p_authorize': lambda * a: True,
     }
 
-
     def onchange_cc_details(self, cr, uid, ids, cc_details, context={}):
         dic = {}
         if cc_details:
@@ -250,7 +249,7 @@
             dic['cc_e_d_year'] = bank.cc_e_d_year
             dic['cc_number'] = bank.cc_number
             dic['cc_v'] = bank.cc_v
-        return{'value':dic}
+        return {'value':dic}
 
     def onchange_partner_id(self, cr, uid, ids, partner_id, journal_id, price, currency_id, ttype, date, context={}, sale_id=False):
         res = super(account_voucher, self).onchange_partner_id(cr, uid, ids, partner_id, journal_id, price, currency_id, ttype, date, context=context)

=== modified file 'account_payment_creditcard/account_voucher_view.xml'
--- account_payment_creditcard/account_voucher_view.xml	2012-08-06 13:48:04 +0000
+++ account_payment_creditcard/account_voucher_view.xml	2012-08-14 13:27:53 +0000
@@ -7,13 +7,6 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account_voucher.view_vendor_receipt_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='journal_id']" position="replace">
-                     <field name="journal_id"
-                            domain="[('type','in',['bank', 'cash'])]"
-                            widget="selection" select="1"
-                            on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, {}, rel_sale_order_id)"
-                            string="Payment Method" />
-				</xpath>
 				<xpath expr="//field[@name='partner_id']" position='attributes'>
                 	<attribute name='on_change'>onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, {}, rel_sale_order_id )</attribute>
 				</xpath>

=== modified file 'account_payment_creditcard/sale.py'
--- account_payment_creditcard/sale.py	2012-08-06 11:40:00 +0000
+++ account_payment_creditcard/sale.py	2012-08-14 13:27:53 +0000
@@ -84,6 +84,8 @@
                 'default_type':'receipt',
                 'default_journal_id':user.company_id.cc_journal_id and user.company_id.cc_journal_id.id or False,
                 'default_invoice_id':invoice_id,
+                'type': 'receipt',
+                'sale_id':ids[0]
                 }
         }
 
@@ -206,7 +208,8 @@
     _defaults = {
                   'cc_ship_refund': lambda * a : False,
                   'payment_method': lambda * a: 'cc_pre_auth'
-                  }
+    }
+    
     def action_ship_create(self, cr, uid, ids, *args):
         ret = super(sale_order, self).action_ship_create(cr, uid, ids, args)
         for sale_obj in self.browse(cr, uid, ids, context={}):

=== modified file 'account_payment_creditcard/stock_picking.py'
--- account_payment_creditcard/stock_picking.py	2012-08-06 11:40:00 +0000
+++ account_payment_creditcard/stock_picking.py	2012-08-14 13:27:53 +0000
@@ -27,7 +27,7 @@
 
     _inherit = "stock.picking"
     '''
-    Adding credit card preautohrised and payed check box on delivery order
+    Adding credit card preauthorised and payed check box on delivery order
     '''
     def _get_sale_order(self, cr, uid, ids, context={}):
         result = []
@@ -44,6 +44,13 @@
     _columns = {
         'cc_pre_auth':  fields.related('sale_id', 'cc_pre_auth', string='CC Pre-authorised', type='boolean'),
         'invoiced':  fields.related('sale_id', 'invoiced', string='Paid', type='boolean'),
+        'invoice_state': fields.selection([
+            ("invoiced", "Invoiced"),
+            ("2binvoiced", "To Be Invoiced"),
+            ("none", "Not Applicable"),
+            ("credit_card", "Credit Card"),
+            ("cc_refund", "Credit Card Refund")
+            ], "Invoice Control",  select=True, required=True, readonly=True, states={'draft': [('readonly', False)]}),
     }
 
 stock_picking()

=== modified file 'account_voucher_credits_us/__openerp__.py'
--- account_voucher_credits_us/__openerp__.py	2012-08-06 13:01:00 +0000
+++ account_voucher_credits_us/__openerp__.py	2012-08-14 13:27:53 +0000
@@ -30,7 +30,7 @@
     """,
     "category": "US Localisation/Account",
     "website": "http://www.novapointgroup.com/",
-    "depends": ["account_voucher", "account_payment_creditcard"],
+    "depends": ["account_payment_creditcard"],
     "init_xml": [],
     "demo_xml": [],
     "update_xml": [

=== modified file 'account_voucher_credits_us/voucher.py'
--- account_voucher_credits_us/voucher.py	2012-08-06 11:40:00 +0000
+++ account_voucher_credits_us/voucher.py	2012-08-14 13:27:53 +0000
@@ -45,8 +45,8 @@
         else:
             return
         indices[i] += 1
-        for j in range(i+1, r):
-            indices[j] = indices[j-1] + 1
+        for j in range(i + 1, r):
+            indices[j] = indices[j - 1] + 1
         yield tuple(pool[i] for i in indices)
 
 
@@ -77,7 +77,7 @@
 
     _columns = {
         'amount_unreconciled': fields.function(_unreconciled, method=True, string='Unreconciled Amount'),
-        }
+    }
     
 account_move_line()
 
@@ -130,7 +130,7 @@
                 else:
                     line.write({'amount': 0.0, 'pay': False}, context=context)
             return True
-        if use_discount and total_amount > amount and  (total_amount - amount ) <= total_discount_available: #It is possible to match using Discount
+        if use_discount and total_amount > amount and  (total_amount - amount) <= total_discount_available: #It is possible to match using Discount
 #            Unchecking all the lines other than matched line and uncheck all discount lines
             line_ids = self.read(cr, uid, lines[0].voucher_id.id, ['line_ids'], context=context)['line_ids']
             self.pool.get('account.voucher.line').write(cr, uid, line_ids, {'pay': False}, context=context)
@@ -147,7 +147,7 @@
                 line.write({'amount': line.amount_unreconciled - line.credit_used - line.discount_used - line.writeoff_amount, 'pay': True }, context=context)
             return True
         if len(lines) > 1:
-            for combination in _combinations(lines, len(lines)-1):
+            for combination in _combinations(lines, len(lines) - 1):
                 if self._find_exact_match(cr, uid, combination, amount, mark_pay=mark_pay, use_discount=use_discount, context=context):
                     return True
         return False
@@ -198,7 +198,7 @@
     _columns = {
         'number': fields.related('move_id', 'name', type="char", readonly=True, string='Number'),
         'auto_match': fields.boolean('Use Automatic Matching')
-        }
+    }
 
     def onchange_partner_id(self, cr, uid, ids, partner_id, journal_id, price, currency_id, ttype, date, context={}, sale_id=False):
         """price
@@ -238,11 +238,9 @@
         if date:
             context_multi_currency.update({'date': date})
 
-    
-
         if not partner_id:
             return default
-
+        line_ids = []
         if not partner_id and ids:
             line_ids = line_pool.search(cr, uid, [('voucher_id', '=', ids[0])], context=context)
             if line_ids:
@@ -281,12 +279,13 @@
             partner_ids = partner_pool.search(cr, uid, [('parent_id', 'child_of', [partner_id])], context=context)
         else:
             partner_ids = [partner_id]
-        ids = move_line_pool.search(cr, uid, [('account_id.type', '=', account_type), ('reconcile_id', '=', False), ('partner_id', 'in', partner_ids)], 
+        ids = move_line_pool.search(cr, uid, [('account_id.type', '=', account_type), ('reconcile_id', '=', False), ('partner_id', 'in', partner_ids)],
                                     context=context)
         ids.reverse()
         moves = move_line_pool.browse(cr, uid, ids, context=context)
 
         company_currency = journal.company_id.currency_id.id
+        company_id = journal.company_id.id
         if company_currency != currency_id and ttype == 'payment':
             total_debit = currency_pool.compute(cr, uid, currency_id, company_currency, total_debit, context=context_multi_currency)
         elif company_currency != currency_id and ttype == 'receipt':
@@ -301,7 +300,7 @@
             total_debit += line.debit or 0.0
 
         for line in moves:
-            if line.reconcile_partial_id and ttype=='receipt' and line.debit:
+            if line.reconcile_partial_id and ttype == 'receipt' and line.debit:
                 continue
             if line.credit and line.reconcile_partial_id and ttype == 'receipt':
                 continue
@@ -354,7 +353,7 @@
             
             total = reduce(lambda y, t: (t.debit or 0.0) - (t.credit or 0.0) + y, r.line_partial_ids, 0.0)
              
-            original_amount =  line.credit
+            original_amount = line.credit
             amnt_org = currency_pool.compute(cr, uid, company_currency, currency_id, original_amount, context=context_multi_currency)
             amnt_unr = currency_pool.compute(cr, uid, company_currency, currency_id, line.amount_unreconciled, context=context_multi_currency)
             rs = {
@@ -368,9 +367,11 @@
                 'amount_unreconciled': amnt_unr,
                 'amount': amnt_org - amnt_unr
                 }
-            vals = self.onchange_journal(cr, uid, ids, journal_id, line_ids, tax_id, partner_id, time.strftime('%Y-%m-%d'), price, ttype, company_id, context)
-            vals = vals.get('value')
-            currency_id = vals.get('currency_id', currency_id)
+            if context.get('default_invoice_id'):
+                rs['invoice_id'] = context.get('default_invoice_id',False)
+#            vals = self.onchange_journal(cr, uid, ids, journal_id, line_ids, False, partner_id, time.strftime('%Y-%m-%d'), price, ttype, company_id, context)
+#            vals = vals.get('value')
+#            currency_id = vals.get('currency_id', currency_id)
             
             amount = currency_pool.compute(cr, uid, company_currency, currency_id, original_amount, context=context_multi_currency)
             rs['amount'] = amount
@@ -383,8 +384,6 @@
             reconcile_ids.append(line.reconcile_partial_id.id)
             
             default['value']['pre_line'] = 1
-            
-
         
         for credit_line in default['value']['line_dr_ids']:
             credit_line['amount'] = credit_line['amount_original'] - credit_line['amount_unreconciled']
@@ -392,6 +391,40 @@
             invoice_line['amount'] = 0.0
             invoice_line['amount_difference'] = invoice_line['amount_unreconciled']
 
+        cardholder_details = self._get_cardholder_details(cr, uid, ids, partner_id, context=context)
+        if journal_id and cardholder_details:
+            jorurnal_cc_allow = self.pool.get('account.journal').read(cr, uid, journal_id, ['cc_allow_processing'])['cc_allow_processing']
+            default['value']['cc_name'] = cardholder_details['name']
+            default['value']['cc_b_addr_1'] = cardholder_details['street']
+            default['value']['cc_b_addr_2'] = cardholder_details['street2']
+            default['value']['cc_city'] = cardholder_details['city']
+            default['value']['cc_country'] = cardholder_details['country']
+            default['value']['cc_zip'] = cardholder_details['zip']
+            default['value']['cc_state'] = cardholder_details['state']
+            default['value']['cc_reseller'] = cardholder_details['title'] == 'Reseller' and True or False
+            default['value']['cc_save_card_details'] = False
+        if jorurnal_cc_allow:
+            default['value']['cc_info_hide'] = False
+        else:
+            default['value']['cc_info_hide'] = True
+        
+        if not sale_id:
+            sale_id = context.get('sale_id')
+            
+        if sale_id and default['value'].get('line_cr_ids') :
+            sale = self.pool.get('sale.order').browse(cr, uid, sale_id, context=context)
+            lines = []
+            for line in default['value']['line_cr_ids']:
+                for invoice in sale.invoice_ids:
+                    if not (line.get('invoice_id') and line.get('invoice_id') and line['invoice_id'] == invoice.id):
+                        line['pay'] = False
+                    else:
+                        line['pay'] = True
+                        line['amount'] = line['amount_original']
+                    
+                lines.append(line)
+            default['value']['line_cr_ids'] = lines
+
         return default
 
     def calc_cash_discount(self, vch, line, amount=0):
@@ -470,7 +503,7 @@
                 'currency_id': vch.currency_id.id,
                 'amount_currency': vch.amount,
                 'date': vch.date,
-                'date_maturity': vch.date_due
+                'date_maturity': vch.date_due,
                 }
 
             if (debit == 0.0 or credit == 0.0 or debit + credit > 0) and (debit > 0.0 or credit > 0.0):
@@ -513,7 +546,8 @@
                     'quantity': 1,
                     'credit': 0.0,
                     'debit': 0.0,
-                    'date': vch.date
+                    'date': vch.date,
+                    'invoice_id':line.invoice_id.id or False
                     }
                 if line.invoice_id:
                     move_line['partner_id'] = line.invoice_id.partner_id.id
@@ -546,7 +580,7 @@
 
                 if line.invoice_id.id:
                     invoice = self.pool.get('account.invoice').browse(cr, uid, line.invoice_id.id, context=context)
-                    types = {'out_invoice': -1, 'in_invoice': 1, 'out_refund': 1, 'in_refund': -1}
+                    types = {'out_invoice':-1, 'in_invoice': 1, 'out_refund': 1, 'in_refund':-1}
                     direction = types[invoice.type]
 
 #                Post Discount Lines for supplier
@@ -561,7 +595,7 @@
                                 'debit': direction * available_discounts.discount_amount > 0 and direction * available_discounts.discount_amount,
                                 'credit': direction * available_discounts.discount_amount < 0 and - direction * available_discounts.discount_amount,
                                 'account_id': line.account_id.id,
-                                'partner_id': line.move_line_id.partner_id.id, 
+                                'partner_id': line.move_line_id.partner_id.id,
                                 'move_id': move_id,
                                 'ref': 'Cash Discount',
                                 'name': line.name or '/',
@@ -569,6 +603,7 @@
                                 'currency_id': vch.currency_id.id,
                                 'amount_currency': available_discounts.discount_amount and - direction * available_discounts.discount_amount or 0.0,
                                 'company_id': line.company_id.id,
+                                'invoice_id':line.invoice_id.id or False
                                 }
                             l2 = {
                                 'journal_id': vch.journal_id.id,
@@ -584,11 +619,12 @@
                                 'currency_id': vch.currency_id.id,
                                 'amount_currency': available_discounts.discount_amount and - direction * available_discounts.discount_amount or 0.0,
                                 'company_id': line.company_id.id,
+                                'invoice_id':line.invoice_id.id or False
                                 }
                             name = invoice.number
                             l1['name'] = name
                             l2['name'] = name
-                            move_lines = [l1,l2]
+                            move_lines = [l1, l2]
                             for move_line in move_lines:
                                 master_line = move_line_pool.create(cr, uid, move_line, context=context)
                                 if line.move_line_id.id and move_line['account_id'] == line.move_line_id.account_id.id:
@@ -613,6 +649,7 @@
                                 'currency_id': vch.currency_id.id,
                                 'amount_currency': available_discounts.discount_amount and - direction * available_discounts.discount_amount or 0.0,
                                 'company_id': line.company_id.id,
+                                'invoice_id':line.invoice_id.id or False
                                 }
                             l2 = {
                                 'journal_id': vch.journal_id.id,
@@ -628,6 +665,7 @@
                                 'currency_id': vch.currency_id.id,
                                 'amount_currency': available_discounts.discount_amount and - direction * available_discounts.discount_amount or 0.0,
                                 'company_id': line.company_id.id,
+                                'invoice_id':line.invoice_id.id or False
                                 }
                             name = invoice.number
                             l1['name'] = name
@@ -647,7 +685,7 @@
                             'debit': direction * writeoff.writeoff_amount > 0 and direction * writeoff.writeoff_amount,
                             'credit': direction * writeoff.writeoff_amount < 0 and - direction * writeoff.writeoff_amount,
                             'account_id': line.account_id.id,
-                            'partner_id': line.move_line_id.partner_id.id, 
+                            'partner_id': line.move_line_id.partner_id.id,
                             'move_id': move_id,
                             'ref': 'Writeoff',
                             'name': line.name or '/',
@@ -655,6 +693,7 @@
                             'currency_id': vch.currency_id.id,
                             'amount_currency': writeoff.writeoff_amount and - direction * writeoff.writeoff_amount or 0.0,
                             'company_id': line.company_id.id,
+                            'invoice_id':line.invoice_id.id or False
                             }
                         l2 = {
                             'journal_id': vch.journal_id.id,
@@ -670,6 +709,7 @@
                             'currency_id': vch.currency_id.id,
                             'amount_currency': writeoff.writeoff_amount and - direction * writeoff.writeoff_amount or 0.0,
                             'company_id': line.company_id.id,
+                            'invoice_id':line.invoice_id.id or False
                             }
                         name = invoice.number
                         l1['name'] = name
@@ -695,6 +735,7 @@
                     'credit': 0.00,
                     'debit': total_discount,
                     'currency_id': vch.currency_id.id,
+                    'invoice_id':line.invoice_id.id or False
                     }
                 
                 move_line_credit_id = move_line_pool.create(cr, uid, move_line, context=contexts)
@@ -708,8 +749,9 @@
                     'partner_id': vch.partner_id.id,
                     'date': vch.date,
                     'credit': diff > 0 and diff or 0.0,
-                    'debit': diff < 0 and -diff or 0.0,
+                    'debit': diff < 0 and - diff or 0.0,
                     'currency_id': vch.currency_id.id,
+                    'invoice_id':line.invoice_id.id or False
                    }
                 account_id = False
                 if vch.type in ('sale', 'receipt'):
@@ -752,8 +794,8 @@
                 if len(rec_ids) >= 2:
                     move_line_pool.reconcile_partial(cr, uid, rec_ids)
             
-            move_line_ids = move_line_pool.search(cr, uid, [('account_id', '=', vch.partner_id.property_account_receivable.id ), 
-                                                            ('partner_id', '=', vch.partner_id.id), ('reconcile_id', '=', False), 
+            move_line_ids = move_line_pool.search(cr, uid, [('account_id', '=', vch.partner_id.property_account_receivable.id),
+                                                            ('partner_id', '=', vch.partner_id.id), ('reconcile_id', '=', False),
                                                             ('move_id', '=', move_id), ('debit', '>', 0.00)], context=context)
             move_lines2 = []
             for credit_line in  vch.line_cr_ids:
@@ -762,7 +804,7 @@
                         if available_credit.use_credit and available_credit.discount_amount and available_credit.inv_credit:
                             move_lines2.append(available_credit.inv_credit.id)             
             if vch.type == 'receipt':
-                move_line_ids  = list(set(move_line_ids + move_lines2))
+                move_line_ids = list(set(move_line_ids + move_lines2))
                 if move_line_ids:
                     debit = 0.00
                     credit = 0.00
@@ -778,8 +820,8 @@
                         except Exception:
                             pass
                 move_line_ids = move_line_pool.search(cr, uid, [
-                                                                ('account_id', '=', vch.partner_id.property_account_receivable.id ),
-                                                                ('partner_id', '=', vch.partner_id.id), 
+                                                                ('account_id', '=', vch.partner_id.property_account_receivable.id),
+                                                                ('partner_id', '=', vch.partner_id.id),
                                                                 ('reconcile_id', '=', False)
                                                                 ], context=context)
                 if move_line_ids:
@@ -822,10 +864,10 @@
                                             'gl_account': credit_line.account_id.id,
                                             }, context=context)
                 else :
-                    to_update_credit_line_ids = credits_used_pool.search(cr,uid,[('voucher_line_id', '=', line.id),
+                    to_update_credit_line_ids = credits_used_pool.search(cr, uid, [('voucher_line_id', '=', line.id),
                                                                                  ('orginal_credit_line_id', '=', credit_line.id)], context=context)                    
                     if to_update_credit_line_ids:
-                        credits_used_pool.write(cr, uid,to_update_credit_line_ids,
+                        credits_used_pool.write(cr, uid, to_update_credit_line_ids,
                                                 {'available_amount': credit_line.amount_unreconciled - credit_line.pending_credits}, context=context)
 
     def write(self, cr, user, ids, vals, context=None):
@@ -882,7 +924,7 @@
             res[line.id] = 0.0
             for credit_line in line.available_credits:
                 if credit_line.use_credit :
-                    res[line.id] +=  credit_line.discount_amount
+                    res[line.id] += credit_line.discount_amount
         return res
 
     def _compute_balance(self, cr, uid, ids, name, args, context=None):
@@ -947,15 +989,15 @@
     _columns = {
         'invoice_id': fields.many2one('account.invoice', 'Invoice'),
         'account_id': fields.many2one('account.account', 'G/L Account', required=True),
-        'amount': fields.float('Payment Amt', digits=(14,2), required=True),
-        'date_due': fields.related('move_line_id', 'date_maturity', type='date', relation='account.move.line', string='Due Date', readonly=True , 
+        'amount': fields.float('Payment Amt', digits=(14, 2), required=True),
+        'date_due': fields.related('move_line_id', 'date_maturity', type='date', relation='account.move.line', string='Due Date', readonly=True ,
                                    store={
                                          'account.voucher.line': (lambda self, cr, uid, ids, c={}: ids, ['move_line_id'], 20),
                                          'account.move.line': (_get_due_date, ['date_maturity'], 20),
                                          }),
         'amount_original': fields.function(_compute_balance, method=True, multi='dc', type='float', string='Original Amt', store=True, readonly=True),
         'amount_unreconciled': fields.function(_compute_balance, method=True, multi='dc', type='float', string='Amt Due', store=True, readonly=True),
-        'company_id': fields.related('voucher_id','company_id', type='many2one', relation='res.company', string='Company', 
+        'company_id': fields.related('voucher_id', 'company_id', type='many2one', relation='res.company', string='Company',
                                      store={
                                           'account.voucher': (_get_voucher_line_ids, ['company_id'], 20),
                                            }),
@@ -966,7 +1008,7 @@
         'writeoff': fields.boolean("Writeoff"),
         'pay': fields.boolean("Pay", required=True),
         'pending_credits': fields.function(_credits_calc, method=True, string='Pending Credits Used', type='float'),
-        'available_credits': fields.one2many('account.voucher.line.credits_to_use', 'voucher_line_id', 'Available credits'  ),
+        'available_credits': fields.one2many('account.voucher.line.credits_to_use', 'voucher_line_id', 'Available credits'),
         'discount_used': fields.function(_compute_discount_used, method=True, type='float', string='Discount Used', store=False, readonly=True),
         'writeoff_amount': fields.function(_calc_writeoff, method=True, string='Write-off Amt', type='float', store=False,),
          }
@@ -991,16 +1033,16 @@
         voucher_line_credits_to_use_obj = self.pool.get('account.voucher.line.credits_to_use')
         voucher_line_discount_to_use_obj = self.pool.get('account.voucher.line.discount_to_use')
         credit_val = {
-            'use_credit': False, 
+            'use_credit': False,
             'discount_amount': 0.0
             }
         discount_val = {
-            'use_discount': False, 
+            'use_discount': False,
             'discount_amount': 0.0
             }
         if hasattr(voucher_line, 'writeoff_ids'):
             if hasattr(voucher_line, 'available_discounts'):
-                for lines in self.read(cr, uid, ids,['available_credits', 'writeoff_ids', 'available_discounts'], context=context):
+                for lines in self.read(cr, uid, ids, ['available_credits', 'writeoff_ids', 'available_discounts'], context=context):
                     voucher_line_writeoff_obj.unlink(cr, uid, lines['writeoff_ids'], context=context)
                     voucher_line_credits_to_use_obj.write(cr, uid, lines['available_credits'], credit_val, context=context)
                     voucher_line_discount_to_use_obj.write(cr, uid, lines['available_discounts'], discount_val, context=context)
@@ -1009,15 +1051,15 @@
                     voucher_line_writeoff_obj.unlink(cr, uid, lines['writeoff_ids'], context=context)
                     voucher_line_credits_to_use_obj.write(cr, uid, lines['available_credits'], credit_val, context=context)
         elif hasattr(voucher_line, 'available_discounts'):
-            for lines in self.read(cr, uid, ids,['available_credits', 'available_discounts'], context=context):
+            for lines in self.read(cr, uid, ids, ['available_credits', 'available_discounts'], context=context):
                 voucher_line_credits_to_use_obj.write(cr, uid, lines['available_credits'], credit_val, context=context)
                 voucher_line_discount_to_use_obj.write(cr, uid, lines['available_discounts'], discount_val, context=context)
         else:
-            for lines in self.read(cr, uid, ids,['available_credits'], context=context):
+            for lines in self.read(cr, uid, ids, ['available_credits'], context=context):
                 voucher_line_credits_to_use_obj.write(cr, uid, lines['available_credits'], credit_val, context=context)
         return True
 
-    def onchange_pay(self, cr, uid, ids, line_amount, pay, amount_unreconciled,par_cr_ids, par_amount, credit_used, discount_used=0,
+    def onchange_pay(self, cr, uid, ids, line_amount, pay, amount_unreconciled, par_cr_ids, par_amount, credit_used, discount_used=0,
                       writeoff_amount=0, context=None):
         """
         Function to automatically fill the values when the pay checkbox is selected
@@ -1098,7 +1140,7 @@
             res['warning'] = {'title': _('Credit not in the limit'), 'message': _('Credit should not be a negative value.')}
         elif discount_amount > available_amount:
             res['value'] = {'discount_amount': available_amount, 'use_credit': True}
-            res['warning'] = {'title': _('Credit not in the limit'), 
+            res['warning'] = {'title': _('Credit not in the limit'),
                               'message': _('Please adjust the Credit Amt value to be less than or equal the Credit Available.')}
         elif discount_amount == 0.0:
             res['value'] = {'use_credit': False}

=== modified file 'account_voucher_credits_us/voucher_payment_receipt_view.xml'
--- account_voucher_credits_us/voucher_payment_receipt_view.xml	2012-08-06 11:40:00 +0000
+++ account_voucher_credits_us/voucher_payment_receipt_view.xml	2012-08-14 13:27:53 +0000
@@ -190,31 +190,6 @@
 				</xpath>
             </field>
         </record>
-        <!--
-        Company
-        -->
-        <record id="view_company_form_jdc3" model="ir.ui.view">
-            <field name="name">res.company.form.jdc3</field>
-            <field name="model">res.company</field>
-            <field name="type">form</field>
-			<field name="inherit_id"  ref="base.view_company_form"/>
-			<field name="priority" eval="1"/>
-            <field name="arch" type="xml">
-				<xpath expr="/form/notebook/page[@string='Configuration']" position="inside">
-					<group>
-						<separator string="Supplier Payment"  colspan="2"/><newline/>
-	                    <field name="def_supp_journal" domain="[('type','in',['bank','cash'])]"/>
-                   	</group>
-	            </xpath>
-            
-				<xpath expr="/form/notebook" position="inside">
-					<page string="Accounting">
-	                        <field name="writeoff_account" colspan="2"/>
-					</page>
-	            </xpath>
-            </field>
-        </record>
-
 
       </data>
 </openerp>

=== modified file 'account_voucher_credits_us/wizard/account_post_voucher.py'
--- account_voucher_credits_us/wizard/account_post_voucher.py	2012-08-06 11:40:00 +0000
+++ account_voucher_credits_us/wizard/account_post_voucher.py	2012-08-14 13:27:53 +0000
@@ -30,7 +30,7 @@
         'total_paid': fields.float('Total Received'),
         'total_allocated': fields.float('Total Allocated'),
         'ok_to_go': fields.float('OK to Go'),
-         }
+    }
 
     def _get_total_paid(self, cr, uid, context=None):
         """
@@ -81,15 +81,13 @@
             return total_allocated
         for line in voucher.line_cr_ids:
             total_allocated += line.amount
-
-        
         return total_allocated - voucher.amount
 
     _defaults = {
         'total_paid': _get_total_paid,
         'total_allocated': _get_total_allocated,
         'ok_to_go': _get_ok_to_go,
-        }
+    }
     
     def onchange_ok_to_go(self, cr, uid, ids, ok_to_go, context=None):
         """
@@ -102,8 +100,7 @@
         """
         if ok_to_go > 0.0:
             return {'warning': {'title': _('Overallocated invoices'), 'message': _('Reduce allocations to match Total Receipt')}}
-        else:
-            return {'value': {}}
+        return {'value': {}}
         
     def launch_wizard(self, cr, uid, ids, context=None):
         """