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

[intranet] suppression des trailing whitespaces qui gênent la lecture

Browse source 
darcs-hash:20090128153306-bd074-4a8923921ada6494c88bee3a177042f771249f1b.gz
This commit is contained in:
Antoine Durand-Gasselin 2009-01-28 16:33:06 +01:00
parent 636e75038f
commit 0abe5fb17f
3 changed files with 83 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

2
intranet/ClassesIntranet/Intranet.py
View file

@ -85,7 +85,7 @@ class Intranet:
cherrypy.config.update(settings) cherrypy.config.update(settings)
if cherrypy.config.get("server.environment") == "development": if cherrypy.config.get("server.environment") == "development":
_crans_cp.log("New static : %s" % staticPath) _crans_cp.log("New static : %s" % staticPath)
# fin de l'ajout du dossier static # fin de l'ajout du dossier static
def __init__(self): def __init__(self):

4
intranet/modules/gestionFactures/main.py
View file

@ -103,12 +103,12 @@ class main(ModuleBase):
facture['url'] = f.urlPaypal() facture['url'] = f.urlPaypal()
facture['intitule'] = f.articles()[0]['designation'] facture['intitule'] = f.articles()[0]['designation']
facture['details'] = [ facture['details'] = [
{ {
'intitule':art['designation'], 'intitule':art['designation'],
'quantite':art['nombre'], 'quantite':art['nombre'],
'prixUnitaire':art['pu'], 'prixUnitaire':art['pu'],
'prixTotal':art['pu']*art['nombre'], 'prixTotal':art['pu']*art['nombre'],
} for art in f.articles()] } for art in f.articles()]
liste_factures_affichees.append(facture) liste_factures_affichees.append(facture)
except: except:
crans.cp.log("Facture non affichable : fid=%s" % str(f.numero()), "GESTION FACTURES", 1) crans.cp.log("Facture non affichable : fid=%s" % str(f.numero()), "GESTION FACTURES", 1)

15
intranet/modules/mesSous/main.py
View file

@ -1,11 +1,11 @@
#! /usr/bin/env python #! /usr/bin/env python
# -*- coding: iso-8859-15 -*- # -*- coding: iso-8859-15 -*-
# ##################################################################################################### # # ########################################################################
# Mes Sous # Mes Sous
# ##################################################################################################### # # ########################################################################
# Description: # Description:
# Affiche la liste des factures et l'historique de debits/credits de l'adherent. # Affiche la liste des factures et l'historique de debits/credits de
# Fait aussi les rechargements Paypal # l'adherent. Fait aussi les rechargements Paypal
# Informations: # Informations:
# #
# Pages: # Pages:
@ -13,7 +13,7 @@
# historique: historique des débits/crédits # historique: historique des débits/crédits
# rechargementPaypal: Comme son nom l'indique # rechargementPaypal: Comme son nom l'indique
# #
# ##################################################################################################### # # ########################################################################
import cherrypy, sys, os, datetime import cherrypy, sys, os, datetime
@ -35,11 +35,9 @@ class main(ModuleBase):
return "Personnel" return "Personnel"
def icon(self): def icon(self):
return "icon.png" return "icon.png"
_club = True _club = True
def getCurrentAdministrativeYear(self): def getCurrentAdministrativeYear(self):
''' '''
premiere partie de l''annee scolaire en cours premiere partie de l''annee scolaire en cours
@ -77,6 +75,7 @@ class main(ModuleBase):
} for art in f.articles()] } for art in f.articles()]
facture['montant'] = f.total() facture['montant'] = f.total()
facture['paypal'] = f.urlPaypal(useSandbox = cherrypy.config.get("paypal.useSandbox", False), facture['paypal'] = f.urlPaypal(useSandbox = cherrypy.config.get("paypal.useSandbox", False),
businessMail = cherrypy.config.get("paypal.businessAdress", "paypal@crans.org"), businessMail = cherrypy.config.get("paypal.businessAdress", "paypal@crans.org"),
return_page = "https://intranet.crans.org/monCompte/paypalReturn", return_page = "https://intranet.crans.org/monCompte/paypalReturn",
cancel_return_page = "https://intranet.crans.org/monCompte/paypalCancel", cancel_return_page = "https://intranet.crans.org/monCompte/paypalCancel",
@ -88,6 +87,7 @@ class main(ModuleBase):
return { return {
'template' :'factures', 'template' :'factures',
'values' :t, 'values' :t,
'stylesheets' :['cransFactures.css'], 'stylesheets' :['cransFactures.css'],
'scripts' :[], 'scripts' :[],
@ -96,7 +96,6 @@ class main(ModuleBase):
def historique(self, page = 1, items_per_page = 20): def historique(self, page = 1, items_per_page = 20):
adh = cherrypy.session['LDAP'].getProprio(cherrypy.session['uid']) adh = cherrypy.session['LDAP'].getProprio(cherrypy.session['uid'])
lst = [ x for x in adh.historique() if x.split(u' : ',1)[1].startswith(u'credit') or x.split(u' : ',1)[1].startswith(u'debit') ] lst = [ x for x in adh.historique() if x.split(u' : ',1)[1].startswith(u'credit') or x.split(u' : ',1)[1].startswith(u'debit') ]
histLst = [] histLst = []
for anItem in lst: for anItem in lst: