diff --git a/account_check_deposit/__openerp__.py b/account_check_deposit/__openerp__.py
index 1392bdc76..5fdfa4610 100644
--- a/account_check_deposit/__openerp__.py
+++ b/account_check_deposit/__openerp__.py
@@ -33,9 +33,9 @@
You may have to create an account for recieved checks and a journal for payment by checks.""",
'author': 'Akretion',
'website': 'http://www.akretion.com/',
- 'depends': ['account_accountant','report_webkit'],
+ 'depends': ['account_accountant','report_webkit','sale_quick_payment'],
'init_xml': [],
- 'update_xml': [
+ 'update_xml': [
'account_deposit_view.xml',
'account_deposit_sequence.xml',
'account_type_data.xml',
@@ -44,4 +44,3 @@
'installable': True,
'active': False,
}
-
diff --git a/account_check_deposit/account_deposit.py b/account_check_deposit/account_deposit.py
index 8865d6078..81dfdb72e 100644
--- a/account_check_deposit/account_deposit.py
+++ b/account_check_deposit/account_deposit.py
@@ -53,6 +53,11 @@ class account_check_deposit(Model):
],'Status', readonly=True),
'move_id': fields.many2one('account.move', 'Journal Entry', readonly=True,
states={'draft':[('readonly',False)]}),
+ 'bank_id': fields.many2one('res.partner.bank', 'Bank', required=True, readonly=True,
+ domain="[('partner_id', '=', partner_id)]",
+ states={'draft':[('readonly',False)]}),
+ 'partner_id':fields.related('company_id', 'partner_id', type="many2one", relation="res.partner", string="Partner", readonly=True),
+ 'company_id': fields.many2one('res.company', 'Company', required=True, change_default=True, readonly=True, states={'draft':[('readonly',False)]}),
'total_amount': fields.function(sum_amount, string ="total amount"),
}
@@ -60,6 +65,7 @@ class account_check_deposit(Model):
'name': lambda self, cr, uid, context: '/',
'deposit_date': fields.date.context_today,
'state':'draft',
+ 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.check.deposit', context=c),
}
@@ -133,6 +139,17 @@ class account_check_deposit(Model):
move_line_obj.reconcile(cr, uid, [line.id, move_line_ids[0]], context=context)
return True
+
+
+ def onchange_company_id(self, cr, uid, ids, company_id, context=None):
+ vals={}
+ if company_id:
+ company=self.pool.get('res.company').browse(cr, uid, company_id, context=context)
+ vals['partner_id']=company.partner_id.id
+ return {'value':vals}
+
+
+
def validate_deposit(self, cr, uid, ids, context=None):
move_obj = self.pool.get('account.move')
if context is None:
diff --git a/account_check_deposit/account_deposit_view.xml b/account_check_deposit/account_deposit_view.xml
index d619b127a..856dbbd5b 100644
--- a/account_check_deposit/account_deposit_view.xml
+++ b/account_check_deposit/account_deposit_view.xml
@@ -15,8 +15,8 @@
model="account.check.deposit"
name="check.deposit.webkit"
report_type="webkit"
- string="WebKit Check Deposit"/>
-
+ string="WebKit Checks Deposit"/>
+
@@ -24,7 +24,7 @@
account.check.deposit
form
-
-
+
account.check.deposit.search
account.check.deposit
-
-
+
+
@@ -93,9 +96,9 @@
-
+
- Check Deposits
+ Checks Deposit
account.check.deposit
form
tree,form,graph
@@ -105,7 +108,7 @@
-
+