admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AAIT#36874 Status nieuw voor facturen

Browse Source 
svn path=/Website/trunk/; revision=30316
This commit is contained in:
Erik Groener
2016-08-16 10:48:28 +00:00
parent cc93686298
commit f11e740527
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
APPL/FIN/fin_list.inc
View File

@@ -10,7 +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_bron_key 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
@@ -46,7 +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_bron_key : key (0,1,2)
// params.fin_type : string ("O", "C" of "B")
// params.opdrnr : wildcard string
// params.finstatus : key
@@ -88,7 +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_bron_key = params.fin_bron_key;
var fin_type = params.fin_type;
var opdrnr = params.opdrnr;
var finstatus = params.finstatus;
@@ -477,7 +477,7 @@ 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 : "");
sql += (fin_bron_key ? " AND f.fin_factuur_bron = " + fin_bron_key : "");
if (findate_from)
{

6
APPL/FIN/fin_search.asp
View File

@@ -6,7 +6,7 @@
File: fin_search.asp
Description: Filterscherm voor overzicht facturen
Parameters: finnum Factuurnummer
fin_bron Factuur bron
fin_bron_key Factuur bron
fin_type Factuurtype
opdr_key Opdracht key
status Status
@@ -52,7 +52,7 @@ if (date_to)
}
var finnum = getQParam("finnum", ""); // Factuurnummer
var fin_bron = getQParam("fin_bron", -1); // Factuurbron Handmatig/Excel/Mail
var fin_bron_key = getQParamInt("fin_bron_key", -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
@@ -251,7 +251,7 @@ var isContactpersoon = user.isContactpersoon();
+ " UNION SELECT 2, " + safe.quoted_sql(L("lcl_fin_source_mail")) + " FROM DUAL";
FCLTselector("finbron",
sql,
{ initKey: fin_bron,
{ initKey: fin_bron_key,
label: L("lcl_fin_invoice_source"),
trclass: "primsearch",
emptyOption: ""

4
APPL/FIN/fin_search_list.asp
View File

@@ -42,7 +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_bron_key = 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
@@ -65,7 +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_bron_key = (fin_bron_key != -1? fin_bron_key : null);
params.fin_type = (fin_type != -1? fin_type : null);
params.opdrnr = (opdrnr != ""? opdrnr : null);
params.finstatus = (finstatus != -1? finstatus : null);

6
APPL/FIN/fin_search_list_xd.asp
View File

@@ -32,7 +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_bron_key = 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
@@ -46,7 +46,7 @@ var goedkeurdertekst = getQParam("goedkeurdertekst", "");
var params = {name: finnum,
start_invoicedate: findate_from,
end_invoicedate: findate_to,
sourcetype: fin_bron,
sourcetype: fin_bron_key,
referencetype: fin_type,
finstatus: finstatus,
debiteur_nr: debtor,
@@ -96,7 +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_bron_key!=-1) url += "&invoicesource="+safe.url(fin_bron_key);
if (fin_type!=-1) url += "&referencetype="+safe.url(fin_type);
if (goedkeurdertekst) url += "&goedkeur=~" + safe.url(goedkeurdertekst);
// if (fin_actual) url += ??