From: Joey Schulze <joey@infodrom.org>
Date: Sat, 14 Jan 2012 17:26:35 +0000 (+0100)
Subject: Display price for articles
X-Git-Url: https://git.infodrom.org/?p=misc%2Fhallinta-metro;a=commitdiff_plain;h=0a643eaf4ac216e416e0cc7b51ca7775c7417175;hp=5a2d568d47d09b9756f17a1877fb7079830f1e92

Display price for articles
---

diff --git a/artikel.php b/artikel.php
index 90c2689..76398ad 100644
--- a/artikel.php
+++ b/artikel.php
@@ -17,18 +17,25 @@ $mask = array(
 			      'menge' => array(
 					    'name' => 'Menge',
 					    'width' => 60,
-					    'specs' => "ClassName: 'alignrightpad', filterUI: 't'",
+					    'specs' => "ClassName: 'alignrightpad'",
 					    ),
 			      'bezeichnung' => array(
 					    'name' => 'Bezeichnung',
-					    'width' => 345,
+					    'width' => 300,
 					    'specs' => "filterUI: 't'",
 					    ),
+			      'preis' => array(
+					    'name' => 'Preis',
+					    'width' => 60,
+					    'type' => 'number',
+					    'specs' => "decPlaces: 2, ClassName: 'alignrightpad', filterUI: 't'",
+					    'sql' => '(SELECT preis * ((100 + steuersatz)/100) FROM metro_artikel_preis ' .
+					             'WHERE artikel = metro_artikel.id ORDER BY datum DESC LIMIT 1)',
+					    ),
 			      'hersteller' => array(
 					    'name' => 'Hersteller',
 					    'width' => 100,
 					    'specs' => "filterUI: 't'",
-					    'visible' => false,
 					    ),
 			      'abteilung' => array(
 					    'name' => 'Abteilung',
diff --git a/ordersatz_pos.php b/ordersatz_pos.php
index efa99d7..83bd4d1 100644
--- a/ordersatz_pos.php
+++ b/ordersatz_pos.php
@@ -128,9 +128,17 @@ $mask = array(
 					    ),
 			      'bezeichnung' => array(
 					    'name' => 'Bezeichnung',
-					    'width' => 260,
+					    'width' => 300,
 					    'specs' => "filterUI: 't'",
 					    ),
+			      'preis' => array(
+					    'name' => 'Preis',
+					    'width' => 60,
+					    'type' => 'number',
+					    'specs' => "decPlaces: 2, ClassName: 'alignrightpad', filterUI: 't'",
+					    'sql' => '(SELECT preis * ((100 + steuersatz)/100) FROM metro_artikel_preis ' .
+					             'WHERE artikel = metro_artikel.id ORDER BY datum DESC LIMIT 1)',
+					    ),
 			      'hersteller' => array(
 					    'name' => 'Hersteller',
 					    'width' => 80,