fee should work-> works on old definitions

templates/body_full.html

@@ -117,10 +117,17 @@
      <a target="_blank" href="http://a73434.berlin.ptb.de:5984/vl_db/_design/applications/sofa.html?key={{CommonReferenceNo}}">{{DateInvoice}}</a>
   </td>
 
-  <td class="no_{{Number}}" title="{{OrderFees}}" data-row="{{Number}}">
-     <b>{{OrderFee}}</b>
+  <td class="no_{{Number}}" data-row="{{Number}}">
+    <a target="_blank" href="http://a73434.berlin.ptb.de:5984/vl_db/_design/applications/sofa.html?key={{CommonReferenceNo}}"><b>{{InvoiceAmount}}</b></a> 
   </td>
 
+  <td class="no_{{Number}}" title="{{OrderFees}}" data-row="{{Number}}">
+     {{OrderFee}}
+  </td>
+  
+  <td class="no_{{Number}}" title="{{OrderFees}}" data-row="{{Number}}">
+    {{AllStandard}}
+ </td>
   <td class="no_{{Number}}" title="" data-row="{{Number}}" style="word-wrap: break-word">
    {{SAPMaterialNumbers}}
  </td>

templates/header_full.html

@@ -91,7 +91,6 @@
               <th>Gegenstand</th>
               <th>Kalibrierziel</th>
             
-
               <th>Messbeauftragter</th>
               <th>Erstelldatum</th>
 
@@ -103,9 +102,12 @@
               <th>Fakturaanforderung </th>
               <th>Faktura</th>
 
-	            <th>Datum Rechnung</th>
-	            <th>Gebühr in €</th>
+              <th>Datum Rechnung</th>
+	            <th title="Gebühr für den gesamten Vorgang">Gesamtrechnungsgebühr in €</th>              
+	            <th title="Gebühr für das einzelne Messgerät">Einzelangebotsgebühr in €</th>
+              <th>Standard Punkte?</th>
               <th>SAP Materialnummern</th>
+              
 	            <th>tech. abgeschl.</th>
 
               <th>Email</th>

views/all/map.js

@@ -85,13 +85,9 @@ function(doc) {
       , dct      = dc.ToDo
       , pcp      = dc.Presettings
       , pcm      = dc.Measurement
-      , pca      = dc.Analysis
-      , dcc      = dc.Customer
       , cdcuco   = dc.CustomerObject
       , PresDate = {}
-      , MeasDate = ""
-      , AnDate   = ""
-
+      , MeasDate = "";
     // --- Date
     if(pcp && pcp.Date){
       for(var i = 0; i <   pcp.Date.length; i++){
@@ -112,8 +108,7 @@ function(doc) {
       , DateMeas     = MeasDate ? MeasDate.split(" ")[0]  : "";
 
     // --- Presettings
-    var ReferenceNo        =  missing
-      , CustomerReference  =  missing;
+    var ReferenceNo  =  missing;
 
     if(pcp) {
       ReferenceNo = pcp.ReferenceNo;
@@ -121,9 +116,7 @@ function(doc) {
 
     var spltRefNo           = ReferenceNo.split("-")
       , OrderNumber         = spltRefNo[4]
-      , sortOrderNumber     = pad.substring(0, pad.length - OrderNumber.length) + OrderNumber
-      , ReferenceYear       = spltRefNo[2]
-      , CommonReferenceNo   = [commonPrefix ,ReferenceYear , OrderNumber].join("-");
+      , sortOrderNumber     = pad.substring(0, pad.length - OrderNumber.length) + OrderNumber;
 
     // --- ToDo
     if(dct) {
@@ -139,6 +132,11 @@ function(doc) {
          var feeObject =  dct.Fees[i]
           if(feeObject.Type == "total"){
             OrderFee = feeObject.Fee;
+            if (feeObject.AllStandard === undefined) {
+              AllStandard = "fee calculation before 20.5.19";
+            } else {
+              AllStandard = feeObject.AllStandard ? "standard calib. points": "additional calib. points";  
+            }
           } else {
             if(dct.TimeBasedFee){
               OrderFees.push(feeObject.Description); 
@@ -153,7 +151,12 @@ function(doc) {
         } // for fee
         OrderFees = OrderFees.join(", ");
         SAPMaterialNumbers = SAPMaterialNumbers.join(", ");
-      }
+      } else { //fees
+        OrderFees = missing;
+        SAPMaterialNumbers = missing;
+        OrderFee = missing;
+        AllStandard = "fee calculation before 20.5.19";
+      } 
     }
 
     var DeviceName = missing
@@ -178,6 +181,7 @@ function(doc) {
            Certificate: dc.Certificate,
            DateGen: DateGen,
            DateCust: DateCust,
+           DateTerm: DateTerm, 
            DateSchedule: DateSchedule,
            DateMeas: DateMeas,
            ReferenceNo: ReferenceNo,
@@ -189,6 +193,7 @@ function(doc) {
            MeasMaintainer: MeasMaintainer,
            OrderFees : OrderFees,
            OrderFee : OrderFee,
+           AllStandard: AllStandard,
            SAPMaterialNumbers : SAPMaterialNumbers
           });
   }
@@ -203,7 +208,6 @@ function(doc) {
 
       if( mtch){
         var OrderNumber         =  mtch[5]
-          , CommonReferenceNo   = [commonPrefix, mtch[3],  OrderNumber].join("-")
           , sortOrderNumber     = pad.substring(0, pad.length - OrderNumber.length) + OrderNumber;
 
         if(doc._attachments){