AAIT#36874 Status nieuw voor facturen

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

APPL/FIN/fin.inc

@@ -398,6 +398,7 @@ fin = { func_enabled_factuur: // Wat mag ik zoal op deze specifieke factuur?
                     + "     , f.prs_perslid_key_user"
                     + "     , f.prs_perslid_key_goedkeur"
                     + "     , f.fin_factuur_opmerking"
+                    + "     , f.fin_factuur_bron"
                     + "     , f.fin_factuur_statuses_key"
                     + "     , (SELECT " + S("prs_pers_string")
                       +      "   FROM prs_perslid p"
@@ -441,6 +442,8 @@ fin = { func_enabled_factuur: // Wat mag ik zoal op deze specifieke factuur?
                                 fin_opm: oRs("fin_factuur_opmerking").Value,
                                 fin_status_key: oRs("fin_factuur_statuses_key").Value,
                                 fin_status_oms: fin.getfinstatustext(oRs("fin_factuur_statuses_key").Value),
+                                fin_bron_key: oRs("fin_factuur_bron").Value,
+                                fin_bron_oms: fin.getfinbrontext(oRs("fin_factuur_bron").Value),
                                 fin_perslid_user: oRs("name_user").Value,
                                 fin_perslid_goedkeur: oRs("name_goedkeur").Value,
                                 fin_date: new Date(oRs("fin_factuur_datum").Value),
@@ -1216,6 +1219,20 @@ fin = { func_enabled_factuur: // Wat mag ik zoal op deze specifieke factuur?
              return statustekst;
           },
 
+        getfinbrontext:
+          function (p) {
+              var brontekst = "??";
+              var s = parseInt(p,10);
+              switch (s) {
+                  case 0: { brontekst = L("lcl_fin_source_manual"); break; }
+                  case 1: { brontekst = L("lcl_fin_source_excel"); break; }
+                  case 2: { brontekst = L("lcl_fin_source_mail"); break; }
+              }
+              if (Session("logging")>0)
+                brontekst += " ("+String(s)+")";
+              return brontekst;
+          },
+
         deleteFactuurregel:
           function _deleteFactuurregel(pFinregel_key)
           {

APPL/FIN/fin_edit_factuur.asp

@@ -55,6 +55,8 @@ else // nieuwe factuur. Defaults bepalen
 
     fin_factuur.fin_status_key = 2;
     fin_factuur.fin_status_oms = "";
+    fin_factuur.fin_bron_key = 0;
+    fin_factuur.fin_bron_oms = "";
     // Factuurregels niet kopi<70>ren. Totaal en BTW zijn dan 0;
     fin_factuur.fin_totaal = 0;
     fin_factuur.fin_totaal_btw = 0;
@@ -82,6 +84,8 @@ else // nieuwe factuur. Defaults bepalen
                     fin_opm: "",
                     fin_status_key: 2,
                     fin_status_oms: "",
+                    fin_bron_key: 0,
+                    fin_bron_oms: "",
                     fin_perslid_user: user.naam(),
                     fin_perslid_goedkeur: "",
                     fin_date: new Date(),
@@ -362,6 +366,7 @@ var fin_btwtabel_key = oRs("fin_btwtabel_key").value; // Standaard btw tabel key
                             });
         ROFIELDTR("fld", L("lcl_shared_created_by"), fin_factuur.fin_perslid_user); // Aangemaakt door
         ROFIELDTR("fld", L("lcl_fin_invoice") + " " + L("lcl_fin_fin_status"), fin_factuur.fin_status_oms); // Factuur status
+        ROFIELDTR("fld", L("lcl_fin_invoice_source"), fin_factuur.fin_bron_oms, {suppressEmpty: true});
 
         // Opmerking
         RWTEXTAREATR("remark",

APPL/FIN/fin_list.inc

@@ -10,6 +10,7 @@
          findate_from    search for invoices with the given from date
          findate_to      search for invoices with the given to date
          finnum          search for invoices with the given factuurnr
+         fin_bron        search for invoices with the given invoice source (0,1,2)
          fin_type        search for invoices with the given fin type (O,B,C)
          opdrnr          search for invoices with the given order number (opdracht nummer)
          finstatus       search for invoices with the given fin status
@@ -45,6 +46,7 @@ function fin_list (params)
   // params.showall       : boolean (true | false)
   // params.datefrom      : findate_from
   // params.dateto        : findate_to
+  // params.fin_bron      : key (0,1,2)
   // params.fin_type      : string ("O", "C" of "B")
   // params.opdrnr        : wildcard string
   // params.finstatus     : key
@@ -86,6 +88,7 @@ function fin_list (params)
   var findate_from = params.datefrom;
   var findate_to = params.dateto;
   var finnum = params.finnum;
+  var fin_bron = params.fin_bron;
   var fin_type = params.fin_type;
   var opdrnr = params.opdrnr;
   var finstatus = params.finstatus;
@@ -144,6 +147,7 @@ function fin_list (params)
           + "     , COALESCE(NVL2(f.mld_opdr_key,  ins_srtdiscipline_prefix  || TO_CHAR(o.mld_melding_key) || '/' || o.mld_opdr_bedrijfopdr_volgnr, NULL),"
             + "              NVL2(f.cnt_contract_key, 'C' || cnt_contract_nummer_intern || NVL2(cnt_contract_versie, '.' || cnt_contract_versie, ''), NULL), "
             + "              NVL2(f.bes_bestelopdr_key, bo.bes_bestelopdr_id, NULL), ' ') opdrachtnr"
+          + "     , f.fin_factuur_bron"
           + "     , f.fin_factuur_totaal + f.fin_factuur_totaal_btw bedrag_incl_BTW"
           + "     , f.fin_factuur_totaal bedrag_excl_BTW"
           + "     , f.fin_factuur_statuses_key"
@@ -473,6 +477,8 @@ function fin_list (params)
       if (fin_type == "B")
         sql += " AND f.bes_bestelopdr_key IS NOT NULL";
 
+      sql += (fin_bron ? " AND f.fin_factuur_bron = " + fin_bron : "");
+
       if (findate_from)
       {
        sql += " AND f.fin_factuur_datum >= " + findate_from.beginToSQL();
@@ -774,6 +780,11 @@ function fin_list (params)
         else return "";
       }
 
+      function fnBron(oRs)
+      {
+        return fin.getfinbrontext(oRs("fin_factuur_bron").Value);
+      }
+
       function fnOpdrtypeOms(oRs)
       {
         if (oRs("mld_opdr_key").Value)
@@ -853,6 +864,8 @@ function fin_list (params)
         rst.addColumn(new Column({caption: L("lcl_prs_companies_leverancier_nr"), content: "leverancier_nr"}));
       rst.addColumn(new Column({caption: L("lcl_fin_invoice_nr_extern"), content: "factuurnr_extern"}));
       rst.addColumn(new Column({caption: L("lcl_fin_type"), content: fnOpdrtype}));
+      rst.addColumn(new Column({caption: L("lcl_fin_invoice_source"), content: fnBron}));
+
       rst.addColumn(new Column({caption: "", content: fnOpdrtypeOms, combine: true}));
       rst.addColumn(new Column({caption: L("lcl_fin_opdrachtnr"), content: "opdrachtnr", tooltip: fntotaalgeleverd}));
       if (excel)

APPL/FIN/fin_search.asp

@@ -6,6 +6,7 @@
      File:               fin_search.asp
      Description:        Filterscherm voor overzicht facturen
      Parameters:         finnum               Factuurnummer
+                         fin_bron             Factuur bron
                          fin_type             Factuurtype
                          opdr_key             Opdracht key
                          status               Status
@@ -51,6 +52,7 @@ if (date_to)
 }
 
 var finnum = getQParam("finnum", ""); // Factuurnummer
+var fin_bron = getQParam("fin_bron", -1); // Factuurbron Handmatig/Excel/Mail
 var fin_type = getQParam("fin_type", -1); // Factuurtype "O", "B" of "C"
 var opdrnr = getQParam("opdrnr", -1); // Opdrachtnummer
 var finstatus = getQParamInt("finstatus", -1); // Factuurstatus
@@ -243,6 +245,17 @@ var isContactpersoon = user.isContactpersoon();
             <!-- Actuele en verwijderde facturen -->
 <%          RWCHECKBOXTR("fin_actual", "fldfinactual", L("lcl_fin_show_actual"), fin_actual, { trclass: "primsearch", html: "onClick='checkboxStatus();'" });
             RWCHECKBOXTR("fin_deleted", "fldfindeleted", L("lcl_fin_show_deleted"), fin_deleted, { trclass: "primsearch", html: "onClick='checkboxStatus();'" });
+
+            sql =        "SELECT 0, " + safe.quoted_sql(L("lcl_fin_source_manual")) + " FROM DUAL"
+                + " UNION SELECT 1, " + safe.quoted_sql(L("lcl_fin_source_excel")) + " FROM DUAL"
+                + " UNION SELECT 2, " + safe.quoted_sql(L("lcl_fin_source_mail")) + " FROM DUAL";
+            FCLTselector("finbron",
+                         sql,
+                         { initKey: fin_bron,
+                           label: L("lcl_fin_invoice_source"),
+                           trclass: "primsearch",
+                           emptyOption: ""
+                         });
 %>          </table>
           </td><!-- end column 1 -->
 

APPL/FIN/fin_search_list.asp

@@ -42,6 +42,7 @@ else
   var findate_from = getQParamDate("findate_from", null);
   var findate_to = getQParamDate("findate_to", null);
 
+  var fin_bron = getQParamInt("finbron", -1); // Factuurbron
   var fin_type = getQParam("fintype", -1); // Factuurtype (O,C of B)
   var opdrnr = getQParam("opdrnr", ""); // Opdrachtnummer
   var finstatus = getQParamInt("finstatus", -1); // Factuurstatus
@@ -64,6 +65,7 @@ else
   params.datefrom     = findate_from;
   params.dateto       = findate_to;
   params.finnum       = (finnum != -1 ? finnum : null);
+  params.fin_bron     = (fin_bron != -1? fin_bron : null);
   params.fin_type     = (fin_type != -1? fin_type : null);
   params.opdrnr       = (opdrnr != ""? opdrnr : null);
   params.finstatus    = (finstatus != -1? finstatus : null);

APPL/FIN/fin_search_list_xd.asp

@@ -32,6 +32,7 @@ var finnum     = getQParam("finnum", null,true); // Factuurnummer (string) of fa
 var findate_from = getQParamDate("findate_from", null);
 var findate_to   = getQParamDate("findate_to", null);
 
+var fin_bron   = getQParamInt("finbron", -1); // Factuurbron
 var fin_type   = getQParam("fintype", -1); // Factuurtype (O,C of B)
 //var opdrnr     = getQParam("opdrnr", ""); // Opdrachtnummer
 var finstatus  = getQParamInt("finstatus", -1); // Factuurstatus
@@ -45,6 +46,7 @@ var goedkeurdertekst = getQParam("goedkeurdertekst", "");
 var params = {name: finnum,
               start_invoicedate: findate_from,
               end_invoicedate: findate_to,
+              sourcetype: fin_bron,
               referencetype: fin_type,
               finstatus: finstatus,
               debiteur_nr: debtor,
@@ -94,6 +96,7 @@ for (var cid in xd.SecundaryDomains) {
     if (debtor)       url += "&debiteur_nr="+ safe.url(debtor);
     if (sumover)      url += "&start_total="+safe.url(sumover);
     if (sumbelow)     url += "&end_total="+safe.url(sumbelow);
+    if (fin_bron!=-1) url += "&invoicesource="+safe.url(fin_bron);
     if (fin_type!=-1) url += "&referencetype="+safe.url(fin_type);
     if (goedkeurdertekst) url += "&goedkeur=~" + safe.url(goedkeurdertekst);
 //    if (fin_actual)   url += ??
@@ -133,6 +136,7 @@ for(var cid in gottenitems){ // per omgeving
                       referencetype: (thisdata.referencetype == 'O' ? L("lcl_fin_mld_opdr")
                                     : (thisdata.referencetype == 'C' ? L("lcl_fin_cnt_contract")
                                       : (thisdata.referencetype == 'B' ? L("lcl_fin_bestelling") : ""))),
+                      factuur_bron: fin.getfinbrontext(thisdata.invoicesource),
                       factuurnr_extern: thisdata.name,
                       opdrachtnr: (thisdata.contract ? thisdata.contract.name
                                  : (thisdata.order ? thisdata.order.name
@@ -171,6 +175,7 @@ var rst = new ResultsetTable({ dataset: dataset,
   rst.addColumn(new Column({caption: L("lcl_handler"), content: "creditor"}));
   rst.addColumn(new Column({caption: L("lcl_fin_invoice_nr_extern"), content: "name"}));
   rst.addColumn(new Column({caption: L("lcl_fin_type"), content: "referencetype"}));
+  rst.addColumn(new Column({caption: L("lcl_fin_invoice_source"), content: "factuur_bron"}));
   rst.addColumn(new Column({caption: L("lcl_fin_opdrachtnr"), content: "opdrachtnr"}));
   rst.addColumn(new Column({caption: L("lcl_fin_total_sum_exBTW"), content: "bedrag_excl_BTW", datatype: "currency"}));
   rst.addColumn(new Column({caption: L("lcl_fin_total_sum"), content: "bedrag_incl_BTW", datatype: "currency", combine:true}));

APPL/FIN/fin_show_factuur.asp

@@ -132,6 +132,7 @@ var urlMail = "../shared/queuemail.asp?pcode=FINMAI&defemail_key=-1&key=" + fin_
                               }
                }
           ROFIELDTR("fld", L("lcl_fin_invoice") + " " + L("lcl_fin_fin_status"), fin_factuur.fin_status_oms, params); // Factuur status
+          ROFIELDTR("fld", L("lcl_fin_invoice_source"), fin_factuur.fin_bron_oms);
           ROTEXTAREATR("fldremark", L("lcl_fin_remark"), (fin_key != -1? fin_factuur.fin_opm : ""), {suppressEmpty: true});
         BLOCK_END();