From 1a1751659033e83ac3853404a4fb9971d3485916 Mon Sep 17 00:00:00 2001 From: Antoine Durand-Gasselin Date: Sat, 16 May 2009 03:47:10 +0200 Subject: [PATCH] =?UTF-8?q?[lib/impression=5Fcanon]=20correction=20du=20ca?= =?UTF-8?q?lcul=20de=20co=C3=BBt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ignore-this: f733668a3797560c3a44407cab6dc03f darcs-hash:20090516014710-bd074-ce7faf134e2deed1cb51cb37fa1f6d311f45a062.gz --- lib/impression/impression_canon.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/impression/impression_canon.py b/lib/impression/impression_canon.py index 7d494f94..9e9365a3 100755 --- a/lib/impression/impression_canon.py +++ b/lib/impression/impression_canon.py @@ -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: