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

Resolved conflicts 

bzr revid: rora@adego.no-20110809141701-hhro08ik1coffptn
This commit is contained in:
Rolv Råen rora@adego.no 2011-08-09 16:17:01 +02:00
parent 724d67d968
commit b5123ad96a
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
addons/base_vat/base_vat.py
View File

@ -1104,8 +1104,7 @@ class res_partner(osv.osv):
#Valid format and valid date
return True
<<<<<<< TREE
def check_vat_no(self, vat):
'''
Check Norway VAT number.See http://www.brreg.no/english/coordination/number.html
@ -1121,10 +1120,7 @@ class res_partner(osv.osv):
(7 * int(vat[2])) + (6 * int(vat[3])) + \
(5 * int(vat[4])) + (4 * int(vat[5])) + \
(3 * int(vat[6])) + (2 * int(vat[7]))
=======
>>>>>>> MERGE-SOURCE
<<<<<<< TREE
check = 11 -(sum % 11)
if check == 11:
check = 0
@ -1132,10 +1128,7 @@ class res_partner(osv.osv):
# 10 is not a valid check digit for an organization number
return False
return check == int(vat[8])
=======
>>>>>>> MERGE-SOURCE
res_partner()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: