X-Git-Url: https://git.infodrom.org/?p=misc%2Fhallinta-metro;a=blobdiff_plain;f=ordersatz_pos.php;h=70a4c1f47c30f3212237c2e97d0a57e5cab8ec46;hp=0c9cbddf76bbabc0d3d90a75faecd52e74beb5ad;hb=66fff10ad34abc27b780fe922354396bf023be36;hpb=c27d6bd9f1fa6a97ea4bc437ed946a5f812cb812;ds=sidebyside

diff --git a/ordersatz_pos.php b/ordersatz_pos.php
index 0c9cbdd..70a4c1f 100644
--- a/ordersatz_pos.php
+++ b/ordersatz_pos.php
@@ -13,6 +13,7 @@
 include_once($_SESSION['sys']['basedir'].'masks/metro/utils.php');
 include_once($_SESSION['sys']['basedir'].'lib/mail.php');
 
+$done = true;
 if (substr($_SERVER["SCRIPT_FILENAME"],-10) == '/index.php' &&
     !empty($_GET['id'])) {
   $_SESSION['ordersatz'] = $_GET['id'];
@@ -24,16 +25,23 @@ if (!$done) {
 						'icon' => 'masks/metro/import.png',
 						'title' => 'Neue Artikel importieren',
 						'function' => 'import_articles')));
-  Actions::instance()->addLink(new Link(array('id' => 'btn_pdf',
-						'icon' => 'masks/metro/pdf_document.png',
-						'title' => 'PDF Vorschau',
-						'function' => 'build_pdf')));
+}
+
+Actions::instance()->addLink(new Link(array('id' => 'btn_pdf',
+					    'icon' => 'masks/metro/pdf_document.png',
+					    'title' => 'PDF Vorschau',
+					    'function' => 'build_pdf')));
+
+if (!$done) {
   Actions::instance()->addLink(new Link(array('id' => 'btn_finish',
 						'icon' => 'masks/metro/hp_folder_finished.png',
 						'title' => 'Ordersatz Abschließen und Versenden',
 						'function' => 'confirm_finish')));
+}
 
-  $jscode = <<<EOC
+$jscode = '';
+if (!$done) {
+  $jscode .= <<<EOC
 Hallinta.registerGridMenu('main', 1, {
     defaultMenu: false,
     width: '9em',
@@ -52,6 +60,10 @@ Hallinta.registerGridMenu('main', 1, {
 	     ['Wert eingeben', 'Bitte geben Sie die gewünschte Menge ein', 'prompt']
 	     ]
       });
+EOC;
+}
+
+$jscode .= <<<EOC
 
 function build_pdf_callback(data)
 {
@@ -101,8 +113,8 @@ function import_articles()
 }
 
 EOC;
-  JavaScript::instance()->add($jscode);
-}
+
+JavaScript::instance()->add($jscode);
 
 function get_title($id)
 {
@@ -136,8 +148,12 @@ $mask = array(
 					    'specs' => array('ClassName' => 'alignrightpad'),
 					    ),
 			      'artnr' => array(
-					    'name' => 'Artnr',
+					    'name' => 'ArtNr',
+					    'sqltype' => 'int',
 					    'width' => 60,
+					    'type' => 'number',
+					    'filter' => 't=3',
+					    'specs' => array('decPlaces' => 0, 'thouSep' => ''),
 					    'visible' => false,
 					    ),
 			      'menge' => array(
@@ -189,7 +205,6 @@ $mask = array(
 					    'specs' => array('ClassName' => 'aligncenter'),
 					    '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(
 					    'name' => 'Gang',