[MERGE] lp:~openerp-dev/openobject-addons/trunk-res_bank_remove_footer-mdi
bzr revid: stw@openerp.com-20120809091227-rit1oj5vqzppo5q6
This commit is contained in:
commit
db1fe326e5
|
@ -45,9 +45,6 @@
|
||||||
<field name="help" type="html">
|
<field name="help" type="html">
|
||||||
<p class="oe_view_nocontent_create">
|
<p class="oe_view_nocontent_create">
|
||||||
Click to setup a new bank account.
|
Click to setup a new bank account.
|
||||||
</p><p>
|
|
||||||
Configure your company's bank account and select those that must
|
|
||||||
appear on the report footer.
|
|
||||||
</p><p>
|
</p><p>
|
||||||
If you use the accounting application of OpenERP, journals and
|
If you use the accounting application of OpenERP, journals and
|
||||||
accounts will be created automatically based on these data.
|
accounts will be created automatically based on these data.
|
||||||
|
|
|
@ -43,8 +43,6 @@ class account_config_settings(osv.osv_memory):
|
||||||
string='Default company currency', help="Main currency of the company."),
|
string='Default company currency', help="Main currency of the company."),
|
||||||
'paypal_account': fields.related('company_id', 'paypal_account', type='char', size=128,
|
'paypal_account': fields.related('company_id', 'paypal_account', type='char', size=128,
|
||||||
string='Paypal account', help="Paypal account (email) for receiving online payments (credit card, etc.) If you set a paypal account, the customer will be able to pay your invoices or quotations with a button \"Pay with Paypal\" in automated emails or through the OpenERP portal."),
|
string='Paypal account', help="Paypal account (email) for receiving online payments (credit card, etc.) If you set a paypal account, the customer will be able to pay your invoices or quotations with a button \"Pay with Paypal\" in automated emails or through the OpenERP portal."),
|
||||||
'company_footer': fields.related('company_id', 'rml_footer2', type='char', size=250, readonly=True,
|
|
||||||
string='Bank accounts on reports will display as followed', help="Bank accounts as printed in the footer of each customer document. This is for information purpose only, you should configure these bank accounts through the above button \"Configure Bank Accounts\"."),
|
|
||||||
|
|
||||||
'has_chart_of_accounts': fields.boolean('Company has a chart of accounts'),
|
'has_chart_of_accounts': fields.boolean('Company has a chart of accounts'),
|
||||||
'chart_template_id': fields.many2one('account.chart.template', 'Template', domain="[('visible','=', True)]"),
|
'chart_template_id': fields.many2one('account.chart.template', 'Template', domain="[('visible','=', True)]"),
|
||||||
|
@ -154,7 +152,6 @@ class account_config_settings(osv.osv_memory):
|
||||||
'expects_chart_of_accounts': company.expects_chart_of_accounts,
|
'expects_chart_of_accounts': company.expects_chart_of_accounts,
|
||||||
'currency_id': company.currency_id.id,
|
'currency_id': company.currency_id.id,
|
||||||
'paypal_account': company.paypal_account,
|
'paypal_account': company.paypal_account,
|
||||||
'company_footer': company.rml_footer2,
|
|
||||||
'has_chart_of_accounts': has_chart_of_accounts,
|
'has_chart_of_accounts': has_chart_of_accounts,
|
||||||
'has_fiscal_year': bool(fiscalyear_count),
|
'has_fiscal_year': bool(fiscalyear_count),
|
||||||
'chart_template_id': False,
|
'chart_template_id': False,
|
||||||
|
|
|
@ -225,8 +225,6 @@
|
||||||
icon="gtk-go-forward"
|
icon="gtk-go-forward"
|
||||||
type="action"
|
type="action"
|
||||||
class="oe_inline oe_link"/>
|
class="oe_inline oe_link"/>
|
||||||
<label for="company_footer"/>
|
|
||||||
<field name="company_footer"/>
|
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<label for="paypal_account"/>
|
<label for="paypal_account"/>
|
||||||
|
|
|
@ -8,7 +8,6 @@
|
||||||
company_id: base.main_company
|
company_id: base.main_company
|
||||||
partner_id: base.main_partner
|
partner_id: base.main_partner
|
||||||
acc_number: 123456789
|
acc_number: 123456789
|
||||||
footer: True
|
|
||||||
bank: base.res_bank_1
|
bank: base.res_bank_1
|
||||||
bank_name: Reserve
|
bank_name: Reserve
|
||||||
-
|
-
|
||||||
|
|
|
@ -47,13 +47,6 @@ class res_company(osv.osv):
|
||||||
result['logo'] = company.logo # already base64-encoded
|
result['logo'] = company.logo # already base64-encoded
|
||||||
if company.paypal_account:
|
if company.paypal_account:
|
||||||
result['paypal_account'] = company.paypal_account
|
result['paypal_account'] = company.paypal_account
|
||||||
# bank info: include only bank account supposed to be displayed in document footers
|
|
||||||
res_partner_bank = self.pool.get('res.partner.bank')
|
|
||||||
bank_ids = res_partner_bank.search(cr, uid, [('company_id','=',company.id),('footer','=',True)], context=context)
|
|
||||||
if bank_ids:
|
|
||||||
result['bank_ids'] = res_partner.edi_m2m(cr, uid,
|
|
||||||
res_partner_bank.browse(cr, uid, bank_ids, context=context),
|
|
||||||
context=context)
|
|
||||||
return result
|
return result
|
||||||
|
|
||||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||||
|
|
Loading…
Reference in New Issue