Merge lp:~serpent-consulting-services/openerp-usa/account_payment_creditcard_RSA into lp:openerp-usa/6.0

[Serpent Consulting Services]

=== added directory 'account_payment_ccapi_authdotnet'
=== added file 'account_payment_ccapi_authdotnet/Change Log.txt'
--- account_payment_ccapi_authdotnet/Change Log.txt	1970-01-01 00:00:00 +0000
+++ account_payment_ccapi_authdotnet/Change Log.txt	2012-10-16 09:27:13 +0000
@@ -0,0 +1,65 @@
+===============================================================================
+ Version Change Log (account_payment_ccapi_authdotnet)
+===============================================================================
+1.22 on 2012-10-16 by Serpent Consulting Services
+	* Added necessary code for pre-auth duplication check and othe improvements.
+
+1.21 On 2011-11-15 by Arif
+	* Corrected the unit price in refund invoice - Now it takes from  sale order instead of products unit price
+	* Fixed the bug - Shipping cost was not added to total and residual amounts
+	* Fixed the AuthnetAIMError
+	
+1.20 0n 2011-11-09 by Arif
+	* Moved credicard refund on product return to after processing of related incoming shipment
+	
+1.19 on 2011-11-08 By Janeesh
+	* Fixed error on creating invoice (removed _get_invoice_type function. need to test more the effect of this) 
+
+1.18 on 2011-10-06 By Janeesh
+	* When Sale Order is cancelled, Invoice and Picking automatically cancelled for CreditCard
+	
+1.17 on 2011-09-29 By Arif
+	* Removed the attribute modification on Authorize button since it has been 
+	  moved near to Post buttor where required modification has been made.
+	  
+1.16 on 2011-08-25 by Arif
+	* Modifications related with credit card refund
+	
+1.15 on 2011-08-17 by Janeesh
+	* Added Origin field in Sales receipt
+	
+1.14 on 2011-08-17 by Arif
+	* Added check box for ship refund in product return wizard
+	
+1.13 on 2011-08-10 by Arif
+	* Partial credit card refund from product retrun from delivered products 
+
+1.12 on 2011-08-09 by Arif
+	* Removed reconcillation
+	* Created Refund sales receipt
+	* Creait card fields read only in Pay Invoice 
+
+1.11 on 11 July 2011 by Arif
+	* Cancelled sales receipt on Refund 
+1.10 on 11 July 2011 by Jabir
+	* CCV saved on bank details
+1.08	-> 1.09
+	* Added Security for the model created from this module
+1.07	-> 1.08
+	* Created the sales reciept line for shipping charge
+1.06	-> 1.07
+	* Created the sales reciept on sale order confirm and validate it on payment
+
+1.05	-> 1.06
+	* Fixed the wrong account issue on sales receipt
+
+1.04	-> 1.05
+	* Fixed issue with sale order state being draft authorised even after payed and delivered
+
+1.03	-> 1.04
+	* Created sales reciept before posting sales payment
+
+1.0	-> 1.03
+	* Add function to hook methods authorize and cc_refund which is added on account_payment_creditcard module
+	* Add class to do credit card transaction
+	* Add function to Authorize button

=== added file 'account_payment_ccapi_authdotnet/__init__.py'
--- account_payment_ccapi_authdotnet/__init__.py	1970-01-01 00:00:00 +0000
+++ account_payment_ccapi_authdotnet/__init__.py	2012-10-16 09:27:13 +0000
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 NovaPoint Group LLC (<http://www.novapointgroup.com>)
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
+#
+#    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 3 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, 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:

=== added file 'account_payment_ccapi_authdotnet/__openerp__.py'
--- account_payment_ccapi_authdotnet/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_payment_ccapi_authdotnet/__openerp__.py	2012-10-16 09:27:13 +0000
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 NovaPoint Group LLC (<http://www.novapointgroup.com>)
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
+#
+#    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 3 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, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+{
+    'name': 'CreditCard Payment',
+    'version': '1.22',
+    'category': 'Generic Modules/Others',
+    'description': """
+    Module for Credit card payment using authorise.net
+    """,
+    'author': 'NovaPoint Group LLC',
+    'website': ' http://www.novapointgroup.com',
+    'depends': ['account_voucher_credits_us'],
+    'init_xml': [
+    ],
+    'update_xml': [
+                   'account_voucher.xml',
+                   'security/ir.model.access.csv',
+                   'stock_view.xml',
+                   ],
+    'demo_xml': [
+    ],
+    'installable': True,
+    'auto_install': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_payment_ccapi_authdotnet/account_voucher.py'
--- account_payment_ccapi_authdotnet/account_voucher.py	1970-01-01 00:00:00 +0000
+++ account_payment_ccapi_authdotnet/account_voucher.py	2012-10-16 09:27:13 +0000
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 NovaPoint Group LLC (<http://www.novapointgroup.com>)
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
+#
+#    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 3 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, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from osv import osv, fields
+
+class account_voucher(osv.osv):
+    
+    _inherit = 'account.voucher'
+    
+    _columns = {
+        'origin':fields.char('Origin',size=16,readonly=True)
+    }
+
+account_voucher()
\ No newline at end of file

=== added file 'account_payment_ccapi_authdotnet/account_voucher.xml'
--- account_payment_ccapi_authdotnet/account_voucher.xml	1970-01-01 00:00:00 +0000
+++ account_payment_ccapi_authdotnet/account_voucher.xml	2012-10-16 09:27:13 +0000
@@ -0,0 +1,43 @@
+<?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>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account_voucher.view_sale_receipt_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='partner_id']" position="after">
+                	<field name="origin"/>
+				</xpath>
+            </field>
+        </record>
+        
+        <record id="view_voucher_filter_sale_inherit" model="ir.ui.view">
+            <field name="name">account.voucher.sale.select.inherit</field>
+            <field name="model">account.voucher</field>
+            <field name="type">search</field>
+            <field name="inherit_id" ref="account_voucher.view_voucher_filter_sale"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='partner_id']" position="after">
+                	<field name="origin"/>
+				</xpath>
+            </field>
+        </record>
+        
+    </data>
+</openerp>
+        
+        
\ No newline at end of file

=== added file 'account_payment_ccapi_authdotnet/cc_auth_api.py'
--- account_payment_ccapi_authdotnet/cc_auth_api.py	1970-01-01 00:00:00 +0000
+++ account_payment_ccapi_authdotnet/cc_auth_api.py	2012-10-16 09:27:13 +0000
@@ -0,0 +1,583 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 NovaPoint Group LLC (<http://www.novapointgroup.com>)
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
+#
+#    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 3 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, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from osv import osv, fields
+import pooler
+import socket
+import sys
+import urllib
+import collections
+from time import time
+from tools.translate import _
+from Crypto.Cipher import DES3
+import base64
+import netsvc
+
+class AuthnetAIMError(Exception):
+    '''
+    Class to display exceptions
+    '''
+    def __init__(self, value):
+        self.parameter = value
+    def __str__(self):
+        return str(self.parameter)
+    def setParameter(self, parameters={},key=None, value=None):
+
+        if key != None and value != None and str(key).strip() != '' and str(value).strip() != '':
+            parameters[key] = str(value).strip()
+        else:
+            raise AuthnetAIMError('Incorrect parameters passed to setParameter(): {0}:{1}'.format(key, value))
+        return parameters
+
+class auth_net_cc_api(osv.osv):
+    _name = "auth.net.cc.api"
+    '''
+        Class to do credit card transaction
+    '''
+
+    def _get_prod_acc(self, product_id, journal_obj, context=False):
+        if product_id and product_id.property_account_income:
+            return product_id.property_account_income.id
+        elif product_id and product_id.categ_id.property_account_income_categ:
+             return product_id.categ_id.property_account_income_categ.id
+        else:
+            if journal_obj.default_credit_account_id:
+                return journal_obj.default_credit_account_id.id
+        return False
+
+    def validate_sales_reciept(self, cr, uid, ids, context={}):
+        if type(ids) == type([]):
+            voucher_objs=self.pool.get('account.voucher').browse(cr,uid,ids,context=context)
+        else:
+            voucher_objs=self.pool.get('account.voucher').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'])])
+
+            if sale_reciepts_ids:
+                self.pool.get('account.voucher').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)
+        return True
+
+    def _get_prod_deb_acc(self, product_id, journal_obj, context=False):
+        if product_id and product_id.property_account_income:
+            return product_id.property_account_expense.id
+        elif product_id and product_id.categ_id.property_account_expense_categ:
+             return product_id.categ_id.property_account_expense_categ.id
+        else:
+            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)
+#        vals={}
+#        cr_ids_list = []
+#        cr_ids = {}
+        sales_receipt_ids = voucher_obj.search(cr,uid,[('rel_sale_order_id','=',ids),('state','=','posted')], context=context)
+        if sales_receipt_ids:
+            voucher_obj.cancel_voucher(cr, uid, sales_receipt_ids, context=context)
+#        journal_ids = self.pool.get('account.journal').search(cr,uid,[('type','=','sale_refund')])
+#        if journal_ids:
+#            vals['journal_id'] = journal_ids[0]
+#            journal_obj = self.pool.get('account.journal').browse(cr,uid,journal_ids[0])
+#            if sale_obj and sale_obj.order_line:
+#                for sale_line in sale_obj.order_line:
+#                    cr_ids['account_id'] = self._get_prod_deb_acc(sale_line.product_id and sale_line.product_id, journal_obj)#journal_obj.default_debit_account_id.id #Change this account to product's income account
+#                    cr_ids['amount'] = sale_line.price_subtotal
+#                    cr_ids['partner_id'] = sale_obj.partner_id.id
+#                    cr_ids['name'] = sale_line.name
+#                    cr_ids_list.append(cr_ids.copy())
+#            if sale_obj.shipcharge and sale_obj.ship_method_id and sale_obj.ship_method_id.account_id:
+#                cr_ids['account_id'] = sale_obj.ship_method_id.account_id.id
+#                cr_ids['amount'] = sale_obj.shipcharge
+#                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
+#        vals['partner_id'] = sale_obj.partner_id.id
+#        vals['date'] = sale_obj.date_order
+#        vals['rel_sale_order_id'] = ids[0]
+#        vals['name'] = 'Auto generated Sales Receipt'
+#        vals['type'] = 'sale'
+#        vals['currency_id'] = journal_obj.company_id.currency_id.id
+#        vals['line_cr_ids'] = [(0,0,cr_ids) for cr_ids in cr_ids_list]
+##        vals['narration'] = voucher_obj.narration
+#        vals['pay_now'] = 'pay_now'
+#        vals['account_id'] = journal_obj.default_debit_account_id.id  
+##        vals['reference'] = voucher_obj.reference
+##        vals['tax_id'] = voucher_obj.tax_id.id
+#        vals['amount'] = sale_obj.amount_total
+#        vals['company_id'] = journal_obj.company_id.id
+#        voucher_id = self.pool.get('account.voucher').create(cr,uid,vals,context)
+#        print voucher_id,'--------------------------'
+        return True
+
+    def do_this_transaction(self, cr, uid, ids, refund=False, context=None):
+        '''
+        Do credit card transaction
+        '''
+
+        ret = False
+        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'})
+        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)
+        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
+        
+        if acc_voucher_obj.cc_save_card_details:
+            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',
+                                                                     'acc_number':'nil',
+                                                                     'cc_number':creditcard,
+                                                                     'cc_e_d_month':acc_voucher_obj.cc_e_d_month,
+                                                                     'cc_e_d_year':acc_voucher_obj.cc_e_d_year,
+                                                                     'partner_id':acc_voucher_obj.partner_id.id,
+                                                                     'bank':acc_voucher_obj.cc_bank.id,
+                                                                     'cc_v':acc_voucher_obj.cc_v
+                                                                     })
+        if refund:
+            x_type = 'CREDIT'
+            if not acc_voucher_obj.cc_trans_id:
+                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'
+        
+        elif acc_voucher_obj.cc_charge and acc_voucher_obj.cc_auth_code:
+            x_type = 'CAPTURE_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.") )
+
+        if acc_voucher_obj.cc_v:
+            cvv = acc_voucher_obj.cc_v
+        else:
+            cvv=None
+
+        tax = '0.00'
+
+        login= user.company_id.cc_login
+        transkey=user.company_id.cc_transaction_key
+        testmode=user.company_id.cc_testmode
+
+        if str(login).strip() == '' or login == None:
+            raise osv.except_osv(_('Error'),_("No login name provided"))
+            #raise AuthnetAIMError('No login name provided')
+        if str(transkey).strip() == '' or transkey == None:
+            raise osv.except_osv(_('Error'),_("No transaction key provided"))
+            #raise AuthnetAIMError('No transaction key provided')
+        if testmode != True and testmode != False:
+            raise osv.except_osv(_('Error'),_("Invalid value for testmode. Must be True or False. "))
+            #raise AuthnetAIMError('Invalid value for testmode. Must be True or False. "{0}" given.'.format(testmode))
+
+        parameters={}
+        proxy = None;
+        delimiter = '|'
+        results = []
+        error = True
+        success = False
+        declined = False
+
+        ############ 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)
+        
+        if acc_voucher_obj.cc_charge:
+            parameters=pooler.get_pool(cr.dbname).get('account.voucher').setParameter(parameters,'x_auth_code', acc_voucher_obj.cc_auth_code)
+
+        ########## setTransaction
+        if str(creditcard).strip() == '' or creditcard == None:
+            raise osv.except_osv(_('Error'),_("No credit card number passed to setTransaction()"))
+            #raise AuthnetAIMError('No credit card number passed to setTransaction(): {0}').format(creditcard)
+        if str(expiration).strip() == '' or expiration == None:
+            raise osv.except_osv(_('Error'),_("No expiration number to setTransaction()"))
+            #raise AuthnetAIMError('No expiration number to setTransaction(): {0}').format(expiration)
+        if str(total).strip() == '' or total == None:
+            raise osv.except_osv(_('Error'),_("No total amount passed to setTransaction()"))
+
+            #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)
+        if cvv != None:
+            parameters=pooler.get_pool(cr.dbname).get('account.voucher').setParameter(parameters,'x_card_code', cvv)
+        if tax != None:
+            parameters=pooler.get_pool(cr.dbname).get('account.voucher').setParameter(parameters,'x_tax', tax)
+
+        ##################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()))
+
+    #           Actual Processing
+
+        encoded_args = urllib.urlencode(parameters)
+        if testmode:
+            url = 'https://test.authorize.net/gateway/transact.dll'
+        else:
+            url = 'https://secure.authorize.net/gateway/transact.dll'
+
+        results += str(urllib.urlopen(url, encoded_args).read()).split(delimiter)
+
+#        Results = collections.namedtuple('Results', 'ResponseCode ResponseSubcode ResponseReasonCode ResponseText AuthCode \
+#                                          AVSResponse TransactionID InvoiceNumber Description Amount PaymentMethod \
+#                                          TransactionType CustomerID CHFirstName CHLastName Company BillingAddress \
+#                                          BillingCity BillingState BillingZip BillingCountry Phone Fax Email ShippingFirstName \
+#                                          ShippingLastName ShippingCompany ShippingAddress ShippingCity ShippingState \
+#                                          ShippingZip ShippingCountry TaxAmount DutyAmount FreightAmount TaxExemptFlag \
+#                                          PONumber MD5Hash CVVResponse CAVVResponse')
+#        response = Results(*tuple(r for r in results)[0:40])
+#
+        if results[0]=='1' and acc_voucher_obj.rel_sale_order_id and acc_voucher_obj.rel_sale_order_id.id:
+            
+            if acc_voucher_obj.rel_sale_order_id.state == 'done':
+                pooler.get_pool(cr.dbname).get('sale.order').write(cr,uid,[acc_voucher_obj.rel_sale_order_id.id],{'cc_pre_auth':True,'rel_account_voucher_id':acc_voucher_obj.id})
+            else:
+                pooler.get_pool(cr.dbname).get('sale.order').write(cr,uid,[acc_voucher_obj.rel_sale_order_id.id],{'state':'cc_auth','cc_pre_auth':True,'rel_account_voucher_id':acc_voucher_obj.id})
+        
+        ret_dic={'cc_auth_code':results[4],
+                 'cc_trans_id':results[6]
+                 }
+        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)
+             
+        if x_type == 'CAPTURE_ONLY':
+            status = "Capture: " + str(results[3])
+            ret_dic['cc_status'] = status
+            pooler.get_pool(cr.dbname).get('account.voucher').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)
+             cr.commit()
+             if results[0]=='1':
+                 '''
+                     Validating sales reciept
+                 '''
+                 #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)
+                 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')]
+                #Context: {'type':'out_refund', 'journal_type': 'sale_refund'}
+
+                refund_journal_id = False
+                if user.company_id.cc_refund_journal_id:
+                    refund_journal_id = user.company_id.cc_refund_journal_id.id
+                else:
+                    j_ids = self.pool.get('account.journal').search(cr, uid, [('type','=','sale_refund')], context=context)
+                    if j_ids:
+                        refund_journal_id = j_ids[0]
+                if refund_journal_id and self.get('cc_refund'):
+                    invoice_obj = self.pool.get('account.invoice')
+                    invoice_line_obj=self.pool.get('account.invoice.line')
+                    inv_vals = {
+                                    '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')
+                                }
+                    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']:
+
+                        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
+                    print "Context ", context
+                    invoice_id = invoice_obj.create(cr, uid, inv_vals, context=context)
+                    wf_service = netsvc.LocalService("workflow")
+                    wf_service.trg_validate(uid, 'account.invoice', invoice_id, 'invoice_open', cr)
+
+                    print "Created refund ivoice and validated ", invoice_id
+#                ret = True
+#                voucher_obj = self.pool.get('account.voucher')
+#                
+#
+#                refund_journal_id = False
+#                if user.company_id.cc_refund_journal_id:                    
+#                    refund_journal_id = user.company_id.cc_refund_journal_id.id
+#                else
+#                    j_ids = self.pool.get('account.journal').search(cr, uid, [('type','=','sale_refund')], context=context)
+#                    if j_ids:
+#                        refund_journal_id = j_ids[0]
+#                
+#                account_id=False
+#                if refund_journal_id:
+#                    default_debit_account_id = self.pool.get('account.journal').browse(cr, uid, refund_journal_id,context=context).default_debit_account_id.id
+#                
+#                
+#                vals1 = {
+#                        
+#                            'name' :  'Refund : ' + (acc_voucher_obj.rel_sale_order_id and str(acc_voucher_obj.rel_sale_order_id.name) or ''),
+#                            'account_id' :  default_debit_account_id,
+#                            'partner_id' : acc_voucher_obj.partner_id.id,
+#                            'amount'    : acc_voucher_obj.cc_order_amt,
+#                            'currency_id' :  user.company_id.currency_id.id,
+#                            'origin':acc_voucher_obj.rel_sale_order_id and acc_voucher_obj.rel_sale_order_id.name or ''
+#                        }
+#
+#                
+#                vals  = voucher_obj.onchange_partner_id(cr, uid, [], acc_voucher_obj.partner_id.id, refund_journal_id , acc_voucher_obj.cc_order_amt , user.company_id.currency_id.id, 'sale', time())
+#                
+#                vals.update(vals1)
+#                
+#                vals['journal_id'] = refund_journal_id
+#                vals['type'] = 'sale'
+#                
+#               
+#                
+#                
+#                voucher_id = voucher_obj.create(cr, uid, vals, context=context)
+#                
+#                
+#                if acc_voucher_obj.cc_order_amt == acc_voucher_obj.rel_sale_order_id.amount_total and acc_voucher_obj.rel_sale_order_id.shipcharge:
+#                    self.pool.get('sale.order').write(cr, uid, [acc_voucher_obj.rel_sale_order_id.id],{'cc_ship_refund':True},context=context)
+#                    
+#                refund_voucher=False
+#                if 'cc_refund' not in context:
+#                    refund_voucher=True
+#                    sales_receipt_ids = voucher_obj.search(cr,uid,[('rel_sale_order_id','=',acc_voucher_obj.rel_sale_order_id.id),('state','=','posted'),('type','=','sale')], order="id desc",context=context)
+#
+#                    for receipt in voucher_obj.browse(cr, uid, sales_receipt_ids, context):
+#                        
+#                        for line in receipt.line_ids:
+#
+#                            if line.amount:
+#                                vals = {
+#                                            'voucher_id': voucher_id,
+#                                            'name' : line.name,
+#                                            'account_id' : line.account_id.id,
+#                                            'partner_id' : line.partner_id.id,
+#                                            'amount' : line.amount,
+#                                            'type': line.type,
+#                                            
+#                                    }
+#                                line_id = self.pool.get('account.voucher.line').create(cr, uid, vals, context)
+#                        break
+#                else:
+#                    for line in context['cc_refund']:
+#                        product=self.pool.get('product.product').browse(cr, uid, line['product_id'],context)
+#                        
+#                        vals = {
+#                                'voucher_id': voucher_id,
+#                                'name' : product.name,
+#                                'account_id' : product.product_tmpl_id.property_account_income.id,
+#                                'partner_id' : acc_voucher_obj.partner_id.id,
+#                                'amount'    :  product.list_price * line['qty'],
+#                                'type' : 'cr',                                
+#                                }
+#                        line_id = self.pool.get('account.voucher.line').create(cr, uid, vals, context)
+#                    if context.get('cc_ship_refund'):
+#                        vals = {
+#                                'voucher_id': voucher_id,
+#                                'name' : 'Shipping Charges of ' + acc_voucher_obj.rel_sale_order_id.name,
+#                                'account_id' : acc_voucher_obj.rel_sale_order_id.ship_method_id and acc_voucher_obj.rel_sale_order_id.ship_method_id.account_id.id or False,
+#                                'partner_id' : acc_voucher_obj.partner_id.id,
+#                                'amount'    : context['cc_ship_refund'],
+#                                'type' : 'cr', 
+#                                }
+#                        line_id = self.pool.get('account.voucher.line').create(cr, uid, vals, context)
+#                        self.pool.get('sale.order').write(cr, uid, [acc_voucher_obj.rel_sale_order_id.id],{'cc_ship_refund':True},context=context)
+#                
+#                
+#                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)
+        else:
+            status = ''
+        return ret
+
+auth_net_cc_api()
+
+class account_voucher(osv.osv):
+
+    _inherit = 'account.voucher'
+    '''
+        Add function to hook methods authorize and cc_refund which is added on account_payment_creditcard module
+    '''
+    def check_transaction(self, cr, uid, ids, context=None):
+        transaction_record = self.browse( cr, uid, ids,context)
+        for record in transaction_record:
+             if record.cc_p_authorize and record.cc_auth_code:
+                 raise osv.except_osv(_('Error'), _("Already Authorized!"))
+             if record.cc_charge and not record.cc_auth_code:
+                 raise osv.except_osv(_('Error'), _("Pre-Authorize Transaction first!"))
+        return True
+
+    def authorize(self, cr, uid, ids, context=None):
+        self.check_transaction(cr, uid, ids, context)
+        return self.pool.get('auth.net.cc.api').do_this_transaction(cr, uid, ids,refund=False, context=context)
+    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)
+
+account_voucher()
+
+class sale_order(osv.osv):
+    _name = "sale.order"
+    _inherit = "sale.order"
+    def _get_prod_acc(self, product_id, journal_obj, context=False):
+        if product_id and product_id.property_account_income:
+            return product_id.property_account_income.id
+        elif product_id and product_id.categ_id.property_account_income_categ:
+             return product_id.categ_id.property_account_income_categ.id
+        else:
+            if journal_obj.default_credit_account_id:
+                return journal_obj.default_credit_account_id.id
+        return False
+    def create_sales_reciept(self, cr, uid, ids, context={}):
+        sale_obj = self.browse(cr,uid,ids[0],context=context)
+        vals={}
+        cr_ids_list = []
+        cr_ids = {}
+        journal_ids = self.pool.get('account.journal').search(cr,uid,[('type','=','sale')])
+        if journal_ids:
+            vals['journal_id'] = journal_ids[0]
+            journal_obj = self.pool.get('account.journal').browse(cr,uid,journal_ids[0])
+            if sale_obj and sale_obj.order_line:
+                for sale_line in sale_obj.order_line:
+                    cr_ids['account_id'] = self._get_prod_acc(sale_line.product_id and sale_line.product_id, journal_obj)#journal_obj.default_debit_account_id.id #Change this account to product's income account
+                    cr_ids['amount'] = sale_line.price_subtotal
+                    cr_ids['partner_id'] = sale_obj.partner_id.id
+                    cr_ids['name'] = sale_line.name
+                    cr_ids_list.append(cr_ids.copy())
+            if sale_obj.shipcharge and sale_obj.ship_method_id and sale_obj.ship_method_id.account_id:
+                cr_ids['account_id'] = sale_obj.ship_method_id.account_id.id
+                cr_ids['amount'] = sale_obj.shipcharge
+                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
+        vals['partner_id'] = sale_obj.partner_id.id
+        #vals['date'] = sale_obj.date_order
+        vals['rel_sale_order_id'] = ids[0]
+        vals['name'] = 'Auto generated Sales Receipt'
+        vals['type'] = 'sale'
+        vals['currency_id'] = journal_obj.company_id.currency_id.id
+        vals['line_cr_ids'] = [(0,0,cr_ids) for cr_ids in cr_ids_list]
+#        vals['narration'] = voucher_obj.narration
+        vals['pay_now'] = 'pay_now'
+        vals['account_id'] = journal_obj.default_debit_account_id.id  
+#        vals['reference'] = voucher_obj.reference
+#        vals['tax_id'] = voucher_obj.tax_id.id
+        vals['amount'] = sale_obj.amount_total
+        vals['company_id'] = journal_obj.company_id.id
+        vals['origin'] = sale_obj.name
+        #print "Vals : ", vals
+
+        voucher_id = self.pool.get('account.voucher').create(cr,uid,vals,context)
+
+        #print "Sales Receipt ID : ", voucher_id
+        return voucher_id
+
+    def action_wait(self, cr, uid, ids, *args):
+
+        ret = super(sale_order, self).action_wait(cr, uid, ids, *args)
+        for o in self.browse(cr, uid, ids):
+            if (o.order_policy == 'credit_card'):
+                #self.create_sales_reciept(cr, uid, [o.id])
+                invoice_id = self.action_invoice_create(cr, uid, [o.id])
+                wf_service = netsvc.LocalService('workflow')
+                wf_service.trg_validate(uid, 'account.invoice', invoice_id, 'invoice_open', cr)
+                self.pool.get('account.invoice').write(cr, uid, invoice_id, {'credit_card': True}, context={})
+        return ret
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        for sale in self.browse(cr, uid, ids, context=context):
+            for picking in sale.picking_ids:
+                if sale.order_policy == 'credit_card' and picking.state not in ('done','cancel'):
+                    self.pool.get('stock.picking').action_cancel(cr,uid,[picking.id],{})
+            for inv in sale.invoice_ids:
+                if sale.order_policy == 'credit_card':
+                    self.pool.get('account.invoice').action_cancel(cr,uid,[inv.id],{})
+        return super(sale_order, self).action_cancel(cr, uid, ids, context)
+sale_order()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added directory 'account_payment_ccapi_authdotnet/security'
=== added file 'account_payment_ccapi_authdotnet/security/ir.model.access.csv'
--- account_payment_ccapi_authdotnet/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ account_payment_ccapi_authdotnet/security/ir.model.access.csv	2012-10-16 09:27:13 +0000
@@ -0,0 +1,3 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"auth_user","auth_net_cc_api","model_auth_net_cc_api","account.group_account_user",1,1,1,1
+"auth_manager","auth_net_cc_api","model_auth_net_cc_api","account.group_account_manager",1,1,1,1

=== added file 'account_payment_ccapi_authdotnet/stock_return_picking.py'
--- account_payment_ccapi_authdotnet/stock_return_picking.py	1970-01-01 00:00:00 +0000
+++ account_payment_ccapi_authdotnet/stock_return_picking.py	2012-10-16 09:27:13 +0000
@@ -0,0 +1,226 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 NovaPoint Group LLC (<http://www.novapointgroup.com>)
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
+#
+#    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 3 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, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+import netsvc
+import time
+
+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) }
+    def default_get(self, cr, uid, fields, context=None):
+        """
+         To get default values for the object.
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param fields: List of fields for which we want default values
+         @param context: A standard dictionary
+         @return: A dictionary with default values for all field in ``fields``
+        """
+        if context is None:
+            context = {}
+        res = super(stock_return_picking, self).default_get(cr, uid, fields, context=context)
+        record_id = context and context.get('active_id', False) or False
+        pick_obj = self.pool.get('stock.picking')
+        pick = pick_obj.browse(cr, uid, record_id, context=context)
+        if pick:
+            if 'invoice_state' in fields:
+                if pick.cc_pre_auth:
+                    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.
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param ids: List of ids selected
+         @param context: A standard dictionary
+         @return: A dictionary which of fields with values.
+        """
+        if context is None:
+            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")
+
+        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=[]
+
+        #@ 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 = amount + new_qty * move.product_id.list_price
+                line ={}
+                line['product_id'] = move.product_id.id
+                line['qty'] = new_qty
+                line['price_unit'] = move.product_id.list_price
+                if pick.sale_id:
+                    for sale_line in pick.sale_id.order_line:
+                        if sale_line.product_id and sale_line.product_id.id == move.product_id.id:
+                             line['price_unit'] = sale_line.price_unit
+                             break
+
+                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)
+                if voucher_ids:
+                    voucher_obj.write(cr, uid, [voucher_ids[0]], {'cc_order_amt':amount}, context )
+                    context['cc_refund'] = ctx
+                    
+                    #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:
+                        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 )
+
+        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)
+        }
+
+    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:
+                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:

=== added file 'account_payment_ccapi_authdotnet/stock_view.xml'
--- account_payment_ccapi_authdotnet/stock_view.xml	1970-01-01 00:00:00 +0000
+++ account_payment_ccapi_authdotnet/stock_view.xml	2012-10-16 09:27:13 +0000
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+	<data>
+		<record id="view_picking_form_cc_refund" model="ir.ui.view">
+			<field name="name">stock.picking.form.inherit.cc_refund</field>
+			<field name="model">stock.picking</field>
+			<field name="type">form</field>
+			<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'),('invoice_state','=','none'),('invoice_state','=','cc_refund'),('invoice_state','=','credit_card')]}"  type="action" icon="terp-gtk-go-back-rtl" />
+				</xpath>
+			</field>
+		</record>
+
+		<record id="view_picking_form_cc_refund_out" model="ir.ui.view">
+			<field name="name">stock.picking.form.inherit.cc_refund.out</field>
+			<field name="model">stock.picking</field>
+			<field name="type">form</field>
+			<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'),('invoice_state','=','none'),('invoice_state','=','cc_refund'),('invoice_state','=','credit_card')]}" type="action" icon="terp-gtk-go-back-rtl" />
+				</xpath>
+			</field>
+		</record>
+	</data>
+</openerp>
\ No newline at end of file

=== added directory 'account_payment_creditcard'
=== added file 'account_payment_creditcard/Change Log.txt'
--- account_payment_creditcard/Change Log.txt	1970-01-01 00:00:00 +0000
+++ account_payment_creditcard/Change Log.txt	2012-10-16 09:27:13 +0000
@@ -0,0 +1,50 @@
+===============================================================================
+ Version Change Log (account_payment_creditcard)
+===============================================================================
+Version 1.17 : Serpent Consulting Services
+	: Added RSA Encryption
+
+Version 1.16
+	Auto selection of Pay in outstanding transation lines
+
+Version 1.15
+	* Made Shipping Policy changes automatically corresponding to Payment Method in Sale Order
+	* Shipping Policy: CC Pre-Auth Pick Charge Ship when Payment Method: Credit Card
+	* Shipping Policy: Invoice from the Picking when Payment Method:  Invoice 
+	* Added Authorize button 
+Version 1.14
+	* Added new search buttons Manual Invoice and Credit Card Invoice in Customer Invoice
+Version 1.13
+	* Remove the authorize buttom to move near to Post button
+
+Version 1.12
+	* Removed buttons Pre-authorized and Paid from Deliver Orders and added new button Pre-authorized or Invoiced
+Version 1.11
+	* Store function invoiced field in sale order for make it searchable in delivery order 
+Version 1.10
+	* Default Payment Order in Sale Order 
+Version 1.09
+	* Added field to indicate the status of refund of ship
+
+Version 1.08
+	* Made save creditcard details available for all customer
+Version 1.07
+	* Modification of the default payment method in sale order to Invoice On Order After Delivery for Reseller
+
+Version 1.06
+	* Modification of the default payment method in sale order
+
+Version 1.05
+	* Displayed sale order pay button on in progress state
+
+Version 1.04
+	* Made sale order done if it is payed and shipped
+Version 1.03
+	* Add group CreditCard / Manager. Only this group member can use refund button.
+	* Added Allow Credit Card Processing and Allow Credit Card Refunds on journal
+	* Modified sale order view to add credit card pay button and made all buttons on a row
+	* Add Credit Card information on partner bank
+	* Add credit card details fields on voucher
+	* Encrypt credit card details
+	* Add credit card configuration fields on company
+	* Add credit card preauthorised and invoiced check field on stock picking

=== added file 'account_payment_creditcard/__init__.py'
--- account_payment_creditcard/__init__.py	1970-01-01 00:00:00 +0000
+++ account_payment_creditcard/__init__.py	2012-10-16 09:27:13 +0000
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 NovaPoint Group LLC (<http://www.novapointgroup.com>)
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
+#
+#    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 3 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, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+import account_voucher
+import account_journal
+import stock_picking
+import sale
+import invoice
+import rsa_encrypt
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_payment_creditcard/__openerp__.py'
--- account_payment_creditcard/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_payment_creditcard/__openerp__.py	2012-10-16 09:27:13 +0000
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 NovaPoint Group LLC (<http://www.novapointgroup.com>)
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
+#
+#    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 3 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, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+
+{
+    'name': 'Account Payment Credit Card',
+    'version': '1.17',
+    'category': 'Generic Modules/Others',
+    'description': """
+    Module for Credit card payment
+    """,
+    'author': 'NovaPoint Group LLC',
+    'website': ' http://www.novapointgroup.com',
+    'depends': ['sale', 'account_voucher'],
+    'init_xml': [],
+    'update_xml': ['security/account_security.xml',
+                   'account_voucher_view.xml',
+                   'account_journal_view.xml',
+                   'stock_picking_view.xml',
+                   'invoice_view.xml'
+                   ],
+    'demo_xml': [],
+    'installable': True,
+    'active': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_payment_creditcard/account_journal.py'
--- account_payment_creditcard/account_journal.py	1970-01-01 00:00:00 +0000
+++ account_payment_creditcard/account_journal.py	2012-10-16 09:27:13 +0000
@@ -0,0 +1,73 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 NovaPoint Group LLC (<http://www.novapointgroup.com>)
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
+#
+#    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 3 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, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from osv import osv, fields
+
+class account_journal(osv.osv):
+    _inherit = "account.journal"
+    _columns = {
+        'cc_allow_processing': fields.boolean('Allow Credit Card Processing',),
+        'cc_allow_refunds': fields.boolean('Allow Credit Card Refunds',),
+    }
+account_journal()
+
+
+class res_partner(osv.osv):
+    _inherit = "res.partner"
+
+    def write(self, cr, uid, ids, vals, context=None):
+        if vals.get('bank_ids',[]) and len(vals['bank_ids'][0]) > 3 and vals['bank_ids'][0][2] :
+            if vals['bank_ids'][0][2].get('cc_number',False):
+                if ('XXXXXXXXX' in vals['bank_ids'][0][2]['cc_number']):
+                    del vals['cc_number']
+        print "gggg",vals
+        result = super(res_partner, self).write(cr, uid, ids, vals, context)
+        return True
+
+res_partner()
+
+class res_partner_bank(osv.osv):
+    '''Bank Accounts'''
+
+    def read(self, cr, user, ids, fields=None, context=None, load='_classic_read'):
+        if context is None:
+            context = {}
+        vals = super(res_partner_bank,self).read(cr,user,ids,fields,context,load)
+        if context.get('cc_no','') != 'no_mask':
+            if len(vals) == 1:
+                if vals[0].get('cc_number',False):
+                    t = vals[0]['cc_number']
+                    i = len(t)-4
+                    vals[0]['cc_number'] = 'X'*i+t[-4:len(t)]
+        return vals
+    
+    _inherit = "res.partner.bank"
+    _columns = {
+        'cc_number':fields.char('Credit Card Number', size=256),#Given size 256 because the credit card is stored as encrypted format.
+#        'cc_type':fields.many2one('cc.type','Card type'),
+        'cc_e_d_month':fields.char('Expiration Date MM', size=32),
+        'cc_e_d_year':fields.char('Expiration Date YY', size=32),
+        'cc_v':fields.char('Card Code Verification', size=32),
+    }
+res_partner_bank()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'account_payment_creditcard/account_journal_view.xml'
--- account_payment_creditcard/account_journal_view.xml	1970-01-01 00:00:00 +0000
+++ account_payment_creditcard/account_journal_view.xml	2012-10-16 09:27:13 +0000
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+    	<!--  Journal  -->
+        <record id="account_journal_changes_for_credit_card_01" model="ir.ui.view">
+            <field name="name">account_journal_changes_for_credit_card_01</field>
+            <field name="model">account.journal</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.view_account_journal_form"/>
+            <field name="arch" type="xml">
+            	<xpath expr="//page[@string='General Information']" position="inside">
+                    <group colspan="2" col="2">
+                        <separator string="Credit Card Processing" colspan="4"/>
+                        <field name="cc_allow_processing" />
+                        <field name="cc_allow_refunds"/>
+                    </group>
+				</xpath>
+            </field>
+        </record>
+        
+        <!-- Sale Order -->
+        <record id="sale_order_changes_for_credit_card_01" model="ir.ui.view">
+            <field name="name">sale_order_changes_for_credit_card_01</field>
+            <field name="model">sale.order</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="sale.view_order_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='pricelist_id']" position="after">
+                		<field name="payment_method" on_change="on_change_payment_method(payment_method,order_policy,partner_id)"/>
+              </xpath>
+               <xpath expr="//field[@name='shipped']" position="after">
+						<field  name="rel_account_voucher_id" readonly="1"/><label/><label/>
+						<field  name="cc_pre_auth" readonly="1"/>
+						<field  name="cc_ship_refund" readonly="1" invisible="1" />
+              </xpath>
+              <xpath expr="//notebook[@colspan='5']/page[@string='Sales Order']/group[@colspan='4']" position="replace">
+	              <group col="16" colspan="4">
+	                  <field name="state"/>
+	                  <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-go-forward"/>
+	                  <button name="invoice_corrected" states="invoice_except" string="Ignore Exception" icon="gtk-apply"/>
+	                  <button name="ship_recreate" states="shipping_except" string="Recreate Packing" icon="gtk-ok"/>
+	                  <button name="ship_corrected" states="shipping_except" string="Ignore Exception" icon="gtk-apply"/>
+	                  <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
+	                  <button name="manual_invoice" states="manual" string="Create Final Invoice" icon="gtk-go-forward" type="object"/>
+	                  <button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>
+	                  <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
+	                  <button name="cancel" states="draft,cc_auth" string="Cancel Order" icon="gtk-cancel"/>
+	                  <button name="invoice_cancel" states="invoice_except" string="Cancel Order" icon="gtk-cancel"/>
+	                  <button name="order_confirm" states="draft" string="Confirm Order" icon="gtk-apply"/>
+	                  <button  icon="gtk-apply" string="Pay" type="object" name="pay" states="progress"/>
+	              </group>
+              </xpath>
+            </field>
+        </record>
+        
+        <!--  Partner -->
+        <record id="res_partner_bank_changes_for_credit_card_01" model="ir.ui.view">
+            <field name="name">res_partner_bank_changes_for_credit_card_01</field>
+            <field name="model">res.partner</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.view_partner_property_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='bank_ids']//field[@name='state_id']" position="after">
+				<group string="Credit Card Information" colspan="4" cols="4">
+					 <field name="cc_number"/>
+                     <field name="cc_e_d_month"/>
+                     <field name="cc_e_d_year"/>
+                     <field name="cc_v"/>
+				</group>
+				</xpath>
+            </field>
+        </record>
+    </data>
+</openerp>

=== added file 'account_payment_creditcard/account_voucher.py'
--- account_payment_creditcard/account_voucher.py	1970-01-01 00:00:00 +0000
+++ account_payment_creditcard/account_voucher.py	2012-10-16 09:27:13 +0000
@@ -0,0 +1,301 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 NovaPoint Group LLC (<http://www.novapointgroup.com>)
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
+#
+#    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 3 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, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from osv import osv, fields
+import rsa_encrypt
+import base64
+
+
+class AuthnetAIMError(Exception):
+    def __init__(self, value):
+        self.parameter = value
+    def __str__(self):
+        return str(self.parameter)
+
+class account_voucher(osv.osv):
+
+    def setParameter(self, parameters={}, key=None, value=None):
+
+        if key != None and value != None and str(key).strip() != '' and str(value).strip() != '':
+            parameters[key] = str(value).strip()
+        else:
+            raise AuthnetAIMError('Incorrect parameters passed to setParameter(): {0}:{1}'.format(key, value))
+        return parameters
+    
+    def cancel_cc(self, cr, uid, ids, context=None):
+        return self.write(cr, uid, ids, { 'cc_number':'',
+                                       'cc_e_d_month':'',
+                                       'cc_e_d_year':'',
+                                       'cc_v':'',
+                                       'cc_auth_code':'',
+                                       'cc_trans_id':'', })
+        
+    def authorize(self, cr, uid, ids, context=None):
+#        self.do_transaction(cr, uid, ids,refund=False, context=context)
+        return False
+
+    def cc_refund(self, cr, uid, ids, context=None):
+#        self.do_transaction(cr, uid, ids, refund=True,context=context)
+        return True
+
+    def _get_zip(self, cr, uid, ids, zip_id, context={}):
+        if zip_id:
+                zip_code = self.pool.get('address.zip').browse(cr, uid, zip_id)
+                return zip_code.zipcode
+        return ''
+    
+    def _get_country(self, cr, uid, ids, country_id, context={}):
+          if country_id:
+              country = self.pool.get('res.country').browse(cr, uid, country_id)
+              return country.name
+          return ''
+
+    def _get_state(self, cr, uid, ids, state_id, context={}):
+        if state_id:
+              state = self.pool.get('res.country.state').browse(cr, uid, state_id)
+              return state.name
+        return ''
+
+    def _get_cardholder_details(self, cr, uid, ids, partner_id, context={}):
+        ret = {}
+        if partner_id:
+            partner = self.pool.get('res.partner').browse(cr, uid, partner_id)
+            ret = {'name':partner.name,
+                'street':partner.address[0].street,
+                'street2':partner.address[0].street2,
+                'city':partner.address[0].city,
+                'country':self._get_country(cr, uid, ids, partner.address[0].country_id.id),
+                "zip":partner.address[0].zip,
+                "state":self._get_state(cr, uid, ids, partner.address[0].state_id.id),
+                'title':partner.title and partner.title.name
+                }
+        return ret
+
+    def create(self, cr, uid, vals, context=None):
+        """ 
+            Encrypt credit card number before writing to database
+            @param self : The object pointer
+            @param cr: A database cursor
+            @param uid: ID of the user currently logged in
+            @param vals: Dictionary of Values.
+            @param context: A standard dictionary
+            @return:ID of newly created record.
+        """
+        if context is None:
+            context = {}
+        if vals.get('cc_number', False):
+            res = rsa_encrypt.encrypt(vals.get('cc_number', False))
+            res['cc_number'] = res['enc_value']
+            del res['enc_value']
+            vals.update(res)
+        result = super(account_voucher, self).create(cr, uid, vals, context)
+        return result
+    
+    def write(self, cr, uid, ids, vals, context=None):
+        '''
+            Encrypt credit card number before writing to database
+            @param self : The object pointer
+            @param cr: A database cursor
+            @param uid: ID of the user currently logged in
+            @param ids: List of ids selected
+            @param vals: Dictionary of Values.
+            @param context: A standard dictionary
+            @return:True.
+        '''
+        if context is None:
+            context = {}
+        context.update({'cc_no':'no_mask'})
+        if not isinstance(ids,list):
+            ids = [ids]
+        for record in self.browse(cr, uid, ids, context=context):
+            if vals.get('cc_number', False):
+                res = rsa_encrypt.encrypt(vals.get('cc_number', False), record.key)
+                res['cc_number'] = res['enc_value']
+                del res['enc_value']
+                vals.update(res)
+        result = super(account_voucher, self).write(cr, uid, ids, vals, context)
+        return result
+    
+    def read(self, cr, uid, ids, fields=None, context=None, load='_classic_read'):
+        '''
+            Decrypt credit card number after reading from database and display last four digits if there is 
+            no no_mask in context
+            @param self : The object pointer
+            @param cr: A database cursor
+            @param uid: ID of the user currently logged in
+            @param ids: List of ids selected
+            @param fields: List of fields
+            @param context: A standard dictionary
+            @param load: a parameter used for reading the values of functional fields
+            @return:List of dictionary of fields,values pair
+        '''
+        if context is None:
+            context = {}
+        if 'cc_number' in fields and 'key' not in fields:
+            fields.append('key')
+        vals = super(account_voucher, self).read(cr, uid, ids, fields, context, load)
+        for val in vals:
+            if val.get('cc_number', False) :
+                dec_data = rsa_encrypt.decrypt(val.get('cc_number', False), val.get('key', False))
+                val['cc_number'] = dec_data
+                if context.get('cc_no', '') != 'no_mask':
+                    i = len(val['cc_number']) - 4
+                    val['cc_number'] = 'X' * i + val['cc_number'][-4:len(val['cc_number'])]
+        return vals
+
+
+    def copy(self, cr, uid, id, default=None, context=None):
+        """Overrides orm copy method
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case’s IDs
+        @param context: A standard dictionary for contextual values
+        """
+        if default is None:
+            default = {}
+        default.update({'cc_number': '', 'cc_length': 0, 'cc_v':'', 'cc_e_d_month':'', 'cc_e_d_year':''})
+        return super(account_voucher, self).copy(cr, uid, id, default=default, context=context)
+
+
+    def oncahnge_pre_authorize(self, cr, uid, ids, cc_p_authorize, context={}):
+        if cc_p_authorize:
+            return{'value':{'cc_charge':False, 'cc_p_authorize':True } }
+        else:
+            return{'value':{'cc_charge':True, 'cc_p_authorize':False } }
+
+    def oncahnge_cc_charge(self, cr, uid, ids, cc_charge, context={}):
+        if cc_charge:
+            return{'value':{'cc_charge':True, 'cc_p_authorize':False } }
+        else:
+            return{'value':{'cc_charge':False, 'cc_p_authorize':True } }
+
+    _inherit = 'account.voucher'
+    _columns = {
+        'cc_name':fields.char('Cardholders Name', size=32,),
+        'cc_b_addr_1':fields.char('Billing Address1', size=32,),
+        'cc_b_addr_2':fields.char('Billing Address2', size=32,),
+        'cc_city': fields.char('City', size=32,),
+        'cc_state':fields.char('State', size=32,),
+        'cc_zip':fields.char('Postal/Zip', size=32,),
+        'cc_country':fields.char('Country', size=32,),
+        'cc_order_date':fields.date('Order Date',),
+        'cc_order_amt':fields.float('Order Amt',),
+        'cc_number':fields.char('Credit Card Number', size=256),
+        'cc_v':fields.char('Card Code Verification', size=32,),
+        'cc_e_d_month':fields.char('Expiration Date MM', size=32),
+        'cc_e_d_year':fields.char('Expiration Date YY', size=32),
+        'cc_comment':fields.char('Comment', size=128,),
+        '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_info_hide':fields.boolean('Credit Info Hide'),
+        'cc_status':fields.text('Status Message'),
+        'cc_details_autofill':fields.boolean('Credit Card Details Auto Fill'),
+        'cc_reseller':fields.boolean('Reseller'),
+        'rel_sale_order_id':fields.many2one('sale.order', 'Related Sale Order'),
+        'cc_trans_id':fields.char('Transaction ID', size=128),
+        'cc_bank':fields.many2one('res.bank', 'Bank'),
+        'cc_details':fields.many2one('res.partner.bank', 'Bank'),
+        'cc_length':fields.integer('CC Length'),
+        'cc_transaction':fields.boolean('Transaction Done'),
+        'key':fields.char('Encryption Key', size=1024,
+                          help="The Key used to Encrypt the Credit Card Number"),   
+    }
+    _defaults = {
+        'cc_info_hide': lambda * a: True,
+        'cc_p_authorize': lambda * a: True,
+    }
+
+
+    def onchange_cc_details(self, cr, uid, ids, cc_details, context={}):
+        dic = {}
+        if cc_details:
+            context['cc_no'] = 'no_mask'
+            bank = self.pool.get('res.partner.bank').browse(cr, uid, cc_details, context=context)
+            dic['cc_e_d_month'] = bank.cc_e_d_month
+            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}
+
+
+    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)
+        if not res.has_key('value'):
+            res['value'] = {}
+        jorurnal_cc_allow = False
+        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']
+            res['value']['cc_name'] = cardholder_details['name']
+            res['value']['cc_b_addr_1'] = cardholder_details['street']
+            res['value']['cc_b_addr_2'] = cardholder_details['street2']
+            res['value']['cc_city'] = cardholder_details['city']
+            res['value']['cc_country'] = cardholder_details['country']
+            res['value']['cc_zip'] = cardholder_details['zip']
+            res['value']['cc_state'] = cardholder_details['state']
+            res['value']['cc_reseller'] = cardholder_details['title'] == 'Reseller' and True or False
+            res['value']['cc_save_card_details'] = False
+        if jorurnal_cc_allow:
+            res['value']['cc_info_hide'] = False
+        else:
+            res['value']['cc_info_hide'] = True
+
+        if not context:
+            context = {}
+        context.update({'sale_id':sale_id})
+        if not sale_id:
+            sale_id = context.get('sale_id')
+        if sale_id and res['value'].get('line_cr_ids') :
+            sale = self.pool.get('sale.order').browse(cr, uid, sale_id, context=context)
+            lines = []
+            for line in res['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)
+            res['value']['line_cr_ids'] = lines
+        
+        return res
+account_voucher()
+
+class res_company(osv.osv):
+    '''
+    Add credit card details on company configuration
+    '''
+    _inherit = "res.company"
+    _columns = {
+        'cc_login': fields.char('CreditCard Login ID', size=64),
+        'cc_transaction_key': fields.char('Transaction Key', size=64),
+        'cc_testmode': fields.boolean('Test Mode'),
+        'cc_journal_id':fields.many2one('account.journal', 'Payment Method', help="The default payment method on payment voucher open using the Pay button from sale order."),
+        'cc_refund_journal_id' : fields.many2one('account.journal', 'Refund Journal', help="The default refund journal for credit card payments.")
+    }
+res_company()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_payment_creditcard/account_voucher_view.xml'
--- account_payment_creditcard/account_voucher_view.xml	1970-01-01 00:00:00 +0000
+++ account_payment_creditcard/account_voucher_view.xml	2012-10-16 09:27:13 +0000
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <record id="account_voucher_changes_for_credit_card_01" model="ir.ui.view">
+            <field name="name">account_voucher_changes_for_credit_card_01</field>
+            <field name="model">account.voucher</field>
+            <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, context, 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, context, rel_sale_order_id )</attribute>
+				</xpath>
+            </field>
+        </record>
+        
+        <record id="account_voucher_changes_for_credit_card_02" model="ir.ui.view">
+        	<field name="name">account_voucher_changes_for_credit_card_02</field>
+            <field name="model">account.voucher</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account_voucher_changes_for_credit_card_01"/>
+            <field name="arch" type="xml">
+                <xpath expr="//notebook[@colspan='4']" position="inside">
+
+                     <page string="Credit Card Info"  attrs="{'invisible': [('cc_info_hide','=',True)]}"  >
+						<group string="Cardholder details">
+							<field name="cc_info_hide" invisible="True"/>
+	                     	<field name="cc_name" colspan='4'  attrs="{'readonly': [('state','!=','draft')]}"/>
+							 <field name="cc_b_addr_1" attrs="{'readonly': [('state','!=','draft')]}"/>
+							 <field name="cc_b_addr_2" attrs="{'readonly': [('state','!=','draft')]}"/>
+							<field name="cc_city" attrs="{'readonly': [('state','!=','draft')]}"/>
+							<field name="cc_state" attrs="{'readonly': [('state','!=','draft')]}"/>
+							<field name="cc_zip" attrs="{'readonly': [('state','!=','draft')]}"/>
+							<field name="cc_country" attrs="{'readonly': [('state','!=','draft')]}"/>
+						</group>
+						<group>
+						<field name="rel_sale_order_id" readonly="1"/>
+						</group>
+						<newline/>
+						<newline/>
+
+						<group>
+							<field name="cc_order_date"  attrs="{'readonly': [('state','!=','draft')]}"/>
+							<field name="cc_order_amt" attrs="{'readonly': [('state','!=','draft')]}" />
+						</group>
+						<newline/>
+						<group>
+
+							<field name="cc_details"  attrs="{'readonly': [('state','!=','draft')]}" string="CreditCard Details Auto Fill" domain="[('cc_number','!=',False),('partner_id','=',partner_id)]" on_change="onchange_cc_details(cc_details)"/>
+						</group>
+						<newline/>
+						<group>
+							<field name="cc_number" attrs="{'required':[('cc_info_hide','!=',True)],'readonly': [('state','!=','draft')]}" colspan="4"/><newline/>
+							<field name="cc_e_d_month" attrs="{'required':[('cc_info_hide','!=',True)],'readonly': [('state','!=','draft')]}"/>
+							<field name="cc_e_d_year" attrs="{'required':[('cc_info_hide','!=',True)],'readonly': [('state','!=','draft')]}"/>
+							<field name="cc_v" attrs="{'required':[('cc_info_hide','!=',True)],'readonly': [('state','!=','draft')]}"/>
+							<button  icon="terp-camera_test" name="authorize" string="Authorize"  type="object" colspan="2" attrs="{'readonly': [('cc_transaction','!=',False),('state','!=','draft') ] , 'invisible' : [('cc_info_hide','=',True),('state','=','draft')] }" />
+							<!--field name="cc_type" widget="selection"  attrs="{'required':[('cc_info_hide','!=',True)]}"/-->
+							<newline/>
+							<field name="cc_comment" colspan="4"/>
+							<field name="cc_reseller" invisible="1"/>
+							<field name="cc_bank" attrs="{'invisible': [('cc_save_card_details','=',False)]}"/>
+							<field name="cc_save_card_details" attrs="{'readonly': [('state','!=','draft')]}" />
+							<field name="cc_ecommerce_sale" attrs="{'readonly': [('state','!=','draft')]}" />
+						</group>
+						<newline/>
+						<group>
+							<field name="cc_auth_code" readonly="1"/>
+						</group>
+						<group colspan='3'  string="Type of transaction">
+							<field name="cc_p_authorize" on_change="oncahnge_pre_authorize(cc_p_authorize)"  attrs="{'readonly': [('state','!=','draft')]}"/>
+							<field name="cc_charge" on_change="oncahnge_cc_charge(cc_charge)"   attrs="{'readonly': [('state','!=','draft')]}"/>
+						</group>
+							<newline/>
+							 <button name="cancel_cc" string="Cancel" type="object"  states="draft"/>
+							 <button name="cc_refund" string="Refund" type="object"   attrs="{'readonly': [('cc_transaction','!=',True)]}" groups="account_payment_creditcard.group_cc_mgr"/>
+						 	 <field name="cc_transaction" invisible="1"/>
+							 <newline/>
+						 <group>
+						 	<field name="cc_status" colsapn="4" readonly="1"/>
+						 </group>
+					  </page>
+				</xpath>
+				<xpath expr="//group[@col='10']" position="inside" >
+            		<button  icon="terp-camera_test" name="authorize" string="Authorize"  type="object" colspan="2" attrs="{'readonly': [('cc_transaction','!=',False),('state','!=','draft') ] , 'invisible' : [('cc_info_hide','=',True),('state','=','draft')] }" />
+				</xpath>
+            </field>
+        </record>
+
+		<!-- Company Form -->
+        <record id="cc_company" model="ir.ui.view">
+            <field name="name">res.company.cc.config</field>
+            <field name="model">res.company</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_company_form"/>
+            <field name="arch" type="xml">
+                <page string="Configuration" position="inside">
+                	<newline/>
+                	<separator string="Credit Card Details" colspan="4"/>
+                	<newline/>
+                   	<field name="cc_transaction_key" password="1"/>
+                   	<field name="cc_login"/>
+                   	<field name="cc_testmode"/>
+                   	<field name="cc_journal_id"  domain="[('type','in',('bank','cash'))]" />
+                   	<field name="cc_refund_journal_id" domain="[('type','=','sale_refund')]" />
+                	<newline/>
+                </page>
+            </field>
+        </record>
+
+		<!--  Bank-->
+        <record id="view_partner_bank_form_inherit" model="ir.ui.view">
+            <field name="name">res.partner.bank.form.inherit</field>
+            <field name="model">res.partner.bank</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_partner_bank_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='state_id']" position="replace">
+					<group string="Credit Card Information" colspan="4" cols="4">
+						 <field name="cc_number"/>
+	                     <!--field name="cc_type"/-->
+	                     <field name="cc_e_d_month"/>
+	                     <field name="cc_e_d_year"/>
+                     	<field name="cc_v"/>
+					</group>
+				</xpath>
+            </field>
+        </record>
+        <record id="view_partner_bank_tree_inherit" model="ir.ui.view">
+            <field name="name">res.partner.bank.tree.inherit</field>
+            <field name="model">res.partner.bank</field>
+            <field name="type">tree</field>
+            <field name="inherit_id" ref="base.view_partner_bank_tree"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='owner_name']" position="after">
+					 <field name="cc_number"/>
+                     <!--field name="cc_type"/-->
+                     <field name="cc_e_d_month"/>
+                     <field name="cc_e_d_year"/>
+				</xpath>
+            </field>
+        </record>
+
+		<!--  CreditCard Type -->
+        <menuitem id="menu_cc" name="Credit Card" parent="account.menu_finance_configuration"/>
+
+      </data>
+</openerp>
\ No newline at end of file

=== added file 'account_payment_creditcard/invoice.py'
--- account_payment_creditcard/invoice.py	1970-01-01 00:00:00 +0000
+++ account_payment_creditcard/invoice.py	2012-10-16 09:27:13 +0000
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 NovaPoint Group LLC (<http://www.novapointgroup.com>)
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
+#
+#    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 3 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, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from osv import osv, fields
+
+class account_invoice(osv.osv):
+
+    _inherit = 'account.invoice'
+    _columns = {
+        'credit_card' : fields.boolean('Credit Card', readonly=True)
+    }
+    
+    _defaults = {
+        'credit_card' : False
+    }
+account_invoice()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

=== added file 'account_payment_creditcard/invoice_view.xml'
--- account_payment_creditcard/invoice_view.xml	1970-01-01 00:00:00 +0000
+++ account_payment_creditcard/invoice_view.xml	2012-10-16 09:27:13 +0000
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>       
+    
+    	
+    	<record id="view_account_invoice_filter_inherit" model="ir.ui.view">
+            <field name="name">account.invoice.search.inherit</field>
+            <field name="model">account.invoice</field>
+            <field name="type">search</field>
+            <field name="inherit_id"  ref="account.view_account_invoice_filter" />
+            <field name="arch" type="xml">
+				<xpath expr="/search/group/filter[@name='unpaid']" position="after">
+					<filter name="manual" icon="terp-dolar_ok!" string="Manual Invoices" domain="[('credit_card','=',False)]" help="Unpaid Invoices"/>
+					<filter name="credit" icon="terp-dolar_ok!" string="Credit Card Invoices" domain="[('credit_card','=',True)]" help="Unpaid Invoices"/>
+				</xpath>
+            </field>
+    	</record>
+    	
+    	
+    	<record id="account.action_invoice_tree1" model="ir.actions.act_window">
+            <field name="context">{'type':'out_invoice', 'journal_type': 'sale','search_default_manual':1}</field>
+        </record>
+    	
+    	
+</data>
+</openerp>
\ No newline at end of file

=== added file 'account_payment_creditcard/rsa_encrypt.py'
--- account_payment_creditcard/rsa_encrypt.py	1970-01-01 00:00:00 +0000
+++ account_payment_creditcard/rsa_encrypt.py	2012-10-16 09:27:13 +0000
@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 NovaPoint Group LLC (<http://www.novapointgroup.com>)
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
+#
+#    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 3 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, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from Crypto.PublicKey import RSA
+import base64
+import tools
+
+def rsa_enc():
+    """
+    Generate a key for RSA Encryption
+    @return : key
+    """
+    key = RSA.generate(1024)
+    return key
+
+def encrypt(value, key=False):
+    """
+    Encryption using RSA
+    @params value: Value to Encrypt
+    @key: The Key used to Encrypt
+    @return:Dictionary containing the encrypted data and key
+    """
+    res = {}
+    if not key:
+        pub_key = rsa_enc()
+        public_key = pub_key.publickey()
+        enc_data = public_key.encrypt(str(value), 32)
+        res['key'] = base64.encodestring(pub_key.exportKey('DER'))
+    else:
+        privatekey = RSA.importKey(base64.decodestring(key))
+        enc_data = privatekey.encrypt(str(value), 32)
+    res['enc_value'] = base64.encodestring(enc_data[0])
+    return res
+
+def decrypt(value, key):
+    """
+    Decryption using RSA
+    @params value: Value to Decrypt
+    @key: The Key used to Decrypt
+    @return:The decrypted data 
+    """
+    privatekey = RSA.importKey(base64.decodestring(key))
+    return privatekey.decrypt(base64.decodestring(value))

=== added file 'account_payment_creditcard/sale.py'
--- account_payment_creditcard/sale.py	1970-01-01 00:00:00 +0000
+++ account_payment_creditcard/sale.py	2012-10-16 09:27:13 +0000
@@ -0,0 +1,225 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 NovaPoint Group LLC (<http://www.novapointgroup.com>)
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
+#
+#    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 3 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, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+from osv import fields, osv
+from tools.translate import _
+import netsvc
+
+class sale_order(osv.osv):
+    _inherit = "sale.order"
+
+    def onchange_partner_id(self, cr, uid, ids, part_id):
+
+        result = super(sale_order, self).onchange_partner_id(cr, uid, ids, part_id).get('value', {})
+        print result
+#        if part_id:
+#            result.update({'payment_method':'cc_pre_auth', 'order_policy':'credit_card'})#Default values for the shiping policy
+#            partner=self.pool.get('res.partner').browse(cr,uid,part_id)
+#            if partner.title and (partner.title.name=="Reseller" or partner.title.shortcut == 'reseller'):
+#                result.update({'payment_method':'invoice','order_policy':'postpaid'})
+        return {'value': result}
+    
+    def on_change_payment_method(self, cr, uid, ids, payment_method,order,part):
+        order_policy = order
+#        if payment_method:
+#            if payment_method in ('invoice'):
+#                order_policy = 'picking'
+#            elif payment_method in ('no_charge'):
+#                order_policy = 'no_charge'
+#            elif payment_method == 'cc_pre_auth':
+#                order_policy = 'credit_card'
+#            elif payment_method =='pay_pal':
+#                order_policy = 'prepaid'
+#            {'value': {'order_policy':order_policy}}
+        return {'value': {}}
+    
+    def pay(self, cr, uid, ids, context=None):
+        '''
+        Display Pay invoice form when clicking on Pay button from sale order
+        '''
+        
+        wf_service = netsvc.LocalService("workflow")
+            
+        invoice_id = False
+        so = self.browse(cr, uid, ids[0], context=context)
+        for invoice in so.invoice_ids:
+            if invoice.state != 'open':
+                wf_service.trg_validate(uid, 'account.invoice', invoice.id, 'invoice_open', cr)
+            invoice_id = invoice.id
+        
+        if not ids: return []
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        #so = self.browse(cr, uid, ids[0], context=context)
+        self.pool.get('account.invoice').write(cr, uid, invoice_id, {'credit_card': True}, context=context)
+        return {
+            'name':_("Pay Invoice"),
+
+            'view_mode': 'form',
+            'view_id': False,
+            'view_type': 'form',
+            'res_model': 'account.voucher',
+            'type': 'ir.actions.act_window',
+            'nodestroy': True,
+            'target': 'current',
+            'domain': '[]',
+            'context': {
+                'default_partner_id': so.partner_id.id,
+                'default_amount': so.amount_total,
+                'default_name':so.name,
+                'close_after_process': True,
+                'invoice_type':'out_invoice',
+                'default_rel_sale_order_id': so.id,
+                'default_cc_order_amt': so.amount_total,
+                'default_cc_order_date': so.date_order,
+                '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,
+                }
+        }
+
+    def _invoiced_search(self, cursor, user, obj, name, args, context=None):
+        if not len(args):
+            return []
+        clause = ''
+        sale_clause = ''
+        no_invoiced = False
+        for arg in args:
+            if arg[1] == '=':
+                if arg[2]:
+                    clause += 'AND inv.state = \'paid\''
+                else:
+                    clause += 'AND inv.state != \'cancel\' AND sale.state != \'cancel\'  AND inv.state <> \'paid\'  AND rel.order_id = sale.id '
+                    sale_clause = ',  sale_order AS sale '
+                    no_invoiced = True
+
+        cursor.execute('SELECT rel.order_id ' \
+                'FROM sale_order_invoice_rel AS rel, account_invoice AS inv ' + sale_clause + \
+                'WHERE rel.invoice_id = inv.id ' + clause)
+        res = cursor.fetchall()
+        if no_invoiced:
+            cursor.execute('SELECT sale.id ' \
+                    'FROM sale_order AS sale ' \
+                    'WHERE sale.id NOT IN ' \
+                        '(SELECT rel.order_id ' \
+                        'FROM sale_order_invoice_rel AS rel) and sale.state != \'cancel\'')
+            res.extend(cursor.fetchall())
+        if not res:
+            return [('id', '=', 0)]
+        return [('id', 'in', [x[0] for x in res])]
+
+    def _invoiced(self, cursor, user, ids, name, arg, context=None):
+        '''
+        Update pay boolean field on sale order if creditcard payment is done
+        '''
+        ret = super(sale_order, self)._invoiced(cursor, user, ids, name, arg, context=context)
+        for key, value in ret.items():
+            if not value:
+                so = self.browse(cursor, user, key, context=context)
+                if so.order_policy == 'credit_card' and so.rel_account_voucher_id:
+                    if so.rel_account_voucher_id.state == 'posted':
+                        ret[key] = True
+                    
+        return ret
+    
+    def write(self, cr, uid, ids, vals, context=None):
+        res = super(sale_order, self).write(cr, uid, ids, vals, context=context)
+        cr.commit()
+        for sale_obj in self.browse(cr, uid, ids, context=context):
+            if sale_obj.shipped and sale_obj.invoiced and sale_obj.state != 'done':
+                sale_obj.write({'state':'done'})
+                
+        return res
+    
+    def _get_invoice(self, cr, uid, ids, context=None):
+        return self.pool.get('sale.order').search(cr, uid, [('invoice_ids', 'in', ids)], context=context)
+
+    def _get_voucher(self, cr, uid, ids, context=None):
+        result = {}
+        for line in self.pool.get('account.voucher').browse(cr, uid, ids, context=context):
+            if line.rel_sale_order_id:
+                result[line.rel_sale_order_id.id] = True
+        return result.keys()
+    
+    _inherit = "sale.order"
+    _columns = {
+
+        'payment_method':fields.selection([('cc_pre_auth', 'Credit Card – PreAuthorized'),
+                                           ('invoice', 'Invoice'),
+                                           ('cod', 'COD'),
+                                           ('p_i_a', 'Pay In Advance'), ], 'Payment Method'),
+        'order_policy': fields.selection([
+            ('prepaid', 'Payment Before Delivery'),
+            ('manual', 'Shipping & Manual Invoice'),
+            ('postpaid', 'Invoice On Order After Delivery'),
+            ('picking', 'Invoice From The Picking'),
+        ('credit_card', 'CC Pre-Auth Pick Charge Ship'),
+        ], 'Shipping Policy', required=True, readonly=True, states={'draft': [('readonly', False)]},
+                    help="""The Shipping Policy is used to synchronise invoice and delivery operations.
+  - The 'Pay Before delivery' choice will first generate the invoice and then generate the picking order after the payment of this invoice.
+  - The 'Shipping & Manual Invoice' will create the picking order directly and wait for the user to manually click on the 'Invoice' button to generate the draft invoice.
+  - The 'Invoice On Order After Delivery' choice will generate the draft invoice based on sales order after all picking lists have been finished.
+  - The 'Invoice From The Picking' choice is used to create an invoice during the picking process."""),
+        'state': fields.selection([
+            ('draft', 'Quotation'),
+            ('waiting_date', 'Waiting Schedule'),
+            ('manual', 'Manual In Progress'),
+            ('progress', 'In Progress'),
+            ('shipping_except', 'Shipping Exception'),
+            ('invoice_except', 'Invoice Exception'),
+            ('done', 'Done'),
+            ('cancel', 'Cancelled'),
+            ('cc_auth', 'Draft Authorized')
+            ], 'Order State', readonly=True, help="Gives the state of the quotation or sales order. \nThe exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the date 'Ordered Date'.", select=True),
+        'cc_pre_auth':fields.boolean('Creditcard Pre-authorised'),
+        'rel_account_voucher_id':fields.many2one('account.voucher', 'Related Payment'),
+        'invoiced': fields.function(_invoiced, method=True, string='Paid',
+        type='boolean', help="It indicates that an invoice has been paid.",
+        store={
+                 'account.invoice'  : (_get_invoice, ['state'], 20),
+                 'sale.order'       : (lambda self, cr, uid, ids, c={}: ids, ['state'], 20),
+                 'account.voucher'  : (_get_voucher, ['state'], 20),
+                 }),
+        'cc_ship_refund' : fields.boolean('Ship Refunded', readonly=True),
+    }
+    
+    def copy(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
+        if context is None:
+            context = {}
+        default = default.copy()
+        default['rel_account_voucher_id'] = False
+        default['cc_pre_auth'] = False
+        default['cc_ship_refund'] = False
+        return super(sale_order, self).copy(cr, uid, id, default, context=context)
+    
+    _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={}):
+            if sale_obj.order_policy == 'credit_card':
+                for pick in sale_obj.picking_ids:
+                    self.pool.get('stock.picking').write(cr, uid, [pick.id], {'invoice_state': 'credit_card'}, context={})
+        return ret
+sale_order()

=== added directory 'account_payment_creditcard/security'
=== added file 'account_payment_creditcard/security/account_security.xml'
--- account_payment_creditcard/security/account_security.xml	1970-01-01 00:00:00 +0000
+++ account_payment_creditcard/security/account_security.xml	2012-10-16 09:27:13 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data>
+	
+	    <record id="group_cc_mgr" model="res.groups">
+	        <field name="name">CreditCard / Manager</field>
+	    </record>
+
+	</data>
+</openerp>

=== added file 'account_payment_creditcard/stock_picking.py'
--- account_payment_creditcard/stock_picking.py	1970-01-01 00:00:00 +0000
+++ account_payment_creditcard/stock_picking.py	2012-10-16 09:27:13 +0000
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 NovaPoint Group LLC (<http://www.novapointgroup.com>)
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
+#
+#    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 3 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, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+
+from osv import fields, osv
+
+class stock_picking(osv.osv):
+
+    _inherit = "stock.picking"
+    '''
+    Adding credit card preauthorised and payed check box on delivery order
+    '''
+    def _get_sale_order(self, cr, uid, ids, context={}):
+        result = []
+        move_ids = []
+        picking_obj = self.pool.get('stock.picking')
+        move_obj = self.pool.get('stock.move')
+        for id in ids:
+            stock_pick_ids = picking_obj.search(cr, uid, [('sale_id', '=', id)])
+            if stock_pick_ids:
+                move_ids += move_obj.search(cr, uid, [('picking_id', 'in', stock_pick_ids)])
+        move_ids = list(set(move_ids))
+        return move_ids
+    
+    _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'),
+    }
+
+stock_picking()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_payment_creditcard/stock_picking_view.xml'
--- account_payment_creditcard/stock_picking_view.xml	1970-01-01 00:00:00 +0000
+++ account_payment_creditcard/stock_picking_view.xml	2012-10-16 09:27:13 +0000
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+	<data>
+		<!-- Adding credit card preautohrised and payed check box on delivery order -->
+   		<record id="view_picking_out_form_cc_inherit" model="ir.ui.view">
+            <field name="name">stock.picking.out.form.cc_inherit</field>
+            <field name="model">stock.picking</field>
+            <field name="inherit_id" ref="stock.view_picking_out_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+		         <xpath expr="//field[@name='company_id']" position="after">
+		 			<field name="cc_pre_auth" readonly="1"/>
+		 			<field name="invoiced" readonly="1"/>
+			     </xpath>
+            </field>
+        </record>
+        <!-- Tree -->
+        <record id="view_picking_out_tree_cc_inherit" model="ir.ui.view">
+            <field name="name">stock.picking.out.tree.cc_inherit</field>
+            <field name="model">stock.picking</field>
+            <field name="inherit_id" ref="stock.view_picking_out_tree"/>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+             	<xpath expr="//field[@name='backorder_id']" position="before">
+	  				<field name="cc_pre_auth" readonly="1"/>
+	  				<field name="invoiced" readonly="1"/>
+			     </xpath>
+            </field>
+        </record>
+
+        <record id="view_picking_out_search_inherit" model="ir.ui.view">
+            <field name="name">stock.picking.out.search.inherit</field>
+            <field name="model">stock.picking</field>
+            <field name="type">search</field>
+            <field name="inherit_id" ref="stock.view_picking_out_search"/>
+            <field name="arch" type="xml">
+				<xpath expr="/search/group/filter[@name='to_invoice']" position="after">
+						<separator orientation="vertical"/>
+                        <!--<filter icon="terp-rating-rated" string="Pre-authorized" domain="[('cc_pre_auth','=',True)]" />
+                        <filter icon="terp-rating-rated" string="Paid" domain="[('invoiced','=',True)]" />-->
+                        <filter icon="terp-rating-rated" string="Pre-authorized / Invoiced" domain="['|',('cc_pre_auth','=',True),('invoiced','=',True)]" />
+				</xpath>
+            </field>
+        </record>
+
+	</data>
+</openerp>
\ No newline at end of file

=== modified file 'account_voucher_credits_us/voucher_view.xml'
--- account_voucher_credits_us/voucher_view.xml	2012-06-18 14:26:40 +0000
+++ account_voucher_credits_us/voucher_view.xml	2012-10-16 09:27:13 +0000
@@ -58,7 +58,6 @@
 							<field name="pay" on_change="onchange_pay(amount, pay, amount_unreconciled, parent.line_cr_ids, parent.amount, 
 							                                          credit_used, discount_used, writeoff_amount)"/>
                             <field name="amount" sum="Payment"/>
-                            <field name="discount" />
 							<field name="amount_difference"/>
 							<field name="credit_used"/>
 							<field name="account_id"/>