From 821343fa42b0d41277eea8258cb25a94b8812ee6 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Mon, 6 Sep 2010 16:33:38 +0530
Subject: [PATCH] [FIX] Account Payment: wizard modify as per payment.type obj
 removed [REM] l10n_ch: remove payment.type object data

bzr revid: mra@mra-laptop-20100906110338-8ajnjmtou8wa2mop
---
 .../wizard/account_payment_pay.py             | 35 ++++++++++---------
 addons/l10n_ch/dta_data.xml                   | 12 +------
 2 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/addons/account_payment/wizard/account_payment_pay.py b/addons/account_payment/wizard/account_payment_pay.py
index 5be2574943d..4b41b0dfc89 100644
--- a/addons/account_payment/wizard/account_payment_pay.py
+++ b/addons/account_payment/wizard/account_payment_pay.py
@@ -30,23 +30,24 @@ class account_payment_make_payment(osv.osv_memory):
         If type is manual. just confirm the order.
         """
         obj_payment_order = self.pool.get('payment.order')
-        obj_model = self.pool.get('ir.model.data')
-        obj_act = self.pool.get('ir.actions.act_window')
-        order= obj_payment_order.browse(cr, uid, context['active_id'], context)
-        t = order.mode and order.mode.type.code or 'manual'
-        if t == 'manual' :
-            obj_payment_order.set_done(cr,uid,context['active_id'],context)
-            return {}
-
-        gw = obj_payment_order.get_wizard(t)
-        if not gw:
-            obj_payment_order.set_done(cr,uid,context['active_id'],context)
-            return {}
-
-        module, wizard= gw
-        result = obj_model._get_id(cr, uid, module, wizard)
-        id = obj_model.read(cr, uid, [result], ['res_id'])[0]['res_id']
-        return obj_act.read(cr, uid, [id])[0]
+#        obj_model = self.pool.get('ir.model.data')
+#        obj_act = self.pool.get('ir.actions.act_window')
+#        order = obj_payment_order.browse(cr, uid, context['active_id'], context)
+        return obj_payment_order.set_done(cr, uid, context['active_id'], context)
+#        t = order.mode and order.mode.type.code or 'manual'
+#        if t == 'manual' :
+#            obj_payment_order.set_done(cr,uid,context['active_id'],context)
+#            return {}
+#
+#        gw = obj_payment_order.get_wizard(t)
+#        if not gw:
+#            obj_payment_order.set_done(cr,uid,context['active_id'],context)
+#            return {}
+#
+#        module, wizard= gw
+#        result = obj_model._get_id(cr, uid, module, wizard)
+#        id = obj_model.read(cr, uid, [result], ['res_id'])[0]['res_id']
+#        return obj_act.read(cr, uid, [id])[0]
 
 account_payment_make_payment()
 
diff --git a/addons/l10n_ch/dta_data.xml b/addons/l10n_ch/dta_data.xml
index b441e33a2f6..4a31b0e7c6a 100644
--- a/addons/l10n_ch/dta_data.xml
+++ b/addons/l10n_ch/dta_data.xml
@@ -138,15 +138,5 @@
 	<field name="readonly" eval="False"/>
   </record>
 
-
-  <!-- Define a payment type -->
-  <record model="payment.type" id="payment_type_dta">
-	<field name="name">DTA</field>
-	<field name="code">dta</field>
-	<field name="suitable_bank_types" 
-		   eval="[(6,0,[ref('dta_iban'),ref('bvrbank'),ref('bvrpost'),ref('bvbank'),ref('bvpost')])]"/>
-  </record>
-
-
 </data>
-</openerp>
+</openerp>
\ No newline at end of file