From: Joey Schulze <joey@infodrom.org>
Date: Tue, 2 Mar 2010 17:59:37 +0000 (+0100)
Subject: Updates according to mail
X-Git-Tag: 2010-06-02_customer~153
X-Git-Url: https://git.infodrom.org/?p=misc%2Fkostenrechnung;a=commitdiff_plain;h=2d867414b3bd94514c25ba7f0f7ec9bc0549289e

Updates according to mail
---

diff --git a/masks/anbaugeraete.php b/masks/anbaugeraete.php
index 330fbf8..ac21063 100644
--- a/masks/anbaugeraete.php
+++ b/masks/anbaugeraete.php
@@ -18,7 +18,6 @@ $mask = array(
 					    'specs' => "decPlaces: 2, ClassName: 'alignright'",
 					    'width' => 90,
 					    ),
-/*
 			      'anbkst_intern' => array(
 					    'name' => 'intern',
 					    'type' => 'number',
@@ -31,7 +30,6 @@ $mask = array(
 					    'specs' => "decPlaces: 2, ClassName: 'alignright'",
 					    'width' => 60,
 					    ),
-*/
 			      ),
 	      'rows' => 20,
 	      'edit' => array(
@@ -47,6 +45,18 @@ $mask = array(
 					    'size' => 15,
 					    'required' => true,
 					    ),
+			      'anbkst_intern' => array(
+					    'name' => 'Kosten intern',
+					    'type' => 'decimal',
+					    'size' => 10,
+					    'required' => true,
+					    ),
+			      'anbkst_extern' => array(
+					    'name' => 'Kosten extern',
+					    'type' => 'decimal',
+					    'size' => 10,
+					    'required' => true,
+					    ),
 			      ),
 	      );
 
diff --git a/masks/geraete.php b/masks/geraete.php
index 79bb815..ae27923 100644
--- a/masks/geraete.php
+++ b/masks/geraete.php
@@ -19,20 +19,18 @@ $mask = array(
 					    'specs' => "decPlaces: 2, ClassName: 'alignright'",
 					    'width' => 50,
 					    ),
-/*
 			      'geraetkst_intern' => array(
-					    'name' => 'intern',
+					    'name' => 'interne Kosten',
 					    'type' => 'number',
 					    'specs' => "decPlaces: 2, ClassName: 'alignright'",
 					    'width' => 60,
 					    ),
 			      'geraetkst_extern' => array(
-					    'name' => 'extern',
+					    'name' => 'externe Kosten',
 					    'type' => 'number',
 					    'specs' => "decPlaces: 2, ClassName: 'alignright'",
 					    'width' => 60,
 					    ),
-*/
 			      ),
 	      'rows' => 20,
 	      'edit' => array(
@@ -42,8 +40,14 @@ $mask = array(
 					    'size' => 24,
 					    'required' => true,
 					    ),
-			      'gerstdsatz' => array(
-					    'name' => 'Stundensatz',
+			      'geraetkst_intern' => array(
+					    'name' => 'Gerätekosten intern',
+					    'type' => 'decimal',
+					    'size' => 15,
+					    'required' => true,
+					    ),
+			      'geraetkst_extern' => array(
+					    'name' => 'Gerätekosten extern',
 					    'type' => 'decimal',
 					    'size' => 15,
 					    'required' => true,
diff --git a/masks/kostenstellen.php b/masks/kostenstellen.php
index 67cefd7..f3b8a6c 100644
--- a/masks/kostenstellen.php
+++ b/masks/kostenstellen.php
@@ -27,10 +27,9 @@ $mask = array(
 					    'specs' => "decPlaces: 2, ClassName: 'alignright'",
 					    'width' => 65,
 					    ),
-/*
-			      'dienstlstg' => array(
+			      'dienstleistung' => array(
 					    'name' => 'Dienstleistung',
-#					    'type' => 'number',
+					    'type' => 'number',
 					    'specs' => "ClassName: 'alignright'",
 					    'width' => 50,
 					    ),
@@ -40,7 +39,6 @@ $mask = array(
 					    'specs' => "ClassName: 'alignright'",
 					    'width' => 50,
 					    ),
-*/
 			      ),
 	      'rows' => 20,
 	      'edit' => array(
@@ -61,6 +59,14 @@ $mask = array(
 					    'width' => 65,
 					    'required' => true,
 					    ),
+			      'dienstleistung' => array(
+					    'name' => 'Dienstleistung',
+					    'type' => 'boolean',
+					    ),
+			      'gereinigt' => array(
+					    'name' => 'gereinigt',
+					    'type' => 'boolean',
+					    ),
 			      ),
 	      );
 
diff --git a/masks/materialien.php b/masks/materialien.php
index ea845ee..20abaec 100644
--- a/masks/materialien.php
+++ b/masks/materialien.php
@@ -47,7 +47,6 @@ $mask = array(
 					    'type' => 'decimal',
 					    'size' => 10,
 					    'comment' => 'immer brutto',
-					    'null' => true,
 					    ),
 			      ),
 	      );
diff --git a/masks/personal.php b/masks/personal.php
index e27d6b1..910a66e 100644
--- a/masks/personal.php
+++ b/masks/personal.php
@@ -36,6 +36,11 @@ $mask = array(
 					    'width' => 100,
 					    'visible' => false,
 					    ),
+			      'email' => array(
+					    'name' => 'E-Mail',
+					    'width' => 100,
+					    'visible' => false,
+					    ),
 			      'persstdsatz' => array(
 					    'name' => 'Satz',
 					    'type' => 'number',
@@ -121,6 +126,12 @@ $mask = array(
 					    'size' => 24,
 					    'null' => true,
 					    ),
+			      'email' => array(
+					    'name' => 'E-Mail',
+					    'type' => 'text',
+					    'size' => 24,
+					    'null' => true,
+					    ),
 			      'persstdsatz' => array(
 					    'name' => 'Stundensatz',
 					    'type' => 'decimal',