Resolved conflicts
bzr revid: rora@adego.no-20110809141701-hhro08ik1coffptn
This commit is contained in:
parent
724d67d968
commit
b5123ad96a
|
@ -1104,8 +1104,7 @@ class res_partner(osv.osv):
|
||||||
|
|
||||||
#Valid format and valid date
|
#Valid format and valid date
|
||||||
return True
|
return True
|
||||||
<<<<<<< TREE
|
|
||||||
|
|
||||||
def check_vat_no(self, vat):
|
def check_vat_no(self, vat):
|
||||||
'''
|
'''
|
||||||
Check Norway VAT number.See http://www.brreg.no/english/coordination/number.html
|
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])) + \
|
(7 * int(vat[2])) + (6 * int(vat[3])) + \
|
||||||
(5 * int(vat[4])) + (4 * int(vat[5])) + \
|
(5 * int(vat[4])) + (4 * int(vat[5])) + \
|
||||||
(3 * int(vat[6])) + (2 * int(vat[7]))
|
(3 * int(vat[6])) + (2 * int(vat[7]))
|
||||||
=======
|
|
||||||
>>>>>>> MERGE-SOURCE
|
|
||||||
|
|
||||||
<<<<<<< TREE
|
|
||||||
check = 11 -(sum % 11)
|
check = 11 -(sum % 11)
|
||||||
if check == 11:
|
if check == 11:
|
||||||
check = 0
|
check = 0
|
||||||
|
@ -1132,10 +1128,7 @@ class res_partner(osv.osv):
|
||||||
# 10 is not a valid check digit for an organization number
|
# 10 is not a valid check digit for an organization number
|
||||||
return False
|
return False
|
||||||
return check == int(vat[8])
|
return check == int(vat[8])
|
||||||
|
|
||||||
|
|
||||||
=======
|
|
||||||
>>>>>>> MERGE-SOURCE
|
|
||||||
res_partner()
|
res_partner()
|
||||||
|
|
||||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||||
|
|
Loading…
Reference in New Issue