From b7a4d0c9b714af5f264c1df9feff9c09262d690f Mon Sep 17 00:00:00 2001
From: Kilian Saffran <ksaffran@dks.lu>
Date: Wed, 23 Dec 2020 07:19:11 +0100
Subject: [PATCH] v20201223

---
 desktopapp/modules/invoices/invoice.html | 48 ++++++++++++------------
 desktopapp/modules/invoices/invoice.js   |  7 ++--
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/desktopapp/modules/invoices/invoice.html b/desktopapp/modules/invoices/invoice.html
index d58090e..f350dd5 100644
--- a/desktopapp/modules/invoices/invoice.html
+++ b/desktopapp/modules/invoices/invoice.html
@@ -1,8 +1,6 @@
 <div class="container bar toolbar">
   <button class="bar-item toolbarbtn" onclick="invoices.gettbldata();myapp.viewpanel('invoices');"><span class="icon-back" style="font-size: 16px;"></span>zurück</button>
-  <div class="bar-item PageHeadTitle">
-    Rechnung
-  </div>
+  <div class="bar-item PageHeadTitle">Rechnung</div>
   <button class="bar-item toolbarbtn" id="btnCreateInvoice" onclick="invoice.createPDF();"><span class="icon-pdf" style="font-size: 16px;"></span>erstellen</button> 
   <button class="bar-item toolbarbtn" id="btnOpenPDF" onclick=
   "invoice.openPDF();"><span class="icon-viewpdf" style="font-size: 16px;"></span>öffnen</button> 
@@ -26,7 +24,8 @@
       <input class="data_invoices" data-column="id_accounts" data-id="" data-table="invoices" id="invoices_id_accounts" name="invoices_id_accounts" type="hidden" value="">
       <div class="row">
         <div class="cell" style="width: 130px;">
-          <label class="label" for="invoices_invoicetype">Typ</label> <select class="select border data_invoices" data-column="invoicetype" data-id="" data-selected="" data-table="invoices" id="invoices_invoicetype" name="invoices_invoicetype" onchange="dataform.savefield(this);" value="">
+          <label class="label" for="invoices_invoicetype">Typ</label> 
+          <select class="select border data_invoices" data-column="invoicetype" data-id="" data-selected="" data-table="invoices" id="invoices_invoicetype"  onchange="dataform.savefield(this);" value="">
             <!-- <option class="" value="invoice-out">
               Ausgangs-Rechnung
             </option>
@@ -51,7 +50,8 @@
           </select>
         </div>
         <div class="cell" style="width: 130px;">
-          <label class="label" for="invoices_status">Status</label> <select class="select border data_invoices" data-column="status" data-id="" data-selected="" data-table="invoices" id="invoices_status" name="invoices_status" onchange="dataform.savefield(this);invoice.changedStatus(this);" value="">
+          <label class="label" for="invoices_status">Status</label> 
+          <select class="select border data_invoices" data-column="status" data-id="" data-selected="" data-table="invoices" id="invoices_status" onchange="dataform.savefield(this);invoice.changedStatus(this);" value="">
             <!-- <option class="text-black" value="preparation">
               Vorbereitung
             </option>
@@ -87,33 +87,33 @@
       </div>
       <div class="row" id="row_invoicetemplate">
         <div class="cell" style="width: 300px;">
-          <label class="label" for="invoices_id_template">Vorlage</label> <select class="select border data_invoices" data-column="id_template" data-id="" data-selected="" data-table="invoices" id="invoices_id_template" name=
-          "invoices_id_template" onchange="dataform.savefield(this);" value="">
+          <label class="label" for="invoices_id_template">Vorlage</label> 
+          <select class="select border data_invoices" data-column="id_template" data-id="" data-selected="" data-table="invoices" id="invoices_id_template" name="invoices_id_template" onchange="dataform.savefield(this);" value="">
           </select>
         </div>
       </div>
       <div class="row">
         <div class="cell" style="max-width: 140px;">
-          <label class="label" for="invoices_invoicedate">Datum</label> <input class="input border date data_invoices datefield" data-column="invoicedate" data-id="" data-table="invoices" id="invoices_invoicedate" name=
-          "invoices_invoicedate" onblur="dataform.savefield(this);invoice.setInvoiceDates();" type="date">
+          <label class="label" for="invoices_invoicedate">Datum</label> 
+          <input class="input border date data_invoices datefield" data-column="invoicedate" data-id="" data-table="invoices" id="invoices_invoicedate"  onblur="dataform.savefield(this);invoice.setInvoiceDates();" type="date">
         </div>
         <div class="cell" style="width: 40px;">
-          <label class="label" for="invoices_deadlinedays">Tage</label> <input class="input border number data_invoices right-align" data-column="deadlinedays" data-id="" data-table="invoices" id="invoices_deadlinedays" name=
-          "invoices_deadlinedays" onblur="dataform.savefield(this);invoice.setDeadlineDate();" type="number">
+          <label class="label" for="invoices_deadlinedays">Tage</label> 
+          <input class="input border number data_invoices right-align" data-column="deadlinedays" data-id="" data-table="invoices" id="invoices_deadlinedays" onblur="dataform.savefield(this);invoice.setDeadlineDate();" type="number">
         </div>
         <div class="cell" style="max-width: 140px;">
-          <label class="label" for="invoices_deadlinedate">Fälligkeit</label> <input class="input border date data_invoices datefield" data-column="deadlinedate" data-id="" data-table="invoices" id="invoices_deadlinedate" name=
-          "invoices_deadlinedate" onblur="dataform.savefield(this);invoice.setDeadlineDays();" type="date">
+          <label class="label" for="invoices_deadlinedate">Fälligkeit</label> 
+          <input class="input border date data_invoices datefield" data-column="deadlinedate" data-id="" data-table="invoices" id="invoices_deadlinedate" onblur="dataform.savefield(this);invoice.setDeadlineDays();" type="date">
         </div>
       </div>
       <div class="row">
         <div class="cell" style="width: 100px;">
-          <label class="label" for="invoices_businessyear">G.Jahr</label> <input class="input border number right-align data_invoices" data-column="businessyear" data-id="" data-table="invoices" id="invoices_businessyear" name=
-          "invoices_businessyear" onblur="dataform.savefield(this);" type="number">
+          <label class="label" for="invoices_businessyear">G.Jahr</label> 
+          <input class="input border number right-align data_invoices" data-column="businessyear" data-id="" data-table="invoices" id="invoices_businessyear" onblur="dataform.savefield(this);" type="number">
         </div>
         <div class="cell" style="width: 120px;">
-          <label class="label" for="invoices_payedamount">Bezahlt</label> <input class="input border currency right-align data_invoices" data-column="payedamount" data-id="" data-table="invoices" id="invoices_payedamount" name=
-          "invoices_payedamount" onblur="dataform.savefield(this);" type="number">
+          <label class="label" for="invoices_payedamount">Bezahlt</label> 
+          <input class="input border currency right-align data_invoices" data-column="payedamount" data-id="" data-table="invoices" id="invoices_payedamount"  onblur="dataform.savefield(this);" type="number">
         </div>
       </div><!--<div class="row" >
   <div class="cell" style="width: 400px;">
@@ -130,34 +130,34 @@
       </div>
       <div class="row">
         <div class="cell" style="width: 400px;">
-          <input class="input border text data_invoices" data-column="accountaddress" data-id="" data-table="invoices" id="invoices_accountaddress" name="invoices_accountaddress" onblur="dataform.savefield(this);" placeholder="Addresse"
+          <input class="input border text data_invoices" data-column="accountaddress" data-id="" data-table="invoices" id="invoices_accountaddress"  onblur="dataform.savefield(this);" placeholder="Addresse"
           type="text">
         </div>
       </div>
       <div class="row">
         <div class="cell" style="width: 40px;">
-          <input class="input border text data_invoices" data-column="accountcountry" data-id="" data-table="invoices" id="invoices_accountcountry" name="invoices_accountcountry" onblur="dataform.savefield(this);" placeholder="Land" type=
+          <input class="input border text data_invoices" data-column="accountcountry" data-id="" data-table="invoices" id="invoices_accountcountry"  onblur="dataform.savefield(this);" placeholder="Land" type=
           "text">
         </div>
         <div class="cell" style="width: 90px;">
-          <input class="input border text data_invoices" data-column="accountzip" data-id="" data-table="invoices" id="invoices_accountzip" name="invoices_accountzip" onblur="dataform.savefield(this);" placeholder="PLZ" type="text">
+          <input class="input border text data_invoices" data-column="accountzip" data-id="" data-table="invoices" id="invoices_accountzip"  onblur="dataform.savefield(this);" placeholder="PLZ" type="text">
         </div>
         <div class="cell" style="width: 270px;">
-          <input class="input border text data_invoices" data-column="accountcity" data-id="" data-table="invoices" id="invoices_accountcity" name="invoices_accountcity" onblur="dataform.savefield(this);" placeholder="Ort" type="text">
+          <input class="input border text data_invoices" data-column="accountcity" data-id="" data-table="invoices" id="invoices_accountcity"  onblur="dataform.savefield(this);" placeholder="Ort" type="text">
         </div>
       </div>
       <div class="row">
         <div class="cell" style="width: 200px;">
-          <input class="input border text data_invoices" data-column="clientnumber" data-id="" data-table="invoices" id="invoices_clientnumber" name="invoices_clientnumber" onblur="dataform.savefield(this);" placeholder="Kunden-Nr" type=
+          <input class="input border text data_invoices" data-column="clientnumber" data-id="" data-table="invoices" id="invoices_clientnumber"  onblur="dataform.savefield(this);" placeholder="Kunden-Nr" type=
           "text">
         </div>
         <div class="cell" style="width: 200px;">
-          <input class="input border text data_invoices" data-column="accountvatid" data-id="" data-table="invoices" id="invoices_accountvatid" name="invoices_accountvatid" onblur="dataform.savefield(this);" placeholder="USt.-ID" type="text">
+          <input class="input border text data_invoices" data-column="accountvatid" data-id="" data-table="invoices" id="invoices_accountvatid"  onblur="dataform.savefield(this);" placeholder="USt.-ID" type="text">
         </div>
       </div>
       <div class="row">
         <div class="cell" style="width: 400px;">
-          <label class="label" for="invoices_reference">Referenz</label> <input class="input border text data_invoices" data-column="reference" data-id="" data-table="invoices" id="invoices_reference" name="invoices_reference" onblur="dataform.savefield(this);" type="text">
+          <label class="label" for="invoices_reference">Referenz</label> <input class="input border text data_invoices" data-column="reference" data-id="" data-table="invoices" id="invoices_reference" onblur="dataform.savefield(this);" type="text">
         </div>
       </div>
       
diff --git a/desktopapp/modules/invoices/invoice.js b/desktopapp/modules/invoices/invoice.js
index 5477b9b..f16220d 100644
--- a/desktopapp/modules/invoices/invoice.js
+++ b/desktopapp/modules/invoices/invoice.js
@@ -2,7 +2,7 @@
 let invoice = {
   current_id: null,
   bookingtbl: null,
-  documents: null,
+  documents: {},
   //addresstbl: null,
   selects:{"invoices_invoicetype":null,"invoices_status":null,"invoices_id_template":null},
   viewpanel: function(id){
@@ -125,12 +125,12 @@ let invoice = {
     return false;
   },
   getStatusList: function(){
-    db.queryarray("SELECT id, status,color FROM statustypes where reporttypes LIKE '\"invoice\"' ORDER BY pos;").then(data => {
+    db.queryarray("SELECT id, status,color FROM statustypes where reporttypes LIKE '%\"invoice\"%' ORDER BY pos;").then(data => {
       let stypes = [];
       console.log("StatusList",data);
       for (var d in data){
         console.log("status",d,data[d]);
-        stypes.push({"value":data[d].id,"text":'<span style="'+ data[d].color+'">'+data[d].statustype+'</span>'});
+        stypes.push({"value":data[d].id,"text":'<span style="color:'+ data[d].color+';">'+data[d].status+'</span>'});
       }
       console.log("before add status",stypes);
       dataform.fillselectlist(invoice.selects["invoices_status"],stypes,'value','text');
@@ -143,6 +143,7 @@ let invoice = {
       for (var d in data){
         invoice.documents[data[d].id] = data[d];
       }
+      
       dataform.fillselectlist(invoice.selects["invoices_invoicetype"],data,'id','document');
     });
     return false;
-- 
2.39.5