[lib/impression_canon] correction du calcul de coût

Ignore-this: f733668a3797560c3a44407cab6dc03f

darcs-hash:20090516014710-bd074-ce7faf134e2deed1cb51cb37fa1f6d311f45a062.gz
This commit is contained in:
Antoine Durand-Gasselin 2009-05-16 03:47:10 +02:00
parent c9a25af79f
commit 1a17516590

View file

@ -317,7 +317,8 @@ class impression:
faces = self._pages
if self._settings['livret']:
feuilles = int(faces+3/4)
feuilles = int((faces+3)/4)
faces = 2 * feuilles
elif self._settings['recto_verso']:
feuilles = int(faces/2.+0.5)
else:
@ -334,9 +335,9 @@ class impression:
c_papier = config_impression.c_a4
if self._settings['couleur']:
c_impression = c_papier * pages + impression.c_face_couleur * pages
c_impression = c_papier * feuilles + config_impression.c_face_couleur * pages
else:
c_impression = c_papier * pages + impression.c_face_nb * pages
c_impression = c_papier * feuilles + config_impression.c_face_nb * pages
# Cout des agrafes
if self._settings['agrafage'] in ["Top", "Bottom", "Left", "Right"] or self._settings['livret']:
@ -351,10 +352,11 @@ class impression:
else:
c_agrafes = 0
c_total = int(self._settings['copies'] * ( c_impression + impression.fact +
c_total = int(self._settings['copies'] * ( c_impression +
c_agrafes ) + 0.5) # arrondi et facture
return float(c_total)/100
self._prix= float(c_total)/100
return self._prix
def _get_adh(self, adh):
if type(adh) == str: