Merge branches 'buttons', 'numeric' and 'pdflatex'

[misc/hallinta-metro] / ordersatz_pos.php

diff --git a/ordersatz_pos.php b/ordersatz_pos.php
index 18f0bce..b4743b7 100644 (file)
--- a/ordersatz_pos.php
+++ b/ordersatz_pos.php
@@ -99,11 +99,11 @@ EOC;
 
 $buttons = <<<EOC
 <p style="margin-top: 0px; margin-bottom: 4px; text-align: center;">
-<button onclick="return import_articles()">Artikel importieren</button>
+<button class="custom" onclick="return import_articles()">Artikel importieren</button>
 &nbsp;
-<button onclick="return build_pdf()">PDF erstellen</button>
+<button class="custom" onclick="return build_pdf()">PDF erstellen</button>
 &nbsp;
-<button onclick="return finish()">Abschließen</button>
+<button class="custom" onclick="return finish()">Abschließen</button>
 <br>Bei Abschluß wird ein Fax zu Metro und eine Kopie per Mail an den Koch geschickt.
 </p>
 EOC;
@@ -162,6 +162,14 @@ $mask = array(
                                            'sql' => '(SELECT preis * ((100 + steuersatz)/100) FROM metro_artikel_preis ' .
                                                     'WHERE artikel = metro_artikel.id ORDER BY datum DESC LIMIT 1)',
                                            ),
+                             'datum' => array(
+                                           'name' => 'Datum',
+                                           'width' => 85,
+                                           'type' => 'text',
+                                           'sql' => '(SELECT datum FROM metro_artikel_preis ' .
+                                                    'WHERE artikel = metro_artikel.id ORDER BY datum DESC LIMIT 1)',
+                                           'visible' => false,
+                                           ),
                              'hersteller' => array(
                                            'name' => 'Hersteller',
                                            'width' => 80,
@@ -172,12 +180,14 @@ $mask = array(
                                            'width' => 70,
                                            'specs' => "ClassName: 'aligncenter', filterUI: 's'",
                                            'control' => "new Rico.TableColumn.lookup(".grid_lookup_sql('metro_vpe','id','name').", 0, '')",
+                                           'distinct' => "SELECT DISTINCT vpe,metro_vpe.name FROM metro_artikel JOIN metro_vpe ON vpe = metro_vpe.id ORDER BY name",
                                            ),
                              'abteilung' => array(
                                            'name' => 'Abteilung',
                                            'width' => 80,
                                            'specs' => "ClassName: 'aligncenter', filterUI: 's'",
                                            'control' => "new Rico.TableColumn.lookup(".grid_lookup_sql('metro_abteilung','id','name').", 0, '')",
+                                           'distinct' => "SELECT DISTINCT abteilung,metro_abteilung.name FROM metro_artikel JOIN metro_abteilung ON abteilung = metro_abteilung.id ORDER BY name",
                                            'visible' => false,
                                            ),
                              'gang' => array(
@@ -186,6 +196,7 @@ $mask = array(
                                            'sql' => 'abteilung',
                                            'specs' => "ClassName: 'aligncenter', filterUI: 's'",
                                            'control' => "new Rico.TableColumn.lookup(".grid_lookup_sql('metro_abteilung','id','gang').", 0, '')",
+                                           'distinct' => "SELECT DISTINCT abteilung,metro_abteilung.gang FROM metro_artikel JOIN metro_abteilung ON abteilung = metro_abteilung.id ORDER BY gang",
                                            'visible' => false,
                                            ),
                              ),
@@ -236,7 +247,8 @@ function cb_pdf()
   $result = ordersatz_write($_SESSION['ordersatz'], $tmpdir, false);
 
   if ($result !== true) {
-    rm_tempdir($tmpdir);
+    error_log($tmpdir);
+    error_log($result);
     return array('error' => $result);
   }