odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] merge from trunk addons 

bzr revid: mra@mra-laptop-20101103131840-uqr3xzp4ow637j3d
This commit is contained in:
Mustufa Rangwala 2010-11-03 18:48:40 +05:30
parent 63cce2b25b a9e67f3f3d
commit 5c67b380e1
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/account_payment/account_payment.py
View File

@ -32,7 +32,7 @@ class payment_mode(osv.osv):
'bank_id': fields.many2one('res.partner.bank', "Bank account",
required=True,help='Bank Account for the Payment Mode'),
'journal': fields.many2one('account.journal', 'Journal', required=True,
domain=[('type', '=', 'cash')], help='Cash Journal for the Payment Mode'),
domain=[('type', 'in', ('bank','cash'))], help='Bank or Cash Journal for the Payment Mode'),
'company_id': fields.many2one('res.company', 'Company', required=True),
}
_defaults = {
@ -452,4 +452,4 @@ class payment_line(osv.osv):
payment_line()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

2
addons/l10n_be/account_pcmn_belgium.xml
View File

@ -6725,6 +6725,7 @@
<field name="name">TVA 21% Services</field>
<field name="description">V-NAT-S 21</field>
<field eval="0.21" name="amount"/>
<field eval="0" name="sequence"/>
<field name="type">percent</field>
<field name="account_collected_id" ref="vat_payable21"/>
<field name="account_paid_id" ref="vat_payable21"/>
@ -6899,6 +6900,7 @@
<field name="name">Services Divers Déductibles 21%</field>
<field name="description">A-NAT-S 21</field>
<field eval="1.00" name="amount"/>
<field eval="0" name="sequence"/>
<field name="type">percent</field>
<field eval="1" name="child_depend"/>
<field name="type_tax_use">purchase</field>