Fixes of VAT stuff

lillem4n · Mar 14, 2013 · e2ff981 · e2ff981
1 parent 88085bd
commit e2ff981
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/css/pdfs.css b/css/pdfs.css
@@ -173,9 +173,6 @@ table.salary
 			border-bottom-right-radius: 5px;
 		}
 
-
-
-
 /** End of Salary table **/
 
 /** Items table **/
@@ -196,6 +193,7 @@ table.items
 	table.items tr.bottom td.vat,
 	table.items tr.bottom td.tot
 	{
+		border-right:     1px solid #a2a2a2;
 		border-left:     1px solid #a2a2a2;
 	}
 
@@ -255,7 +253,7 @@ table.items
 
 		table.items th.qty
 		{
-			width:            83px;
+			width:            69px;
 		}
 
 		table.items th.vat
@@ -311,6 +309,12 @@ table.items
 			text-align:       right;
 		}
 
+		table.items td.vat
+		{
+			border-right:     1px solid #a2a2a2;
+			text-align:       right;
+		}
+
 		table.items td.price
 		{
 			border-right:     1px solid #a2a2a2;

diff --git a/xsl/bill.xsl b/xsl/bill.xsl
@@ -110,8 +110,8 @@
 						<th class="spec">Specifikation</th>
 						<th class="qty">Antal</th>
 						<th class="single_price">Á Pris</th>
-						<th class="price">Pris</th>
 						<th class="vat">Moms</th>
+						<th class="price">Pris</th>
 					</tr>
 
 					<xsl:for-each select="/root/content/bill/items/item">
@@ -143,36 +143,36 @@
 								</xsl:if>
 								<xsl:value-of select="format-number(price, '#&#160;###,00')" />
 							</td>
-							<td class="price">
+							<td class="vat">
 								<xsl:if test="position() = count(/root/content/bill/items/item)">
-									<xsl:attribute name="class">price last</xsl:attribute>
+									<xsl:attribute name="class">vat last</xsl:attribute>
 								</xsl:if>
-								<xsl:value-of select="format-number(number(qty) * number(price), '#&#160;###,00')" />
+								<xsl:value-of select="format-number(number(price) * (number(vat) - 1), '#&#160;###,00')" />
 							</td>
 							<td class="price">
 								<xsl:if test="position() = count(/root/content/bill/items/item)">
-									<xsl:attribute name="class">vat last</xsl:attribute>
+									<xsl:attribute name="class">price last</xsl:attribute>
 								</xsl:if>
-								<xsl:value-of select="format-number(number(qty) * number(price) * (number(vat) - 1), '#&#160;###,00')" />
+								<xsl:value-of select="format-number(number(qty) * number(price), '#&#160;###,00')" />
 							</td>
 						</tr>
 					</xsl:for-each>
 
 					<tr class="bottom">
 						<td colspan="2" rowspan="3" class="fail_info">Vid betalning efter förfallodatum debiteras<br />dröjsmålsränta enligt räntelagen.</td>
-						<td colspan="2" class="tot_ex_vat">Totalpris ex moms</td>
+						<td colspan="3" class="tot_ex_vat">Totalpris ex moms</td>
 						<td class="tot_ex_vat_value">
 							<xsl:call-template name="tot_ex_vat" />
 						</td>
 					</tr>
 					<tr class="bottom">
-						<td colspan="2" class="vat">Moms</td>
+						<td colspan="3" class="vat">Moms</td>
 						<td class="vat_value">
 							<xsl:call-template name="vat" />
 						</td>
 					</tr>
 					<tr class="bottom">
-						<td colspan="2" class="tot">Att betala</td>
+						<td colspan="3" class="tot">Att betala</td>
 						<td class="tot_value">
 							<xsl:call-template name="tot" />
 						</td>