supprime état de facturation (closes #261949)

authorNicolas Chauvat <nicolas.chauvat@logilab.fr>
changesetfb920e5378ca
branchdefault
phasedraft
hiddenyes
parent revision#6ea3667539f2 Added tag pycompta-version-0.9.1, pycompta-debian-version-0.9.1-1 for changeset 94309a6eb3ad
child revision#bc7f1bc5d3a0 rapports configurables (closes #257021)
files modified by this revision
debian/pycompta.install
lib/render.py
xsl/facturation2html.xsl
xsl/journal2facturation.xslt
xsl/pilote2html.xsl
# HG changeset patch
# User Nicolas Chauvat <nicolas.chauvat@logilab.fr>
# Date 1406808963 -7200
# Thu Jul 31 14:16:03 2014 +0200
# Node ID fb920e5378ca4c03202e3745a08fa104709f8888
# Parent 6ea3667539f2d50b8f2d840e988106a62ff415bb
supprime état de facturation (closes #261949)

diff --git a/debian/pycompta.install b/debian/pycompta.install
@@ -8,11 +8,10 @@
1  xsl/compte-resultat-1col2html.xsl usr/share/sgml/pycompta/stylesheet
2  xsl/compte-resultat2fo.xsl usr/share/sgml/pycompta/stylesheet
3  xsl/compte-resultat2html.xsl usr/share/sgml/pycompta/stylesheet
4  xsl/compte2html.xsl usr/share/sgml/pycompta/stylesheet
5  xsl/comptes-annuels2fo.xsl usr/share/sgml/pycompta/stylesheet
6 -xsl/facturation2html.xsl usr/share/sgml/pycompta/stylesheet
7  xsl/grand-livre2fo.xsl usr/share/sgml/pycompta/stylesheet
8  xsl/grand-livre2html.xsl usr/share/sgml/pycompta/stylesheet
9  xsl/immo2fo.xsl usr/share/sgml/pycompta/stylesheet
10  xsl/immo2html.xsl usr/share/sgml/pycompta/stylesheet
11  xsl/journal-banque2fo.xsl usr/share/sgml/pycompta/stylesheet
@@ -23,6 +22,5 @@
12  xsl/plan-comptable2html.xsl usr/share/sgml/pycompta/stylesheet
13  xsl/tresorerie2html.xsl usr/share/sgml/pycompta/stylesheet
14  xsl/balance2report.xslt usr/share/sgml/pycompta/stylesheet
15  xsl/common.xslt usr/share/sgml/pycompta/stylesheet
16  xsl/fo-common.xslt usr/share/sgml/pycompta/stylesheet
17 -xsl/journal2facturation.xslt usr/share/sgml/pycompta/stylesheet
diff --git a/lib/render.py b/lib/render.py
@@ -99,16 +99,10 @@
18      write_xml(config, compta, '', compta.debut, compta.fin)
19      if compta_prev:
20          write_xml(config, compta_prev, '.prev', compta_prev.debut, compta_prev.fin)
21      output_report(config)
22 
23 -    # état facturation
24 -    xslt(config.destpath('journal.xml'),
25 -         'journal2facturation.xslt',
26 -         config.destpath('facturation.xml'),
27 -         params)
28 -
29      log("Fichiers mensuels...")
30      # crée fichiers récap mensuels
31      for date in dates_recap :
32          write_xml(config, compta,
33                    '.'+date.Format("%Y-%m"),
@@ -298,15 +292,10 @@
34      log("Génération html...")
35      write_html(config, compta, '', compta.debut, compta.fin)
36      if compta_prev:
37          write_html(config, compta_prev, '.prev', compta_prev.debut, compta_prev.fin)
38 
39 -    xslt(config.destpath('facturation.xml'),
40 -         'facturation2html.xsl',
41 -         config.destpath('facturation.html'),
42 -         params)
43 -
44      xslt(config.destpath('pilote.xml'),
45           'pilote2html.xsl',
46           config.destpath('pilote.html'),
47           params)
48 
diff --git a/xsl/facturation2html.xsl b/xsl/facturation2html.xsl
@@ -1,75 +0,0 @@
49 -<?xml version="1.0" encoding="ISO-8859-1"?>
50 -
51 -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
52 -
53 -  <xsl:import href="common.xslt"/>
54 -
55 -  <xsl:output method="html" 
56 -              version="4.0" 
57 -              encoding="UTF-8" 
58 -              indent="yes" 
59 -              doctype-public="-//W3C//DTD HTML 4.0//EN"/>
60 -
61 -  <xsl:param name="societe.def" select="'../xml/societe.xml'"/>
62 -  <xsl:param name="setup.depodoc" select="'file:///var/lib/compta/'"/>
63 -
64 -  <xsl:variable name="societe" select="document($societe.def)/societe"/>
65 -  <xsl:variable name="plan_comptable" select="document($societe/plan-comptable/text())/plan-comptable"/>
66 -
67 -<!-- / ===================================================================== -->
68 -
69 -<xsl:template match="/">
70 -<html>
71 -<head>
72 -<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
73 -<link rel="stylesheet" type="text/css" href="{$societe/style/css}" />
74 -<title>Comptabilit� <xsl:value-of select="$societe/nom"/> -- Etat facturation</title>
75 -</head>
76 -<body>
77 -<h1>Comptabilit� <xsl:value-of select="$societe/nom"/> -- Etat Facturation</h1>
78 -
79 -<table border="1" cellpadding="5">
80 -  <tr>
81 -    <th>Num�ro</th>
82 -    <th>Etat</th>
83 -    <th>Historique</th>
84 -  </tr>
85 -  <xsl:apply-templates select="facturation/facture">
86 -     <xsl:sort select="@id" order="descending"/>
87 -  </xsl:apply-templates>
88 -</table>
89 -</body>
90 -</html>
91 -</xsl:template>
92 -
93 -<xsl:template match="facture">
94 -
95 -<tr>
96 -<td valign="top"><a><xsl:attribute name="href"><xsl:value-of select="$setup.depodoc"/><xsl:value-of select="@docid"/>.pdf</xsl:attribute><xsl:value-of select="@id"/></a></td>
97 -
98 -<td valign="top">
99 -<xsl:choose>
100 -<xsl:when test="action[@type='paiement']">
101 -Pay�e
102 -</xsl:when>
103 -<xsl:when test="action[@type='emission']">
104 -<font color="navy">Emise</font>
105 -</xsl:when>
106 -<xsl:otherwise>
107 -???
108 -</xsl:otherwise>
109 -</xsl:choose>
110 -</td>
111 -
112 -<td><ul>
113 -<xsl:for-each select="action">
114 -<li><xsl:value-of select="@type"/> le <xsl:value-of select="@date"/></li>
115 -</xsl:for-each>
116 -</ul>
117 -</td>
118 -
119 -</tr>
120 -
121 -</xsl:template>
122 -
123 -</xsl:stylesheet>
124 \ No newline at end of file
diff --git a/xsl/journal2facturation.xslt b/xsl/journal2facturation.xslt
@@ -1,35 +0,0 @@
125 -<?xml version="1.0" encoding="ISO-8859-1"?>
126 -
127 -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
128 -                xmlns:set="http://exslt.org/sets"
129 -                version="1.0">
130 -
131 -<xsl:output method="xml" encoding="ISO-8859-1" indent="yes" />
132 -
133 -<!-- / ===================================================================== -->
134 -
135 -<xsl:template match="/">
136 -
137 -  <facturation>
138 -    <xsl:for-each select="set:distinct(journal/ecriture[*/@compte='411']/ref[@type='doc'])">
139 -     <facture>
140 -       <xsl:attribute name="id"><xsl:value-of select="."/></xsl:attribute>
141 -       <xsl:attribute name="docid"><xsl:value-of select="@id"/></xsl:attribute>
142 -
143 -       <xsl:for-each select="/journal/ecriture[debit/@compte='411' and ref=current()]">
144 -         <action type="emission">
145 -           <xsl:copy-of select="@date"/>
146 -         </action>
147 -       </xsl:for-each>
148 -       <xsl:for-each select="/journal/ecriture[credit/@compte='411' and ref=current()]">
149 -         <action type="paiement">
150 -           <xsl:copy-of select="@date"/>
151 -         </action>
152 -       </xsl:for-each>
153 -     </facture>
154 -    </xsl:for-each>
155 -  </facturation>
156 -
157 -</xsl:template>
158 -
159 -</xsl:stylesheet>
160 \ No newline at end of file
diff --git a/xsl/pilote2html.xsl b/xsl/pilote2html.xsl
@@ -50,14 +50,10 @@
161  <h1>Comptabilit� <xsl:value-of select="$societe/nom"/></h1>
162 
163  <p style="font-size: small;"><a href="..">comptabilit�</a> &gt;
164     exercice
165  </p>
166 -<!--
167 -<p>Etat
168 -<a href="facturation.html">facturation</a> qui remplacera celui qui est <a href="../factures/factures.html">maintenu � la main</a></p>
169 --->
170 
171  <xsl:if test="pilote/previsions/mensualite">
172  <h2>Pr�visions</h2>
173 
174  <table align="center" cellpadding="5" class="pycompta">
@@ -96,13 +92,10 @@
175      <th><a href="bilan-immo.html">Immobilisations</a> [<a href="immo-amort.html">J</a>]</th>
176      <th><a href="tresorerie.compte.html">Tresorerie</a></th>
177      <th><a href="produits.compte.html">Produits</a></th>
178      <th>Paye <a href="paye.journal.html">J</a>-<a href="paye.grand-livre.html">GL</a>-<a href="paye.balance.html">B</a></th>
179      <th>Banque <a href="banque.journal.html">J</a>-<a href="banque.glivre.html">GL</a></th>
180 -    <!--
181 -    <th><a href="facturation.html">Facturation</a></th>
182 -    -->
183      </tr>
184 
185    <xsl:apply-templates select="pilote/recapitulatif/mensualite"/>
186 
187  </table>