crans/scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Oublis divers

Browse source 
darcs-hash:20071220030858-c67a9-0156db195009468650cabe62e2d1f03a6eaaf1ba.gz
This commit is contained in:
Mathieu Segaud 2007-12-20 04:08:58 +01:00
parent eb8ceff23f
commit 004d0adae9
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/impression/__init__.py
View file

@ -246,7 +246,7 @@ class impression:
if (recto_verso):
if recto_verso not in DISPOSITION_VALEURS_POSSIBLES:
raise SettingsError, "Valeur inconnue : %s" % str(recto_verso)
if papier==PAPIER_A4_TRANSPARENT and recto_verso==IMPRESSION_RECTO_VERSO:
if papier==PAPIER_A4_TRANSPARENT and (recto_verso==IMPRESSION_RECTO_VERSO or recto_verso==IMPRESSION_RECTO_VERSO_SHORT):
raise SettingsError, "Pas de recto-verso sur du papier transparent !!"
self._settings['recto_verso'] = recto_verso
if (agraphes):
@ -254,7 +254,7 @@ class impression:
raise SettingsError, "Valeur inconnue pour agrafes : %s" % str(agrafes)
if papier!=PAPIER_A4 and agraphes!=PAS_D_AGRAPHES:
raise SettingsError, "Le type de papier choisi ne permet pas d'utiliser l'agrafeuse"
if recto_verso==IMPRESSION_RECTO_VERSO:
if recto_verso==IMPRESSION_RECTO_VERSO or recto_verso==IMPRESSION_RECTO_VERSO_SHORT:
if self._nb_pages > 100 and agraphes!=PAS_D_AGRAPHES:
raise SettingsError, "Le document est trop volumineux pour utiliser l'agrafeuse"
else:
@ -359,7 +359,7 @@ class impression:
prix+= self._settings['copies'] * pu_encre
#calcul du prix des feuilles
if (self._settings['recto_verso'] == IMPRESSION_RECTO_VERSO):
if (self._settings['recto_verso'] == IMPRESSION_RECTO_VERSO) or (self._settings['recto_verso'] == IMPRESSION_RECTO_VERSO_SHORT):
nbfeuilles = int(self._nb_pages/2.+0.5) * self._settings['copies']
else:
nbfeuilles = self._nb_pages * self._settings['copies']