Merge lp:~serpentcs/openerp-usa/serpentcs-openerp-usa-v7-compatability into lp:openerp-usa

[Serpent Consulting Services]

[lp:~serpentcs/openerp-usa/serpentcs-openerp-usa-v7-compatability]

7. By Krutarth Buch on 2014-03-07

optimizations for v7 compatibility

Unmerged revisions

7. By Krutarth Buch on 2014-03-07

optimizations for v7 compatibility

=== modified file 'account_payment_ccapi_authdotnet/__init__.py'
--- account_payment_ccapi_authdotnet/__init__.py	2014-01-09 18:15:04 +0000
+++ account_payment_ccapi_authdotnet/__init__.py	2014-03-07 18:35:55 +0000
@@ -20,8 +20,9 @@
 #
 ##############################################################################
 
-import account_voucher
-import cc_auth_api
-import stock_return_picking
+from . import account_voucher
+from . import cc_auth_api
+from . import stock_return_picking
+import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account_payment_ccapi_authdotnet/__openerp__.py'
--- account_payment_ccapi_authdotnet/__openerp__.py	2014-01-09 18:15:04 +0000
+++ account_payment_ccapi_authdotnet/__openerp__.py	2014-03-07 18:35:55 +0000
@@ -28,10 +28,11 @@
     """,
     'author': 'NovaPoint Group LLC',
     'website': ' http://www.novapointgroup.com',
-    'depends': ['account_voucher_credits_us'],
+    'depends': ['account_payment_creditcard'],
     'data': [
-           'account_voucher.xml',
-           'security/ir.model.access.csv',
+        'wizard/account_post_voucher.xml',
+        'account_voucher.xml',
+        'security/ir.model.access.csv',
     ],
     'demo': [
     ],

=== modified file 'account_payment_ccapi_authdotnet/account_voucher.py'
--- account_payment_ccapi_authdotnet/account_voucher.py	2014-01-09 18:15:04 +0000
+++ account_payment_ccapi_authdotnet/account_voucher.py	2014-03-07 18:35:55 +0000
@@ -22,12 +22,10 @@
 
 from openerp.osv import osv, fields
 
-class account_voucher(osv.osv):
+class account_voucher(osv.Model):
     
     _inherit = 'account.voucher'
     
     _columns = {
         'origin':fields.char('Origin', size=16, help='Mentions the reference of Sale/Purchase document'),
-    }
-
-account_voucher()
+    }
\ No newline at end of file

=== modified file 'account_payment_ccapi_authdotnet/account_voucher.xml'
--- account_payment_ccapi_authdotnet/account_voucher.xml	2014-01-09 18:15:04 +0000
+++ account_payment_ccapi_authdotnet/account_voucher.xml	2014-03-07 18:35:55 +0000
@@ -23,6 +23,18 @@
             </field>
         </record>
         
+		<record model="ir.ui.view" id="view_vendor_receipt_form_5">
+            <field name="name">account.voucher.receipt.form.5</field>
+            <field name="model">account.voucher</field>
+            <field name="inherit_id" ref="account_voucher.view_vendor_receipt_form"/>
+            <field name="arch" type="xml">
+				<xpath expr="//form/header/button[@name='proforma_voucher']" position="replace">
+                    <button name="%(action_proforma_voucher)d" string="Post" states="draft" type="action" 
+                            attrs="{'invisible': ['|',('cc_info_hide','=',False),('state','&lt;&gt;','draft')]}" icon="terp-camera_test"/>
+				</xpath>
+            </field>
+        </record>
+        
     </data>
 </openerp>
         

=== modified file 'account_payment_ccapi_authdotnet/cc_auth_api.py'
--- account_payment_ccapi_authdotnet/cc_auth_api.py	2014-01-09 18:15:04 +0000
+++ account_payment_ccapi_authdotnet/cc_auth_api.py	2014-03-07 18:35:55 +0000
@@ -48,7 +48,7 @@
             raise AuthnetAIMError('Incorrect parameters passed to setParameter(): {0}:{1}'.format(key, value))
         return parameters
 
-class auth_net_cc_api(osv.osv):
+class auth_net_cc_api(osv.Model):
     _name = "auth.net.cc.api"
     '''
         Class to do credit card transaction
@@ -495,9 +495,7 @@
 
         return ret
 
-auth_net_cc_api()
-
-class account_voucher(osv.osv):
+class account_voucher(osv.Model):
 
     _inherit = 'account.voucher'
     '''
@@ -524,9 +522,7 @@
     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):
+class sale_order(osv.Model):
     _inherit = "sale.order"
 
     def _get_prod_acc(self, product_id, journal_obj, context=False):
@@ -604,6 +600,5 @@
                 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:

=== modified file 'account_payment_ccapi_authdotnet/stock_return_picking.py'
--- account_payment_ccapi_authdotnet/stock_return_picking.py	2014-01-09 18:15:04 +0000
+++ account_payment_ccapi_authdotnet/stock_return_picking.py	2014-03-07 18:35:55 +0000
@@ -108,7 +108,7 @@
 
 stock_return_picking()
 
-class stock_picking(osv.osv):
+class stock_picking(osv.Model):
     
     _inherit = "stock.picking"
     _columns = {
@@ -172,7 +172,6 @@
                     voucher_obj.write(cr, uid, [pick.voucher_id.id], {'cc_refund_amt':amount}, context=context)
                     self.pool.get('auth.net.cc.api').do_this_transaction(cr, uid, [pick.voucher_id.id] , refund=True, context=context)
         return res
-stock_picking()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

=== removed file 'account_payment_ccapi_authdotnet/stock_view.xml'
--- account_payment_ccapi_authdotnet/stock_view.xml	2014-01-09 18:15:04 +0000
+++ account_payment_ccapi_authdotnet/stock_view.xml	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-	<data>
-		
-	</data>
-</openerp>
\ No newline at end of file

=== added directory 'account_payment_ccapi_authdotnet/wizard'
=== added file 'account_payment_ccapi_authdotnet/wizard/__init__.py'
--- account_payment_ccapi_authdotnet/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ account_payment_ccapi_authdotnet/wizard/__init__.py	2014-03-07 18:35:55 +0000
@@ -0,0 +1,26 @@
+# -*- 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 . import account_post_voucher
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

=== added file 'account_payment_ccapi_authdotnet/wizard/account_post_voucher.py'
--- account_payment_ccapi_authdotnet/wizard/account_post_voucher.py	1970-01-01 00:00:00 +0000
+++ account_payment_ccapi_authdotnet/wizard/account_post_voucher.py	2014-03-07 18:35:55 +0000
@@ -0,0 +1,115 @@
+# -*- 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 openerp.osv import fields, osv
+from tools.translate import _
+
+class account_post_voucher(osv.TransientModel):
+    _name = 'account.post.voucher'
+    _description = 'Account Pay Voucher'
+    _columns = {
+        'total_paid': fields.float('Total Received'),
+        'total_allocated': fields.float('Total Allocated'),
+        'ok_to_go': fields.float('OK to Go'),
+    }
+
+    def _get_total_paid(self, cr, uid, context=None):
+        """
+        @param cr: current row of the database
+        @param uid: id of the user currently logged in
+        @param context: context
+        @return: total amount
+        """
+        if context is None:
+            context = {}
+        obj_voucher = self.pool.get('account.voucher')
+        amount = 0.00
+        if context.get('active_id'):
+            amount = obj_voucher.browse(cr, uid, context['active_id'], context=context).amount 
+          
+        return amount
+
+    def _get_total_allocated(self, cr, uid, context=None):
+        """
+        @param cr: current row of the database
+        @param uid: id of the user currently logged in
+        @param context: context
+        @return: total allocated amount
+        """
+        if context is None:
+            context = {}
+        obj_voucher = self.pool.get('account.voucher')
+        voucher = obj_voucher.browse(cr, uid, context.get('active_id', []), context=context)
+        total_allocated = 0.0
+        for line in voucher.line_cr_ids:
+            total_allocated += line.amount
+        
+        return total_allocated
+
+    def _get_ok_to_go(self, cr, uid, context=None):
+        """
+        @param cr: current row of the database
+        @param uid: id of the user currently logged in
+        @param context: context
+        @return: 
+        """
+        if context is None:
+            context = {}
+        obj_voucher = self.pool.get('account.voucher')
+        voucher = obj_voucher.browse(cr, uid, context.get('active_id', []), context=context)
+        total_allocated = 0.0
+        if context.get('invoice_type', '') == 'out_refund':
+            return total_allocated
+        for line in voucher.line_cr_ids:
+            total_allocated += line.amount
+        return total_allocated - voucher.amount
+
+    _defaults = {
+        'total_paid': _get_total_paid,
+        'total_allocated': _get_total_allocated,
+        'ok_to_go': _get_ok_to_go,
+    }
+    
+    def onchange_ok_to_go(self, cr, uid, ids, ok_to_go, context=None):
+        """
+        @param cr: current row of the database
+        @param uid: id of the user currently logged in
+        @param ids: ids of the selected records
+        @param ok_to_go: 
+        @param context: context
+        @return: 
+        """
+        if ok_to_go > 0.0:
+            return {'warning': {'title': _('Overallocated invoices'), 'message': _('Reduce allocations to match Total Receipt')}}
+        return {'value': {}}
+        
+    def launch_wizard(self, cr, uid, ids, context=None):
+        """
+        Don't allow post if total_allocated > total_paid.
+        """
+        if context is None:
+            context = {}
+        obj_voucher = self.pool.get('account.voucher')
+        obj_voucher.action_move_line_create(cr, uid, context.get('active_ids', []), context=context)
+        return {}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_payment_ccapi_authdotnet/wizard/account_post_voucher.xml'
--- account_payment_ccapi_authdotnet/wizard/account_post_voucher.xml	1970-01-01 00:00:00 +0000
+++ account_payment_ccapi_authdotnet/wizard/account_post_voucher.xml	2014-03-07 18:35:55 +0000
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+     <data>
+          <!--  Account post voucher Form -->
+          
+        <record id="account_voucher_post_view" model="ir.ui.view">
+             <field name="name">account.post.voucher.form</field>
+             <field name="model">account.post.voucher</field>
+             <field name="arch" type="xml">
+				<form string="Post Voucher">
+					<group colspan="2" col="4">
+						<field name="total_paid" readonly="True"/>
+						<field name="total_allocated" readonly="True"/>
+						<field name="ok_to_go" invisible="True" on_change="onchange_ok_to_go(ok_to_go)"/>
+					</group>
+					<group height="100" width="320">
+						<separator string="Confirm Amounts?"/>
+						<newline/>
+						<group  colspan="2" col="4">
+							<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+							<button name="launch_wizard" string="Yes" type="object" attrs="{'invisible':[('ok_to_go', '>', 0.0)]}" icon="gtk-ok" default_focus="1"/>
+		 				</group>
+ 					</group>
+				</form>
+			</field>
+		</record>
+
+        <record id="action_proforma_voucher" model="ir.actions.act_window">
+            <field name="name">Post Voucher</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.post.voucher</field>
+			<field name="view_id" ref="account_voucher_post_view"/>
+            <field name="target">new</field>
+        </record>
+
+	</data>
+</openerp>

=== modified file 'account_payment_cim_authdotnet/__init__.py'
--- account_payment_cim_authdotnet/__init__.py	2014-01-09 18:15:04 +0000
+++ account_payment_cim_authdotnet/__init__.py	2014-03-07 18:35:55 +0000
@@ -20,10 +20,10 @@
 #
 ##############################################################################
 
-import res_company
-import partner
-import account_voucher
-import cim_transaction
+from . import res_company
+from . import partner
+from . import account_voucher
+from . import cim_transaction
 import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account_payment_cim_authdotnet/__openerp__.py'
--- account_payment_cim_authdotnet/__openerp__.py	2014-01-09 18:15:04 +0000
+++ account_payment_cim_authdotnet/__openerp__.py	2014-03-07 18:35:55 +0000
@@ -29,17 +29,17 @@
     """,
     'author': 'NovaPoint Group LLC',
     'website': ' http://www.novapointgroup.com',
-    'depends': ['account_payment_ccapi_authdotnet'],
+    'depends': ['account_payment_creditcard'],
     'data': [
-            'security/ir.model.access.csv',
-            'wizard/edit_payment_profile_view.xml',
-            'wizard/make_transaction_view.xml',
-            'wizard/delete_payment_profile_view.xml',
-            'wizard/create_payment_profile_view.xml',
-            'cim_transaction_view.xml',
-            'partner_view.xml',
-            'company_view.xml',
-            'account_voucher_view.xml'
+        'security/ir.model.access.csv',
+        'wizard/edit_payment_profile_view.xml',
+        'wizard/make_transaction_view.xml',
+        'wizard/delete_payment_profile_view.xml',
+        'wizard/create_payment_profile_view.xml',
+        'cim_transaction_view.xml',
+        'partner_view.xml',
+        'company_view.xml',
+        'account_voucher_view.xml'
     ],
     'demo': [
     ],

=== modified file 'account_payment_cim_authdotnet/account_voucher.py'
--- account_payment_cim_authdotnet/account_voucher.py	2014-01-09 18:15:04 +0000
+++ account_payment_cim_authdotnet/account_voucher.py	2014-03-07 18:35:55 +0000
@@ -707,7 +707,7 @@
          'trans_type' : 'AuthOnly'
     }
 
-class Stock_Picking(osv.osv):
+class Stock_Picking(osv.Model):
     _inherit = 'stock.picking'
 
     def ddo_partial(self, cr, uid, ids, partial_datas, context=None):

=== modified file 'account_payment_cim_authdotnet/cim_transaction.py'
--- account_payment_cim_authdotnet/cim_transaction.py	2014-01-09 18:15:04 +0000
+++ account_payment_cim_authdotnet/cim_transaction.py	2014-03-07 18:35:55 +0000
@@ -55,7 +55,6 @@
     }
 
     _defaults = {
-        'use_default':False,
         'partner_id': _get_partner,
     }
 

=== modified file 'account_payment_cim_authdotnet/partner.py'
--- account_payment_cim_authdotnet/partner.py	2014-01-09 18:15:04 +0000
+++ account_payment_cim_authdotnet/partner.py	2014-03-07 18:35:55 +0000
@@ -217,5 +217,4 @@
 
         return ret
 
-res_partner()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account_payment_cim_authdotnet/res_company.py'
--- account_payment_cim_authdotnet/res_company.py	2014-01-09 18:15:04 +0000
+++ account_payment_cim_authdotnet/res_company.py	2014-03-07 18:35:55 +0000
@@ -24,7 +24,7 @@
 class res_company(osv.Model):
     _inherit = "res.company"
     _columns = {
-        'auth_config_id':fields.many2one('auth.config', 'Auth Configuration')}
-res_company()
+        'auth_config_id':fields.many2one('auth.config', 'Auth Configuration')
+    }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account_payment_cim_authdotnet/wizard/__init__.py'
--- account_payment_cim_authdotnet/wizard/__init__.py	2014-01-09 18:15:04 +0000
+++ account_payment_cim_authdotnet/wizard/__init__.py	2014-03-07 18:35:55 +0000
@@ -20,9 +20,9 @@
 #
 ##############################################################################
 
-import create_payment_profile
-import make_transaction
-import edit_payment_profile
-import delete_payment_profile
+from . import create_payment_profile
+from . import make_transaction
+from . import edit_payment_profile
+from . import delete_payment_profile
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account_payment_cim_authdotnet/wizard/create_payment_profile.py'
--- account_payment_cim_authdotnet/wizard/create_payment_profile.py	2014-01-09 18:15:04 +0000
+++ account_payment_cim_authdotnet/wizard/create_payment_profile.py	2014-03-07 18:35:55 +0000
@@ -90,6 +90,7 @@
 
     def _clean_string(self, text):
         lis = ['\t', '\n']
+        print "text",text
         if type(text) != type(''):
             text = str(text)
         for t in lis:

=== modified file 'account_payment_creditcard/__init__.py'
--- account_payment_creditcard/__init__.py	2014-01-09 18:15:04 +0000
+++ account_payment_creditcard/__init__.py	2014-03-07 18:35:55 +0000
@@ -20,10 +20,10 @@
 #
 ##############################################################################
 
-import account_voucher
-import account_journal
-import stock_picking
-import sale
-import invoice
+from . import sale
+from . import account_voucher
+from . import account_journal
+from . import stock_picking
+from . import invoice
 import rsa_encrypt
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account_payment_creditcard/__openerp__.py'
--- account_payment_creditcard/__openerp__.py	2014-01-09 18:15:04 +0000
+++ account_payment_creditcard/__openerp__.py	2014-03-07 18:35:55 +0000
@@ -30,15 +30,16 @@
     """,
     'author': 'NovaPoint Group LLC',
     'website': ' http://www.novapointgroup.com',
-    'depends': ['sale_stock', 'account_voucher'],
-    'data': ['security/account_security.xml',
-             'security/ir.model.access.csv',
-             'account_voucher_view.xml',
-             'account_journal_view.xml',
-             'stock_picking_view.xml',
-             'invoice_view.xml',
-             'sale_stock_view.xml',
-        ],
+    'depends': ['sale_stock','sale', 'account_voucher', 'stock'],
+    'data': [
+         'security/account_security.xml',
+         'security/ir.model.access.csv',
+         'account_voucher_view.xml',
+         'account_journal_view.xml',
+         'stock_picking_view.xml',
+         'invoice_view.xml',
+         'sale_stock_view.xml',
+    ],
     'demo': [],
 #     'test': ['test/account_payment_creditcard.yml'],
     'installable': True,

=== modified file 'account_payment_creditcard/account_journal.py'
--- account_payment_creditcard/account_journal.py	2014-01-09 18:15:04 +0000
+++ account_payment_creditcard/account_journal.py	2014-03-07 18:35:55 +0000
@@ -23,16 +23,14 @@
 from openerp.osv import osv, fields
 import rsa_encrypt
 
-class account_journal(osv.osv):
+class account_journal(osv.Model):
     _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):
+
+class res_partner(osv.Model):
     _inherit = "res.partner"
     
     def write(self, cr, uid, ids, vals, context=None):
@@ -44,9 +42,7 @@
         result = super(res_partner, self).write(cr, uid, ids, vals, context)
         return True
 
-res_partner()
-
-class res_partner_bank(osv.osv):
+class res_partner_bank(osv.Model):
     '''Bank Accounts'''
 
     _inherit = "res.partner.bank"
@@ -156,7 +152,5 @@
         }
         default.update(vals)
         return super(res_partner_bank, self).copy(cr, uid, id, default=default, context=context)
-    
-res_partner_bank()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== modified file 'account_payment_creditcard/account_voucher.py'
--- account_payment_creditcard/account_voucher.py	2014-01-09 18:15:04 +0000
+++ account_payment_creditcard/account_voucher.py	2014-03-07 18:35:55 +0000
@@ -31,7 +31,7 @@
     def __str__(self):
         return str(self.parameter)
 
-class account_voucher(osv.osv):
+class account_voucher(osv.Model):
 
     def setParameter(self, parameters={}, key=None, value=None):
 
@@ -291,11 +291,8 @@
             res['value']['cc_reseller'] = cardholder_details['title'] == 'Reseller' and True or False
             res['value']['cc_save_card_details'] = False
         
-        res['value']['cc_info_hide'] = True
-        if jorurnal_cc_allow:
-            res['value']['cc_info_hide'] = False
-        
-        if cc_allow_refunds:
+        res['value']['cc_info_hide'] = False
+        if jorurnal_cc_allow and cc_allow_refunds:
             res['value']['cc_info_hide'] = True
             
         context.update({'sale_id':sale_id})
@@ -313,6 +310,7 @@
                         line['amount'] = line['amount_original']
                 lines.append(line)
             res['value']['line_cr_ids'] = lines
+        print "RES ",res
         return res
 
     def recompute_voucher_lines(self, cr, uid, ids, partner_id, journal_id, price, currency_id, ttype, date, context=None):
@@ -497,9 +495,7 @@
             self.pool.get('transaction.details').create(cr, uid, vals, context=context)
         return True
 
-account_voucher()
-
-class res_company(osv.osv):
+class res_company(osv.Model):
     '''
     Add credit card details on company configuration
     '''
@@ -510,7 +506,6 @@
         '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."),
     }
-res_company()
 
 class transaction_details(osv.Model):
     _name = "transaction.details"

=== modified file 'account_payment_creditcard/account_voucher_view.xml'
--- account_payment_creditcard/account_voucher_view.xml	2014-01-09 18:15:04 +0000
+++ account_payment_creditcard/account_voucher_view.xml	2014-03-07 18:35:55 +0000
@@ -18,8 +18,8 @@
             <field name="inherit_id" ref="account_voucher.view_vendor_receipt_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//notebook" position="inside">
-                     <page string="Credit Card Details" attrs="{'invisible': [('cc_info_hide','=',True)]}">
-						<group string="Cardholder details">
+                     <page string="Credit Card Details" attrs="{'invisible': [('cc_info_hide','=',False)]}">
+						<group string="Cardholder details" >
 						    <field name="cc_info_hide" invisible="1"/>
 						    <field name="cc_reseller" invisible="1"/>
 						    <field name="cc_transaction" invisible="1"/>

=== modified file 'account_payment_creditcard/invoice.py'
--- account_payment_creditcard/invoice.py	2014-01-09 18:15:04 +0000
+++ account_payment_creditcard/invoice.py	2014-03-07 18:35:55 +0000
@@ -23,7 +23,7 @@
 from openerp.osv import osv, fields
 from openerp.tools.translate import _
 
-class account_invoice(osv.osv):
+class account_invoice(osv.Model):
     
     _inherit = 'account.invoice'
     
@@ -53,10 +53,6 @@
     _columns = {
         'credit_card' : fields.boolean('Credit Card', readonly=True)
     }
-    
-    _defaults = {
-        'credit_card' : False
-    }
-account_invoice()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

=== modified file 'account_payment_creditcard/sale.py'
--- account_payment_creditcard/sale.py	2014-01-09 18:15:04 +0000
+++ account_payment_creditcard/sale.py	2014-03-07 18:35:55 +0000
@@ -23,7 +23,7 @@
 from tools.translate import _
 import netsvc
 
-class sale_order(osv.osv):
+class sale_order(osv.Model):
     _inherit = "sale.order"
 
 #     def onchange_partner_id(self, cr, uid, ids, part_id, context={}):
@@ -199,10 +199,10 @@
         '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),
-                 }),
+             '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),
     }
     
@@ -229,4 +229,3 @@
                 for pick in sale_obj.picking_ids:
                     self.pool.get('stock.picking.out').write(cr, uid, [pick.id], {'invoice_state': 'credit_card'}, context=context)
         return ret
-sale_order()

=== modified file 'account_payment_creditcard/stock_picking.py'
--- account_payment_creditcard/stock_picking.py	2014-01-09 18:15:04 +0000
+++ account_payment_creditcard/stock_picking.py	2014-03-07 18:35:55 +0000
@@ -23,7 +23,7 @@
 
 from openerp.osv import fields, osv
 
-class stock_picking(osv.osv):
+class stock_picking(osv.Model):
 
     _inherit = "stock.picking"
     '''
@@ -64,9 +64,7 @@
         'ship_message': fields.text('Message'),
     }
 
-stock_picking()
-
-class stock_picking_out(osv.osv):
+class stock_picking_out(osv.Model):
 
     _inherit = "stock.picking.out"
     
@@ -80,7 +78,7 @@
             ], "Invoice Control", select=True, required=True, readonly=True, states={'draft': [('readonly', False)]}),
     }
     
-class stock_picking_in(osv.osv):
+class stock_picking_in(osv.Model):
 
     _inherit = "stock.picking.in"