v20191031

diff --git a/CGI/tmpl/app/invoicejournal/index.tt b/CGI/tmpl/app/invoicejournal/index.tt
index 9e49176..e70b45c 100644 (file)
--- a/CGI/tmpl/app/invoicejournal/index.tt
+++ b/CGI/tmpl/app/invoicejournal/index.tt
@@ -25,13 +25,13 @@ class="w3-bar-item w3-button w3-right w3-padding-16" title="close Sidebar">&time
       <a href="javascript:admin.loadpage('module/dashboard/index.html','Übersicht');" class="w3-bar-item w3-button">Übersicht</a>
       <a href="javascript:admin.loadpage('module/invoicejournal/index.html','Journal');" class="w3-bar-item w3-button">Journal</a>
       <a href="javascript:admin.loadpage('module/sales/index.html','Verkäufe');" class="w3-bar-item w3-button">Verkäufe</a>
-      <a href="javascript:admin.loadpage('module/invoices/index.html','Rechnungs-Erstellung');" class="w3-bar-item w3-button">Rechnungs-Erstellung</a>
+      <!-- <a href="javascript:admin.loadpage('module/invoices/index.html','Rechnungs-Erstellung');" class="w3-bar-item w3-button">Rechnungs-Erstellung</a> -->
       <a href="javascript:admin.loadpage('module/accounts/index.html','Adressen');" class="w3-bar-item w3-button">Addressen</a>
       <a href="javascript:admin.loadpage('module/bankaccount/index.html','Bankkonto');" class="w3-bar-item w3-button">Bankkonto</a>
-      <a href="javascript:admin.loadpage('module/documents/index.html','Dokumente');" class="w3-bar-item w3-button">Dokumente</a>
+      <!-- <a href="javascript:admin.loadpage('module/documents/index.html','Dokumente');" class="w3-bar-item w3-button">Dokumente</a> -->
       <a href="javascript:admin.loadpage('module/offers/index.html','Angebote');" class="w3-bar-item w3-button">Angebote</a>
       <a href="javascript:admin.loadpage('module/products/index.html','Produkte');" class="w3-bar-item w3-button">Produkte</a>
-      <a href="javascript:admin.loadpage('module/templates/index.html','Vorlagen');" class="w3-bar-item w3-button">Vorlagen</a>
+      <!-- <a href="javascript:admin.loadpage('module/templates/index.html','Vorlagen');" class="w3-bar-item w3-button">Vorlagen</a> -->
       <a href="javascript:admin.loadpage('module/settings/index.html','Einstellungen');" class="w3-bar-item w3-button">Einstellungen</a></li>
 
 </div>

diff --git a/CGI/tmpl/app/invoicejournal/module/invoicejournal/index.js b/CGI/tmpl/app/invoicejournal/module/invoicejournal/index.js
index 0f5d27d..d8e0790 100644 (file)
--- a/CGI/tmpl/app/invoicejournal/module/invoicejournal/index.js
+++ b/CGI/tmpl/app/invoicejournal/module/invoicejournal/index.js
@@ -5,6 +5,8 @@ var statustypes = [{"value":"planned","label":"geplant"},
 {"value":"payed","label":"bezahlt"},
 {"value":"overdue","label":"überfällig"}
 ];
+
+var statuslang = {"planned":"geplant","payed":"bezahlt","received":"erhalten","overdue":"überfällig","sended":"verschickt"};
 var quarters =[{"value":"Q1","label":"Q1"},{"value":"Q2","label":"Q2"},{"value":"Q3","label":"Q3"},{"value":"Q4","label":"Q4"}];
 var invoicetypes = [{"value":"inv-out","label":"Ausgangs-Rechnung"},{"value":"inv-in","label":"Eingangs-Rechnung"},{"value":"crn-out","label":"Ausgangs-Gutschrift"},{"value":"crn-in","label":"Eingangs-Gutschrift"}];
 
@@ -57,17 +59,17 @@ function initpage(){
     {title:"Status",field:"status",headerFilter:"input",formatter:function(cell, formatterParams){
       var value = cell.getValue();
       //console.log(value.indexOf("bez"));
-      if(value.indexOf("bezahlt") >= 0){
-        return "<span style='color:green;'>" + value + "</span>";
+      if(value.indexOf("payed") >= 0){
+        return "<span style='color:green;'>" + statuslang[value] + "</span>";
       }
-      else if (value.indexOf("überfällig") >= 0) {
-        return "<span style='color:red; font-weight: bold;'>" + value + "</span>";
+      else if (value.indexOf("overdue") >= 0) {
+        return "<span style='color:red; font-weight: bold;'>" + statuslang[value]  + "</span>";
       } 
-      else if (value.indexOf("geplant") >= 0) {
-        return "<span style='color:grey;'>" + value + "</span>";
+      else if (value.indexOf("planned") >= 0) {
+        return "<span style='color:grey;'>" + statuslang[value]  + "</span>";
       }
       else{
-        return "<span style='color:orange;'>" + value + "</span>";
+        return "<span style='color:orange;'>" + statuslang[value]  + "</span>";
       }
    }},
     {title:"Betrag",field:"payedamount",align:"right",formatter:"money", formatterParams:{

diff --git a/CGI/tmpl/app/invoicejournal/module/invoicejournal/index.tt b/CGI/tmpl/app/invoicejournal/module/invoicejournal/index.tt
index 3dea234..1fa6362 100644 (file)
--- a/CGI/tmpl/app/invoicejournal/module/invoicejournal/index.tt
+++ b/CGI/tmpl/app/invoicejournal/module/invoicejournal/index.tt
@@ -11,50 +11,50 @@
 </div>
 <div class="w3-display-container" id="tbl_invoices" style="margin-top: 50px;"></div>
 <div class="w3-display-container" id="pnl_invoices" style="display: none; margin-top: 50px;">
-<!-- <div class="w3-row" > -->
+
     <!-- <div class="w3-container w3-col l6"> -->
+      <div class="w3-container">
           <form id="frm_news">
           [% fieldhidden('id','invoices','ident') %]
           <div class="w3-container">
-              [% fieldselectbox('status','invoices','Status','w3-third','') %]
-              [% fieldselectbox('invoicetype','invoices','Typ','w3-third','') %]
-              [% fielddatebox('statusdate','invoices','Status-Datum','w3-quarter','readonly') %]
-              
-          </div>
-          <div class="w3-container w3-half">
-              [% fieldselectbox('id_receipient','invoices','Empfänger','','') %]
-              [% fieldtextarea('receipientaddress','display','Adresse','','readonly','') %]
+              [% fieldselectbox('status','invoices','Status','w3-fifth','') %]
+              [% fieldselectbox('invoicetype','invoices','Typ','w3-twofifth','') %]
+              [% fielddatebox('statusdate','invoices','Status-Datum','w3-fifth','readonly') %]
+              [% fieldselectbox('bquarter','invoices','G.Quartal','w3-fifth','') %]
           </div>
-          <div class="w3-container w3-half">
-              [% fieldselectbox('id_sender','invoices','Sender','','') %]
-              [% fieldtextarea('senderaddress','display','Adresse','','readonly','') %]
+          <div class="w3-container">
+              [% fieldselectbox('id_receipient','invoices','Empfänger','w3-half','') %]
+              [% fieldselectbox('id_sender','invoices','Sender','w3-half','') %]
+              
           </div>
-          
           <div class="w3-container">
-              [% fieldeditbox('reference','invoices','Referenz','w3-half','') %]
-              [% fielddatebox('invoicedate','invoices','Datum','w3-quarter','') %]
-              [% fielddatebox('deadlinedate','invoices','Fälligkeit','w3-quarter','') %]
+              [% fieldeditbox('reference','invoices','Referenz','w3-threefifth','') %]
+              [% fielddatebox('invoicedate','invoices','Datum','w3-fifth','') %]
+              [% fielddatebox('deadlinedate','invoices','Fälligkeit','w3-fifth','') %]
               
             </div>
             <div class="w3-container">
-              [% fieldmoneybox('netamount','invoices','Netto','w3-quarter','') %]
-              [% fieldmoneybox('vatamount','invoices','Mehrwertsteuer','w3-quarter','') %]
-              [% fieldmoneybox('grossamount','invoices','Brutto','w3-quarter','') %]
-              [% fieldmoneybox('payedamount','invoices','Bezahlt','w3-quarter','') %]
-            </div>
-            <div class="w3-container">
-              [% fieldeditbox('statement','invoices','Kontoauszug','w3-quarter','') %]
-              [% fieldselectbox('byear','invoices','Geschäfts-Jahr','w3-quarter','') %]
-              [% fieldselectbox('bquarter','invoices','Geschäfts-Quartal','w3-quarter','') %]
+              [% fieldmoneybox('netamount','invoices','Netto','w3-fifth','') %]
+              [% fieldmoneybox('vatamount','invoices','MwSt','w3-fifth','') %]
+              [% fieldmoneybox('grossamount','invoices','Brutto','w3-fifth','') %]
+              [% fieldmoneybox('payedamount','invoices','Bezahlt','w3-fifth','') %]
+              [% fieldeditbox('statement','invoices','Kontoauszug','w3-fifth','') %]
             </div>
-            <div class="w3-container">  
-              [% fielddatebox('Mahnung 1','invoices','reminderdate1','w3-quarter','') %] 
-              [% fielddatebox('Mahnung 2','invoices','reminderdate2','w3-quarter','') %] 
-              [% fielddatebox('Mahnung 3','invoices','reminderdate3','w3-quarter','') %] 
+            <div class="w3-container"> 
+              [% fieldtagbox('reminderdates','invoices','Mahnungs-Daten','w3-threefifth','') %] 
             </div>
           </form>
-      </div>    
-  
+        </div>
+        <div class="w3-container w3-margin-top">
+            <div class="w3-bar w3-border-top w3-border-bottom">
+                <button class="w3-bar-item w3-button w3-border w3-blue-grey" onclick="viewfiles();"><img src="[% abspath%][% staticpath %]img/icons/list_white.svg" style="height: 24px;"/> Dateien</button>
+                <button class="w3-bar-item w3-button w3-border w3-blue-grey" onclick="viewproducts();"><img src="[% abspath%][% staticpath %]img/icons/list_white.svg" style="height: 24px;"/> Produkte</button>
+            </div>
+            <div class="w3-container">
+
+            </div>
+        </div>   
+  </div>
   <!-- <div class="w3-container w3-col l6"> -->
       <!-- <div class="w3-container">
         <form id="frm_documents">

diff --git a/CGI/tmpl/macro/fields.tt b/CGI/tmpl/macro/fields.tt
index 36f498e..2199d65 100644 (file)
--- a/CGI/tmpl/macro/fields.tt
+++ b/CGI/tmpl/macro/fields.tt
@@ -80,7 +80,7 @@
 [% MACRO fielddatebox(column,table,title,size,state,value) BLOCK -%]
   <div class="w3-container [% IF size %][% size %][% END  %]">
         <label for="[% table %]_[% column %]" class="w3-label">[% title %]</label>
-        <input type="date" class="w3-input w3-border data_[% table %] datefield [% IF state.length > 0 %]w3-[% state %][% END %]" id="[% column %]" name="[% table %]_[% column %]" value="[% value %]" [% IF state.length > 0 %][% state %][% END %]]/>
+        <input type="date" class="w3-input w3-border data_[% table %] datefield [% IF state.length > 0 %]w3-[% state %][% END %]" id="[% column %]" name="[% table %]_[% column %]" value="[% value %]" [% IF state.length > 0 %][% state %][% END %]/>
         
       </div>
 [% END -%]

diff --git a/htdocs/css/w3pro.css b/htdocs/css/w3pro.css
index 62013ad..27c8a3d 100644 (file)
--- a/htdocs/css/w3pro.css
+++ b/htdocs/css/w3pro.css
@@ -44,8 +44,8 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0}
 .w3-ul{list-style-type:none;padding:0;margin:0}.w3-ul li{padding:8px 16px;border-bottom:1px solid #ddd}.w3-ul li:last-child{border-bottom:none}
 .w3-tooltip,.w3-display-container{position:relative}.w3-tooltip .w3-text{display:none}.w3-tooltip:hover .w3-text{display:inline-block}
 .w3-ripple:active{opacity:0.5}.w3-ripple{transition:opacity 0s}
-.w3-input{padding:8px;display:block;border:1px solid #ccc;width:100%;background-color: #e8f0fe; }
-.w3-select{padding:9px 0; display:block;width:100%;border:1px solid #ccc;background-color: #e8f0fe;}
+.w3-input{padding:4px;display:block;border:1px solid #ccc;width:100%;background-color: #e8f0fe; }
+.w3-select{padding:4px 0; display:block;width:100%;border:1px solid #ccc;background-color: #e8f0fe;}
 .w3-dropdown-click,.w3-dropdown-hover{position:relative;display:inline-block;cursor:pointer}
 .w3-dropdown-hover:hover .w3-dropdown-content{display:block; }
 .w3-dropdown-hover:first-child,.w3-dropdown-click:hover{background-color:#ccc;color:#000}
@@ -68,13 +68,13 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0}
 .w3-responsive{display:block;overflow-x:auto}
 .w3-container:after,.w3-container:before,.w3-panel:after,.w3-panel:before,.w3-row:after,.w3-row:before,.w3-row-padding:after,.w3-row-padding:before,
 .w3-cell-row:before,.w3-cell-row:after,.w3-clear:after,.w3-clear:before,.w3-bar:before,.w3-bar:after{content:"";display:table;clear:both}
-.w3-col,.w3-half,.w3-third,.w3-twothird,.w3-threequarter,.w3-quarter{float:left;width:100%}
+.w3-col,.w3-half,.w3-third,.w3-twothird,.w3-threequarter,.w3-quarter,.w3-fifth,.w3-twofifth,.w3-threefifth,.w3-fourfifth{float:left;width:100%}
 .w3-col.s1{width:8.33333%}.w3-col.s2{width:16.66666%}.w3-col.s3{width:24.99999%}.w3-col.s4{width:33.33333%}
 .w3-col.s5{width:41.66666%}.w3-col.s6{width:49.99999%}.w3-col.s7{width:58.33333%}.w3-col.s8{width:66.66666%}
 .w3-col.s9{width:74.99999%}.w3-col.s10{width:83.33333%}.w3-col.s11{width:91.66666%}.w3-col.s12{width:99.99999%}
-@media (min-width:601px){.w3-col.m1{width:8.33333%}.w3-col.m2{width:16.66666%}.w3-col.m3,.w3-quarter{width:24.99999%}.w3-col.m4,.w3-third{width:33.33333%}
+@media (min-width:601px){.w3-col.m1{width:8.33333%}.w3-col.m2{width:16.66666%}.w3-col.m3,.w3-quarter{width:24.99999%}.w3-col.m4,.w3-third{width:33.33333%}.w3-fifth{width:20%;min-width:100px}
 .w3-col.m5{width:41.66666%}.w3-col.m6,.w3-half{width:49.99999%}.w3-col.m7{width:58.33333%}.w3-col.m8,.w3-twothird{width:66.66666%}
-.w3-col.m9,.w3-threequarter{width:74.99999%}.w3-col.m10{width:83.33333%}.w3-col.m11{width:91.66666%}.w3-col.m12{width:99.99999%}}
+.w3-col.m9,.w3-threequarter{width:74.99999%}.w3-col.m10{width:83.33333%}.w3-col.m11{width:91.66666%}.w3-col.m12{width:99.99999%}.w3-twofifth{width:40%}.w3-threefifth{width:60%}.w3-fourfifth{width:80%}}
 @media (min-width:993px){.w3-col.l1{width:8.33333%}.w3-col.l2{width:16.66666%}.w3-col.l3{width:24.99999%}.w3-col.l4{width:33.33333%}
 .w3-col.l5{width:41.66666%}.w3-col.l6{width:49.99999%}.w3-col.l7{width:58.33333%}.w3-col.l8{width:66.66666%}
 .w3-col.l9{width:74.99999%}.w3-col.l10{width:83.33333%}.w3-col.l11{width:91.66666%}.w3-col.l12{width:99.99999%}}
@@ -106,7 +106,7 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0}
 .w3-circle{border-radius:50%}
 .w3-round-small{border-radius:2px}.w3-round,.w3-round-medium{border-radius:4px}.w3-round-large{border-radius:8px}.w3-round-xlarge{border-radius:16px}.w3-round-xxlarge{border-radius:32px}
 .w3-row-padding,.w3-row-padding>.w3-half,.w3-row-padding>.w3-third,.w3-row-padding>.w3-twothird,.w3-row-padding>.w3-threequarter,.w3-row-padding>.w3-quarter,.w3-row-padding>.w3-col{padding:0 8px}
-.w3-container,.w3-panel{padding:0.01em 16px}.w3-panel{margin-top:16px;margin-bottom:16px}
+.w3-container,.w3-panel{padding:0.01em 8px}.w3-panel{margin-top:8px;margin-bottom:8px}
 .w3-code,.w3-codespan{font-family:Consolas,"courier new";font-size:16px}
 .w3-code{width:auto;background-color:#fff;padding:8px 12px;border-left:4px solid #4CAF50;word-wrap:break-word}
 .w3-codespan{color:crimson;background-color:#f1f1f1;padding-left:4px;padding-right:4px;font-size:110%}

diff --git a/htdocs/vendor/choices/choices.css b/htdocs/vendor/choices/choices.css
index e3bc037..362287d 100644 (file)
--- a/htdocs/vendor/choices/choices.css
+++ b/htdocs/vendor/choices/choices.css
@@ -31,14 +31,14 @@
 }
 
 .choices[data-type*="select-one"] .choices__inner {
-  padding-bottom: 7.5px;
+  padding-bottom: 0px;
 
 }
 
 .choices[data-type*="select-one"] .choices__input {
   display: block;
   width: 100%;
-  padding: 10px;
+  padding: 4px;
   border-bottom: 1px solid #DDDDDD;
   background-color: #FFFFFF;
   margin: 0;
@@ -132,11 +132,11 @@
   vertical-align: top;
   width: 100%;
   background-color: #e8f0fe;
-  padding: 7.5px 7.5px 3.75px;
+  padding: 0px 0px 0px;
   border: 1px solid #ccc;
   /* border-radius: 2.5px; */
   /* font-size: 14px; */
-  min-height: 44px;
+  min-height: 40px;
   overflow: hidden;
   /* font-weight: bold; */
 }
@@ -162,7 +162,7 @@
 
 .choices__list--single {
   display: inline-block;
-  padding: 4px 16px 4px 4px;
+  padding: 6px 2px 2px 2px;
   width: 100%;
 }
 
@@ -228,7 +228,7 @@
   /* border-bottom-left-radius: 2.5px; */
   /* border-bottom-right-radius: 2.5px; */
   overflow: hidden;
-  word-break: break-all;
+  word-break: break-word;
 }
 
 .choices__list--dropdown.is-active {
@@ -267,7 +267,9 @@
 
 @media (min-width: 640px) {
   .choices__list--dropdown .choices__item--selectable {
-    padding-right: 100px;
+    padding-right: 10px;
+    word-wrap: none;
+    overflow: hidden;
   }
   .choices__list--dropdown .choices__item--selectable:after {
     content: attr(data-select-text);
@@ -277,10 +279,11 @@
     right: 10px;
     top: 50%;
     transform: translateY(-50%);
+    
   }
   [dir="rtl"] .choices__list--dropdown .choices__item--selectable {
     text-align: right;
-    padding-left: 100px;
+    padding-left: 10px;
     padding-right: 10px;
   }
   [dir="rtl"] .choices__list--dropdown .choices__item--selectable:after {