AADS#22224 Puntjes op de i van cnt-inactiveren

svn path=/Website/trunk/; revision=11539

APPL/CNT/cnt_edit_contract.asp

@@ -179,7 +179,7 @@ else
     IFRAMER_HEADER(L("lcl_cnt_frame_algemeen"), buttons);
       if (cnt_status == 1)
       {
-%>      <div class="cnt_deleted"><%=L("lcl_cnt_status")%>: <%=L("lcl_cnt_inactive")%></div><%
+%>      <div class="cnt_inactive"><%=L("lcl_cnt_is_inactive")%></div><%
       }
 %>
     <script type="text/javascript">

APPL/CNT/cnt_show_contract.asp

@@ -151,9 +151,6 @@ var cnt_inactive = oRs("cnt_contract_status").value;
 <%  var buttons = [];
     if (!cnt_deleted)
     {
-      if (this_cnt.canInactivate && (cnt_inactive != 1))
-        buttons.push({title: L("lcl_cnt_inactivate") , action:"cnt_inactivate()", icon: "delete.png"});
-
       if (this_cnt.canChange) {
           buttons.push({title: L("lcl_change"),     icon: "wijzigen.png", action:"cnt_change()" });
       }
@@ -169,6 +166,9 @@ var cnt_inactive = oRs("cnt_contract_status").value;
       if (this_cnt.canSplit) {
           buttons.push({title: L("lcl_cnt_newversion"), icon: "newversion.png", action:"cnt_newversion()", tooltip: L("lcl_cnt_newversion_hint")});  // CNT#16529
       }
+      if (this_cnt.canInactivate && (cnt_inactive != 1)) {
+        buttons.push({title: L("lcl_cnt_inactivate") , action:"cnt_inactivate()", icon: "cnt_inactive.png"});
+      }
       if (this_cnt.canDelete) {
           buttons.push({title: L("lcl_delete"),  icon: "delete.png", action:"cnt_delete()" });
       }
@@ -185,7 +185,7 @@ var cnt_inactive = oRs("cnt_contract_status").value;
       }
       if (cnt_inactive == 1)
       {
-%>      <div class="cnt_deleted"><%=L("lcl_cnt_status")%>: <%=L("lcl_cnt_inactive")%></div><%
+%>      <div class="cnt_inactive"><%=L("lcl_cnt_is_inactive")%></div><%
       }
 %>
       <form name=u2 onSubmit="return false;">

APPL/FIN/fin.inc

@@ -886,7 +886,8 @@ fin = { func_enabled_factuur: // Wat mag ik zoal op deze specifieke factuur?
                               + " WHERE fin_btwtabel_default = 1)) btwtabel_key"
                             + ", c.ins_discipline_key"
                             + "  FROM cnt_v_aanwezigcontract c"
-                            + "  WHERE c.cnt_contract_key = " + fin_factuur.cnt_key;
+                            + "  WHERE COALESCE(c.cnt_contract_status, 0) = 0 "  // actief; na upgrade DB16 komt null niet meer voor
+                            + "    AND c.cnt_contract_key = " + fin_factuur.cnt_key;
 
                         var oRs = Oracle.Execute(sql);
 

APPL/Shared/default.css

@@ -1883,11 +1883,14 @@ background-color: #E5EEF7;
 .deleted {
   text-decoration: line-through;
 }
-.alg_deleted, .cnt_deleted, .prs_deleted, .res_deleted {
+.alg_deleted, .cnt_deleted, .prs_deleted, .res_deleted, .cnt_inactive {
   background-color: red;
   color: white;
   font-weight: bold;
   text-align: center;
+  padding: 4px;
+  margin-top: 2px;
+  font-variant: small-caps;
 }
 .outofbounds {
   color: red;