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

[IMP] more augmented assignments 

bzr revid: xmo@openerp.com-20121214134455-c1o7ehlot6vdwioe
This commit is contained in:
Xavier Morel 2012-12-14 14:44:55 +01:00
parent 5155f30303
commit d02fc09bb9
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openerp/report/pyPdf/utils.py
View File

@ -78,7 +78,7 @@ class ConvertFunctionsToVirtualList(object):
len_self = len(self) len_self = len(self)
if index < 0: if index < 0:
# support negative indexes # support negative indexes
index = len_self + index index += len_self
if index < 0 or index >= len_self: if index < 0 or index >= len_self:
raise IndexError, "sequence index out of range" raise IndexError, "sequence index out of range"
return self.getFunction(index) return self.getFunction(index)

4
openerp/report/render/rml2pdf/trml2pdf.py
View File

@ -96,7 +96,7 @@ class NumberedCanvas(canvas.Canvas):
key=self._pageCounter key=self._pageCounter
if not self.pages.get(key,False): if not self.pages.get(key,False):
while not self.pages.get(key,False): while not self.pages.get(key,False):
key = key + 1 key += 1
self.setFont("Helvetica", 8) self.setFont("Helvetica", 8)
self.drawRightString((self._pagesize[0]-30), (self._pagesize[1]-40), self.drawRightString((self._pagesize[0]-30), (self._pagesize[1]-40),
" %(this)i / %(total)i" % { " %(this)i / %(total)i" % {
@ -890,7 +890,7 @@ class TinyDocTemplate(platypus.BaseDocTemplate):
self.canv._storyCount = 0 self.canv._storyCount = 0
def ___handle_pageBegin(self): def ___handle_pageBegin(self):
self.page = self.page + 1 self.page += 1
self.pageTemplate.beforeDrawPage(self.canv,self) self.pageTemplate.beforeDrawPage(self.canv,self)
self.pageTemplate.checkPageSize(self.canv,self) self.pageTemplate.checkPageSize(self.canv,self)
self.pageTemplate.onPage(self.canv,self) self.pageTemplate.onPage(self.canv,self)

8
openerp/tools/amount_to_text.py
View File

@ -57,9 +57,9 @@ def _convert_nnn_fr(val):
if rem > 0: if rem > 0:
word = to_19_fr[rem] + ' Cent' word = to_19_fr[rem] + ' Cent'
if mod > 0: if mod > 0:
word = word + ' ' word += ' '
if mod > 0: if mod > 0:
word = word + _convert_nn_fr(mod) word += _convert_nn_fr(mod)
return word return word
def french_number(val): def french_number(val):
@ -125,9 +125,9 @@ def _convert_nnn_nl(val):
if rem > 0: if rem > 0:
word = to_19_nl[rem] + ' Honderd' word = to_19_nl[rem] + ' Honderd'
if mod > 0: if mod > 0:
word = word + ' ' word += ' '
if mod > 0: if mod > 0:
word = word + _convert_nn_nl(mod) word += _convert_nn_nl(mod)
return word return word
def dutch_number(val): def dutch_number(val):

4
openerp/tools/amount_to_text_en.py
View File

@ -60,9 +60,9 @@ def _convert_nnn(val):
if rem > 0: if rem > 0:
word = to_19[rem] + ' Hundred' word = to_19[rem] + ' Hundred'
if mod > 0: if mod > 0:
word = word + ' ' word += ' '
if mod > 0: if mod > 0:
word = word + _convert_nn(mod) word += _convert_nn(mod)
return word return word
def english_number(val): def english_number(val):

2
openerp/tools/graph.py
View File

@ -310,7 +310,7 @@ class graph(object):
""" """
if not self.result[node]['y']: if not self.result[node]['y']:
self.result[node]['y'] = self.order[level] self.result[node]['y'] = self.order[level]
self.order[level] = self.order[level]+1 self.order[level] += 1
for sec_end in self.transitions.get(node, []): for sec_end in self.transitions.get(node, []):
if node!=sec_end: if node!=sec_end:

4
openerp/tools/misc.py
View File

@ -561,8 +561,8 @@ def human_size(sz):
sz=len(sz) sz=len(sz)
s, i = float(sz), 0 s, i = float(sz), 0
while s >= 1024 and i < len(units)-1: while s >= 1024 and i < len(units)-1:
s = s / 1024 s /= 1024
i = i + 1 i += 1
return "%0.2f %s" % (s, units[i]) return "%0.2f %s" % (s, units[i])
def logged(f): def logged(f):