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

[Serpent Consulting Services]

=== modified file 'account_payment_creditcard/stock_picking.py'
--- account_payment_creditcard/stock_picking.py	2012-08-07 11:49:32 +0000
+++ account_payment_creditcard/stock_picking.py	2012-08-20 08:38:21 +0000
@@ -50,8 +50,36 @@
             ("none", "Not Applicable"),
             ("credit_card", "Credit Card"),
             ("cc_refund", "Credit Card Refund")
-            ], "Invoice Control",  select=True, required=True, readonly=True, states={'draft': [('readonly', False)]}),
+            ], "Invoice Control", select=True, required=True, readonly=True, states={'draft': [('readonly', False)]}),
+        'ship_state': fields.selection([
+            ('draft', 'Draft'),
+            ('in_process', 'In Process'),
+            ('ready_pick', 'Ready for Pickup'),
+            ('shipped', 'Shipped'),
+            ('delivered', 'Delivered'),
+            ('void', 'Void'),
+            ('hold', 'Hold'),
+            ('cancelled', 'Cancelled')
+            ], 'Shipping Status', readonly=True, help='The current status of the shipment'),
+        'ship_message': fields.text('Message'),
     }
+    
+    def action_process(self, cr, uid, ids, context=None):
+        voucher_obj = self.pool.get('account.voucher')
+        for deliv_order in self.browse(cr, uid, ids, context=context):
+            do_transaction = True
+            sale = deliv_order.sale_id or False
+            if sale and sale.payment_method == 'cc_pre_auth' and not sale.invoiced:
+                rel_voucher = sale.rel_account_voucher_id or False
+                if rel_voucher and rel_voucher.state != 'posted' and rel_voucher.cc_auth_code:
+                    do_transaction = False
+                    voucher_obj.write(cr, uid, [rel_voucher_id], {'cc_p_authorize': False, 'cc_charge': True})
+                    do_transaction = voucher_obj.authorize(cr, uid, [rel_voucher.id], context=context)
+            if not do_transaction:
+                self.write(cr, uid, ids, {'ship_state': 'hold', 'ship_message': 'Unable to process creditcard payment.'})
+                cr.commit()
+                raise osv.except_osv(_('Final credit card charge cannot be completed!'), _("Please hold shipment and contact customer service."))
+        return super(stock_picking, self).action_process(cr, uid, ids, context=context)
 
 stock_picking()