Home Explore Help
Sign In
cecile
/
coin
forked from FFDN/coin
1
0
Fork 0
Files
Browse Source

Replace xhtml2pdf/reportlab by weasyprint

ref #61
Jocelyn Delalande 8 years ago
parent
69f8fd4851
commit
10986fb081
3 changed files with 78 additions and 44 deletions
Unified View Show Diff Stats
  1. 74 39
      coin/billing/templates/billing/invoice_pdf.html
  2. 3 3
      coin/html2pdf.py
  3. 1 2
      requirements.txt

+ 74 - 39
coin/billing/templates/billing/invoice_pdf.html
View File 

@@ -4,22 +4,54 @@
 
 		<title>Facture N°{{ invoice.number }}</title>
 
 		<title>Facture N°{{ invoice.number }}</title>
 
 
 
 		<style>
 
 		<style>
 
-		    @page {
 
-		        size: a4 portrait;
 
-		        @frame header_frame {
 
-		            -pdf-frame-content: header_content;
 
-		            left: 50pt; width: 512pt; top: 50pt; height: 70pt;
 
-		        }
 
-		        @frame content_frame {
 
-		            left: 50pt; width: 512pt; top: 120pt; height: 632pt;
 
-		        }
 
-		        @frame footer_frame {
 
-		            -pdf-frame-content: footer_content;
 
-		            left: 50pt; width: 512pt; top: 772pt; height: 30pt;
 
-		        }
 
-		    }
 
+        @page {
 
+          margin: 0; padding: 40pt;
 
+        }
 
+
 
+        header {
 
+          position: fixed;
 
+          top: 0;
 
+          right: 0;
 
+          width: 100%;
 
+        }
 
+        header table {
 
+          width: 100%;
 
+        }
 
+
 
+        aside {
 
+          margin-top: 60pt;
 
+        }
 
+
 
+        h1 {
 
+          font-size: 12pt;
 
+        }
 
+
 
+        header img {
 
+          height: 50pt;
 
+        }
 
+
 
+        header td {
 
+          width: 50%;
 
+        }
 
+
 
+        footer {
 
+          position: fixed;
 
+          bottom: 0;
 
+        }
 
+
 
+        footer img {
 
+          height: 20pt;
 
+        }
 
+        html {
 
+          box-sizing: border-box;
 
+        }
 
+        *, *:before, *:after {
 
+          box-sizing: inherit;
 
+        }
 
+
 
 		    body {
 
 		    body {
 
-		    	font-size: 9pt;
 
+		  font-size: 9pt;
 
+          font-family: sans-serif;
 
 		    }
 
 		    }
 
 		    #coordonnees_isp {
 
 		    #coordonnees_isp {
 
 		    	font-size:9pt;
 
 		    	font-size:9pt;
 
@@ -27,17 +59,19 @@
 
 		    #coordonnees_client {
 
 		    #coordonnees_client {
 
 		    	vertical-align: top;
 
 		    	vertical-align: top;
 
 		    }
 
 		    }
 
-
 
+        table {
 
+          border-collapse: collapse;
 
+        }
 
 		    table#details {
 
 		    table#details {
 
-		    	width:100%;
 
+		    	width: 100%;
 
 		    }
 
 		    }
 
-		    th.cell {border:0px;}
 
+	    th.cell {border:0px;}
 
 		    .cell.result {border:0px; font-weight: bold}
 
 		    .cell.result {border:0px; font-weight: bold}
 
 		    .cell { padding:2pt; border:1px solid #DDD; }
 
 		    .cell { padding:2pt; border:1px solid #DDD; }
 
-		    .cell.label { width:400pt;}
 
-		    .cell.quantity {width:50pt;}
 
-		    .cell.amount {width:50pt;}
 
-		    .cell.total {width:50pt;}
 
+		    .cell.label { width: 73%;}
 
+		.cell.quantity,
 
+        .cell.quantity,
 
+        .cell.total {width: 9%;}
 
 
 
 		    .period {color:#888;}
 
 		    .period {color:#888;}
 
 
 
@@ -53,27 +87,16 @@
 
 
 
 	</head>
 
 	</head>
 
 <body>
 
 <body>
 
-	<div id="header_content">
 
-		<table widht="100%">
 
-			<tr>
 
+  <header>
 
+    <table>
 
+    <tr>
 
 				<td><img id="logo" src="{{ branding.logoURL }}" height="70" /></td>
 
 				<td><img id="logo" src="{{ branding.logoURL }}" height="70" /></td>
 
 				<td><h1>Facture N°{{ invoice.number }}</h1>
 
 				<td><h1>Facture N°{{ invoice.number }}</h1>
 
 					Le {{ invoice.date }}</td>
 
 					Le {{ invoice.date }}</td>
 
 			</tr>
 
 			</tr>
 
 		</table>
 
 		</table>
 
-	</div>
 
-	<div id="footer_content">
 
-		<hr />
 
-		<table widht="100%">
 
-			<tr>
 
-				<td width="50"><img id="logo" src="{{ branding.logoURL }}" height="20" /></td>
 
-				<td>{{ branding.shortname|upper }}, association loi de 1901 à but non lucratif - SIRET : {{ branding.registeredoffice.siret }}</td>
 
-				<td width="20"><pdf:pagenumber>
 
-					/<pdf:pagecount>
 
-				</td>
 
-			</tr>
 
-		</table>
 
-	</div>
 
+  </header>
 
+  <aside>
 
 	<table>
 
 	<table>
 
 		<tr>
 
 		<tr>
 
 			<td id="coordonnees_isp">
 
 			<td id="coordonnees_isp">
 
@@ -97,6 +120,7 @@
 
 			</td>
 
 			</td>
 
 		</tr>
 
 		</tr>
 
 	</table>
 
 	</table>
 
+    </aside>
 
 
 
 	<hr />
 
 	<hr />
 
 	Facture N°{{ invoice.number }}
 
 	Facture N°{{ invoice.number }}
 
@@ -130,6 +154,17 @@
 
 	<div id="paiements">
 
 	<div id="paiements">
 
         {% include "billing/payment_howto.html" %}
 
         {% include "billing/payment_howto.html" %}
 
 	</div>
 
 	</div>
 
-
 
+	<footer>
 
+		<hr />
 
+		<table>
 
+			<tr>
 
+				<td width="50"><img id="logo" src="{{ branding.logoURL }}" height="20" /></td>
 
+				<td>{{ branding.shortname|upper }}, association loi de 1901 à but non lucratif - SIRET : {{ branding.registeredoffice.siret }}</td>
 
+				<td width="20"><pdf:pagenumber>
 
+					/<pdf:pagecount>
 
+				</td>
 
+			</tr>
 
+		</table>
 
+	</footer>
 
 </body>
 
 </body>
 
 </html>
 
 </html>

+ 3 - 3
coin/html2pdf.py
View File 

@@ -3,12 +3,12 @@ from __future__ import unicode_literals
 
 
 
 import os
 
 import os
 
 import re
 
 import re
 
-from xhtml2pdf import pisa
 
 from tempfile import NamedTemporaryFile
 
 from tempfile import NamedTemporaryFile
 
 
 
 from django.conf import settings
 
 from django.conf import settings
 
 from django.template import loader, Context
 
 from django.template import loader, Context
 
 from django.core.files import File
 
 from django.core.files import File
 
+from weasyprint import HTML
 
 
 
 
 
 def link_callback(uri, rel):
 
 def link_callback(uri, rel):
 
@@ -51,12 +51,12 @@ def render_as_pdf(template, context):
 
     converti en PDF via le module xhtml2pdf.
 
     converti en PDF via le module xhtml2pdf.
 
     Renvoi un objet de type File
 
     Renvoi un objet de type File
 
     """
 
     """
 
-    
+
 
     template = loader.get_template(template)
 
     template = loader.get_template(template)
 
     html = template.render(Context(context))
 
     html = template.render(Context(context))
 
     file = NamedTemporaryFile()
 
     file = NamedTemporaryFile()
 
 
 
-    pisaStatus = pisa.CreatePDF(html, dest=file, link_callback=link_callback)
 
+    pisaStatus = HTML(string=html).write_pdf(file)
 
     file.flush()
 
     file.flush()
 
 
 
     return File(open(file.name))
 
     return File(open(file.name))

+ 1 - 2
requirements.txt
View File 

@@ -4,14 +4,13 @@ python-ldap==2.4.15
 
 wsgiref==0.1.2
 
 wsgiref==0.1.2
 
 python-dateutil==2.2
 
 python-dateutil==2.2
 
 django-autocomplete-light==2.0.7
 
 django-autocomplete-light==2.0.7
 
-reportlab==2.5
 
 django-activelink==0.4
 
 django-activelink==0.4
 
 html2text
 
 html2text
 
 django-polymorphic==0.6
 
 django-polymorphic==0.6
 
 django-sendfile==0.3.6
 
 django-sendfile==0.3.6
 
 django-localflavor==1.1
 
 django-localflavor==1.1
 
 -e git+https://code.ffdn.org/zorun/django-postgresql-netfields.git#egg=django-netfields
 
 -e git+https://code.ffdn.org/zorun/django-postgresql-netfields.git#egg=django-netfields
 
-xhtml2pdf==0.1b3
 
 -e git+https://github.com/jlaine/django-ldapdb@1c4f9f29e52176f4367a1dffec2ecd2e123e2e7a#egg=django-ldapdb
 
 -e git+https://github.com/jlaine/django-ldapdb@1c4f9f29e52176f4367a1dffec2ecd2e123e2e7a#egg=django-ldapdb
 
 feedparser
 
 feedparser
 
 six==1.10.0
 
 six==1.10.0
 
+WeasyPrint==0.31