Home Explore Help
Sign In
FFDN
/
coin
12
3
Fork 17
Files Issues 55 Pull Requests 6 Wiki
Browse Source

Remove latex pdf gen
Add xhtml2pdf to generate pdf
Add first draft of html invoice template

Fabs 11 years ago
parent
0ba1772e9b
commit
24589edce0
14 changed files with 166 additions and 126 deletions
Unified View Show Diff Stats
  1. 1 0
      .gitignore
  2. 0 10
      coin/billing/generate_invoices.py
  3. 6 2
      coin/billing/models.py
  4. BIN
      coin/billing/static/billing/invoice_logo.jpg
  5. 0 6
      coin/billing/templates/billing/facture.tex
  6. 97 0
      coin/billing/templates/billing/invoice.html
  7. 0 23
      coin/billing/templates/billing/invoice.tex
  8. 0 11
      coin/billing/templates/billing/test.tex
  9. 2 5
      coin/billing/urls.py
  10. 11 14
      coin/billing/views.py
  11. 45 0
      coin/html2pdf.py
  12. 0 51
      coin/process_latex.py
  13. 2 4
      coin/settings.py
  14. 2 0
      requirements.txt

+ 1 - 0
.gitignore
View File 

@@ -7,3 +7,4 @@ coin/settings_local.py
 
 .project
 
 .project
 
 .pydevproject
 
 .pydevproject
 
 .settings/*
 
 .settings/*
 
+/static

+ 0 - 10
coin/billing/generate_invoices.py
View File 

@@ -46,8 +46,6 @@ def generate_invoice_for_a_period(member, date):
 
 		# Recherche les factures déjà existantes de ce membre ayant cette offre
 
 		# Recherche les factures déjà existantes de ce membre ayant cette offre
 
 		# comme item pour lesquels la période de facturation englobe la date
 
 		# comme item pour lesquels la période de facturation englobe la date
 
 		invoice_test = Invoice.objects.filter(
 
 		invoice_test = Invoice.objects.filter(
 
-			# period_from__lte=date,
 
-			# period_to__gte=date,
 
 			details__offer__exact=offer.pk,
 
 			details__offer__exact=offer.pk,
 
 			details__period_from__lte=date,
 
 			details__period_from__lte=date,
 
 			details__period_to__gte=date,
 
 			details__period_to__gte=date,
 
@@ -58,18 +56,10 @@ def generate_invoice_for_a_period(member, date):
 
 			#Si l'object facture n'a pas encore été créé, le créé
 
 			#Si l'object facture n'a pas encore été créé, le créé
 
 			if invoice == None:
 
 			if invoice == None:
 
 				invoice = Invoice.objects.create(
 
 				invoice = Invoice.objects.create(
 
-					# period_from=datetime.date(date.year,date.month,1),
 
-					# period_to=datetime.date(date.year,date.month,1),
 
 					date_due=datetime.date.today(),
 
 					date_due=datetime.date.today(),
 
 					member=member
 
 					member=member
 
 				)
 
 				)
 
 
 
-			# new_period_to = (datetime.date(date.year,date.month,1) +
 
-			# 				relativedelta(months = +offer.billing_period) -
 
-			# 				relativedelta(days = +1))
 
-			# if new_period_to > invoice.period_to:
 
-			# 	invoice.period_to=new_period_to
 
-
 
 			#Ajout l'item de l'offre correspondant à l'abonnement à la facture			
 			#Ajout l'item de l'offre correspondant à l'abonnement à la facture			
 			invoice.details.create(label=offer.name,
 
 			invoice.details.create(label=offer.name,
 
 				amount=offer.period_fees,
 
 				amount=offer.period_fees,

+ 6 - 2
coin/billing/models.py
View File 

@@ -37,8 +37,7 @@ class Invoice(models.Model):
 
       "Calcul le montant de la facture en fonction des éléments de détails"
 
       "Calcul le montant de la facture en fonction des éléments de détails"
 
       total = Decimal('0.0')
 
       total = Decimal('0.0')
 
       for detail in self.details.all():
 
       for detail in self.details.all():
 
-        total += detail.amount * (detail.tax / Decimal('100.0') +
 
-                                  Decimal('1.0')) * detail.quantity
 
+        total += detail.total()
 
       return total.quantize(Decimal('0.01'))
 
       return total.quantize(Decimal('0.01'))
 
 
 
     @staticmethod
 
     @staticmethod
 
@@ -89,6 +88,11 @@ class InvoiceDetail(models.Model):
 
     def __unicode__(self):
 
     def __unicode__(self):
 
         return self.label
 
         return self.label
 
 
 
+    def total(self):
 
+      "Calcul le total"
 
+      return (self.amount * (self.tax / Decimal('100.0') +
 
+              Decimal('1.0')) * self.quantity).quantize(Decimal('0.01'))
 
+
 
     class Meta:
 
     class Meta:
 
         verbose_name = 'détail de facture'
 
         verbose_name = 'détail de facture'

BIN
coin/billing/static/billing/invoice_logo.jpg
View File


+ 0 - 6
coin/billing/templates/billing/facture.tex
View File 

@@ -1,6 +0,0 @@
 
-{% autoescape off %}
 
-\documentclass{facture}
 
-\usepackage{lipsum}
 
-
 
-\end{document}
 
-{% endautoescape %}

+ 97 - 0
coin/billing/templates/billing/invoice.html
View File 

@@ -0,0 +1,97 @@
 
+{% load static %}
 
+<html>
 
+	<head>
 
+		<title>Facture N°{{ invoice.number }}</title>
 
+
 
+		<style>
 
+		    @page {
 
+		        size: a4 portrait;
 
+		        @frame header_frame {          
+		            -pdf-frame-content: header_content;
 
+		            -pdf-frame-border: 1;
 
+		            left: 50pt; width: 512pt; top: 50pt; height: 50pt;
 
+		        }
 
+		        @frame content_frame {
 
+		        	-pdf-frame-border: 1;
 
+		            left: 50pt; width: 512pt; top: 120pt; height: 632pt;
 
+		        }
 
+		        @frame footer_frame { 
+		            -pdf-frame-content: footer_content;
 
+		            -pdf-frame-border: 1;
 
+		            left: 50pt; width: 512pt; top: 772pt; height: 20pt;
 
+		        }
 
+		    }
 
+		    table#details {
 
+		    	border:1px solid black;
 
+		    }
 
+		    table td {
 
+		    	padding-top:5pt;
 
+		    	border:1px solid red;
 
+		    }
 
+		</style>
 
+
 
+	</head>
 
+<body>
 
+	<div id="header_content">
 
+		<table widht="100%">
 
+			<tr>
 
+				<td><img id="logo" src="{% static "billing/invoice_logo.jpg" %}" height="70" /></td>
 
+				<td><h1>Facture N°{{ invoice.number }}</h1>
 
+					Le {{ invoice.date }}</td>
 
+			</tr>
 
+		</table>		
+	</div>
 
+	<div id="footer_content">ILLYSE - <pdf:pagenumber>
 
+		/<pdf:pagecount>
 
+	</div>
 
+	<table>
 
+		<tr>
 
+			<td>
 
+				<p>
 
+				Association ILLYSE<br />
 
+				c/o Jean-François MOURGUES<br />
 
+				225 route de Genas<br />
 
+				69100 Villeurbanne</p>
 
+				<p>SIRET : 539 453 191 00014</p>
 
+			</td>
 
+			<td style="vertical-align:top">
 
+				<strong>Facturé à :</strong><br/>
 
+				{{ member.last_name }} {{ member.first_name }}<br />
 
+				{% if member.organization_name != "" %}{{ member.organization_name }}<br />{% endif %}
 
+				{{ member.address }}<br />
 
+				{{ member.postal_code }} {{ member.city}}
 
+			</td>
 
+		</tr>
 
+	</table>
 
+
 
+	<hr />
 
+	Facture N°{{ invoice.number }}
 
+
 
+	<table id="details">
 
+		<thead>
 
+			<tr>
 
+				<th></th>
 
+				<th>Quantité</th>
 
+				<th>Prix unitaire</th>
 
+				<th>Total</th>
 
+			</tr>
 
+		</thead>
 
+		{% for detail in invoice.details.all %}
 
+		<tr>
 
+			<td>{{ detail.label }}</td>
 
+			<td>{{ detail.quantity }}</td>
 
+			<td>{{ detail.amount }}€</td>
 
+			<td>{{ detail.total }}€</td>
 
+		</tr>
 
+		{% endfor %}
 
+		<tr>
 
+			<td></td>
 
+			<td></td>
 
+			<td>Total TTC</td>
 
+			<td>{{ invoice.amount }}€</td>
 
+		</tr>
 
+	</table>
 
+
 
+
 
+</body>
 
+</html>

+ 0 - 23
coin/billing/templates/billing/invoice.tex
View File 

@@ -1,23 +0,0 @@
 
-{% autoescape off %}
 
-	%Preambule du document :
 
-	\documentclass[11pt]{article}
 
-	\usepackage[utf8]{inputenc}
 
-	\usepackage[francais]{babel}
 
-
 
-	%Corps du document :
 
-	\begin{document}
 
-		\begin{itemize}	
-	    	\item Number : {{ invoice.number }}
 
-	    	\item Date : {{ invoice.date }}
 
-	    	\item Facture du {{ invoice.period_from }} au {{ invoice.period_to }}
 
-	    	\item Paiement le : {{ invoice.date_due }}
 
-
 
-	    	\item Détails :
 
-	    	\begin{itemize}
 
-			    {% for detail in invoice.details.all %}
 
-			    	\item {{ detail.label }} - {{ detail.amount }} - {{ detail.quantity }} - {{ detail.tax }}
 
-			    {% endfor %}
 
-			\end{itemize}
 
-		\end{itemize}
 
-	\end{document}
 
-{% endautoescape %}

+ 0 - 11
coin/billing/templates/billing/test.tex
View File 

@@ -1,11 +0,0 @@
 
-{% autoescape off %}
 
-	%Preambule du document :
 
-	\documentclass[11pt]{report}
 
-	\usepackage[latin1]{inputenc}
 
-	\usepackage[francais]{babel}
 
-
 
-	%Corps du document :
 
-	\begin{document}
 
-	    Hello World ! : {{ blop }}
 
-	\end{document}
 
-{% endautoescape %}

+ 2 - 5
coin/billing/urls.py
View File 

@@ -1,11 +1,8 @@
 
 from django.conf.urls import patterns, url
 
 from django.conf.urls import patterns, url
 
 from django.views.generic import DetailView
 
 from django.views.generic import DetailView
 
-from coin.billing import views, generate_invoices
 
+from coin.billing import views
 
 
 
 urlpatterns = patterns(
 
 urlpatterns = patterns(
 
     '',
 
     '',
 
-    url(r'^pdf_test$', views.pdf_test, name='pdf_test'),
 
-    url(r'^invoice/(?P<pk>\d+)/pdf$', views.invoice_pdf),
 
-    url(r'^generate_invoices$', generate_invoices.generate_missing_invoices),
 
-
 
+    url(r'^invoice/(?P<pk>\d+)/pdf$', views.invoice_pdf)
 
 )
 
 )

+ 11 - 14
coin/billing/views.py
View File 

@@ -1,27 +1,24 @@
 
 # -*- coding: utf-8 -*-
 
 # -*- coding: utf-8 -*-
 
 from django.http import HttpResponse
 
 from django.http import HttpResponse
 
 from django.shortcuts import render, get_object_or_404
 
 from django.shortcuts import render, get_object_or_404
 
-from coin.process_latex import process_latex
 
 from coin.billing.models import Invoice
 
 from coin.billing.models import Invoice
 
-
 
-
 
-def pdf_test(request):
 
-
 
-    context = {"blop": "COIN !"}
 
-
 
-    response = HttpResponse(content_type='application/pdf')
 
-    response['Content-Disposition'] = 'attachment; filename="somefilename.pdf"'
 
-    response.write(process_latex('billing/test.tex', context))
 
-    return response
 
+from coin.members.models import Member
 
+from coin.html2pdf import render_as_pdf
 
 
 
 
 
 def invoice_pdf(request, pk):
 
 def invoice_pdf(request, pk):
 
 
 
     invoice = get_object_or_404(Invoice, pk=pk)
 
     invoice = get_object_or_404(Invoice, pk=pk)
 
     member = invoice.member
 
     member = invoice.member
 
-    context = {"invoice": invoice, 'member':member}
 
 
 
+    context = {"invoice": invoice, 'member':member}
 
+    
+    pdf = render_as_pdf('billing/invoice.html', context)
 
+    
     response = HttpResponse(content_type='application/pdf')
 
     response = HttpResponse(content_type='application/pdf')
 
-    response['Content-Disposition'] = 'attachment; filename="facture.pdf"'
 
-    response.write(process_latex('billing/facture.tex', context))
 
+    #response['Content-Disposition'] = 'attachment; filename="facture.pdf"'
 
+
 
+    response.write(pdf)
 
+
 
+    #response.write(process_latex('billing/invoice.html', context))
 
     return response
 
     return response

+ 45 - 0
coin/html2pdf.py
View File 

@@ -0,0 +1,45 @@
 
+# -*- coding: utf-8 -*-
 
+import os
 
+from django.conf import settings
 
+from tempfile import NamedTemporaryFile
 
+from xhtml2pdf import pisa
 
+from django.template import loader, Context
 
+
 
+# Convert HTML URIs to absolute system paths so xhtml2pdf can access
 
+# those resources
 
+def link_callback(uri, rel):
 
+	sUrl = settings.STATIC_URL     # Typically /static/
 
+	sRoot = settings.STATIC_ROOT   # Typically /home/userX/project_static/
 
+	mUrl = settings.MEDIA_URL      # Typically /static/media/
 
+	mRoot = settings.MEDIA_ROOT    # Typically /home/userX/project_static/media/
 
+
 
+	# convert URIs to absolute system paths
 
+	if uri.startswith(mUrl):
 
+	    path = os.path.join(mRoot, uri.replace(mUrl, ""))
 
+	elif uri.startswith(sUrl):
 
+	    path = os.path.join(sRoot, uri.replace(sUrl, ""))
 
+	# make sure that file exists
 
+	if not os.path.isfile(path):
 
+	        raise Exception(
 
+	                'media URI must start with %s or %s' % \
 
+	                (sUrl, mUrl))
 
+	return path
 
+
 
+
 
+def render_as_pdf(template, context):
 
+	"""
 
+	Génére le template donné avec les données du context donné en HTML et le
 
+	converti en PDF via le module xhtml2pdf
 
+	"""
 
+	template = loader.get_template(template)
 
+	html = template.render(Context(context))
 
+	file = NamedTemporaryFile()
 
+
 
+	pisaStatus = pisa.CreatePDF(html, dest=file, link_callback=link_callback)
 
+
 
+	# Return PDF document through a Django HTTP response
 
+	file.seek(0)
 
+	pdf = file.read()
 
+	file.close()
 
+
 
+	return pdf

+ 0 - 51
coin/process_latex.py
View File 

@@ -1,51 +0,0 @@
 
-# -*- coding: utf-8 -*-
 
-from subprocess import call, PIPE
 
-from os import remove, rename
 
-from os.path import dirname
 
-from tempfile import NamedTemporaryFile
 
-from django.template import loader, Context
 
-from django.conf import settings
 
-
 
-
 
-def process_latex(template, context={}, type='pdf', outfile=None):
 
-    """
 
-    Processes a template as a LaTeX source file.
 
-    Output is either being returned or stored in outfile.
 
-    At the moment only pdf output is supported.
 
-    """
 
-
 
-    t = loader.get_template(template)
 
-    c = Context(context)
 
-    r = t.render(c)
 
-
 
-    tex = NamedTemporaryFile()
 
-    tex.write(r.encode('utf-8'))
 
-    tex.flush()
 
-    base = tex.name
 
-    items = "log aux pdf dvi png".split()
 
-    names = dict((x, '%s.%s' % (base, x)) for x in items)
 
-    output = names[type]
 
-
 
-    if type == 'pdf' or type == 'dvi':
 
-        pdflatex(base, type)
 
-    elif type == 'png':
 
-        pdflatex(base, 'dvi')
 
-        call(['dvipng', '-bg', '-transparent',
 
-              names['dvi'], '-o', names['png']],
 
-             cwd=dirname(base), stdout=PIPE, stderr=PIPE)
 
-
 
-    remove(names['log'])
 
-    remove(names['aux'])
 
-
 
-    if not outfile:
 
-        o = file(output).read()
 
-        remove(output)
 
-        return o
 
-    else:
 
-        rename(output, outfile)
 
-
 
-
 
-def pdflatex(file, type='pdf'):
 
-    call([settings.PDFLATEX_PATH, '-interaction=nonstopmode',
 
-          '-output-format', type, file],
 
-         cwd=dirname(file), stdout=PIPE, stderr=PIPE)

+ 2 - 4
coin/settings.py
View File 

@@ -70,12 +70,12 @@ USE_TZ = True
 
 
 
 # Absolute filesystem path to the directory that will hold user-uploaded files.
 
 # Absolute filesystem path to the directory that will hold user-uploaded files.
 
 # Example: "/var/www/example.com/media/"
 
 # Example: "/var/www/example.com/media/"
 
-MEDIA_ROOT = ''
 
+MEDIA_ROOT = os.path.join(BASE_DIR, 'media/')
 
 
 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 
 # trailing slash.
 
 # trailing slash.
 
 # Examples: "http://example.com/media/", "http://media.example.com/"
 
 # Examples: "http://example.com/media/", "http://media.example.com/"
 
-MEDIA_URL = ''
 
+MEDIA_URL = '/media/'
 
 
 
 # Absolute path to the directory static files should be collected to.
 
 # Absolute path to the directory static files should be collected to.
 
 # Don't put anything in this directory yourself; store your static files
 
 # Don't put anything in this directory yourself; store your static files
 
@@ -227,8 +227,6 @@ AUTH_LDAP_USER_FLAGS_BY_GROUP = {
 
 }
 
 }
 
 
 
 
 
-PDFLATEX_PATH = "pdflatex"
 
-
 
 # Surcharge les paramètres en utilisant le fichier settings-local.py
 
 # Surcharge les paramètres en utilisant le fichier settings-local.py
 
 try:
 
 try:
 
     from settings_local import *
 
     from settings_local import *

+ 2 - 0
requirements.txt
View File 

@@ -6,4 +6,6 @@ python-ldap==2.4.13
 
 wsgiref==0.1.2
 
 wsgiref==0.1.2
 
 python-dateutil==2.2
 
 python-dateutil==2.2
 
 django-autocomplete-light==2.0.0a8
 
 django-autocomplete-light==2.0.0a8
 
+reportlab==2.5
 
 -e git+https://github.com/jmacul2/django-postgresql-netfields@2d6e597c3d65ba8b0e1f6e3183869216e990e915#egg=django-netfields
 
 -e git+https://github.com/jmacul2/django-postgresql-netfields@2d6e597c3d65ba8b0e1f6e3183869216e990e915#egg=django-netfields
 
+-e git+https://github.com/chrisglass/xhtml2pdf@a5d37ffd0ccb0603bdf668198de0f21766816104#egg=xhtml2pdf-master