X-Git-Url: https://git.infodrom.org/?p=misc%2Fhallinta-metro;a=blobdiff_plain;f=artikel.php;h=76398ad5efb5a8ebd4858cd525bd248cc1b0fe00;hp=6144b977848a52de8e137c7affb6f526ce338eeb;hb=0a643eaf4ac216e416e0cc7b51ca7775c7417175;hpb=31b678a5f27b29779c6c50c77bdc6a5783ec4d8c

diff --git a/artikel.php b/artikel.php
index 6144b97..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',
@@ -54,7 +61,7 @@ $mask = array(
 			      'artnr' => array(
 					    'name' => 'Artikelnummer',
 					    'type' => 'number',
-					    'size' => 25,
+					    'size' => 15,
 					    'required' => true,
 					    ),
 			      'abteilung' => array(
@@ -80,13 +87,13 @@ $mask = array(
 			      'bezeichnung' => array(
 					    'name' => 'Bezeichnung',
 					    'type' => 'text',
-					    'size' => 25,
+					    'size' => 21,
 					    'required' => true,
 					    ),
 			      'hersteller' => array(
 					    'name' => 'Hersteller',
 					    'type' => 'text',
-					    'size' => 25,
+					    'size' => 21,
 					    'null' => true,
 					    ),
 			      ),