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=30512
This commit is contained in:
Erik Groener
2016-09-01 17:47:36 +00:00
parent 00d2de5750
commit 086b8ddeb9
3 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
APPL/FIN/fin_list.inc
View File

@@ -864,9 +864,9 @@ 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_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_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_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: "", content: fnOpdrtypeOms, combine: true}));
rst.addColumn(new Column({caption: L("lcl_fin_invoice_source"), content: fnBron}));
rst.addColumn(new Column({caption: L("lcl_fin_opdrachtnr"), content: "opdrachtnr", tooltip: fntotaalgeleverd})); rst.addColumn(new Column({caption: L("lcl_fin_opdrachtnr"), content: "opdrachtnr", tooltip: fntotaalgeleverd}));
if (excel) if (excel)
rst.addColumn(new Column({caption: L("lcl_fin_bestelopdr_totaal"), content: "bestelopdr_totaal", datatype: "currency"})); rst.addColumn(new Column({caption: L("lcl_fin_bestelopdr_totaal"), content: "bestelopdr_totaal", datatype: "currency"}));

18
APPL/FIN/fin_search.asp
View File

@@ -243,10 +243,10 @@ var isContactpersoon = user.isContactpersoon();
</tr> </tr>
<!-- Actuele en verwijderde facturen --> <!-- Actuele en verwijderde facturen -->
<% <%
sql = "SELECT 0, " + safe.quoted_sql(L("lcl_fin_source_manual")) + " FROM DUAL" sql = "SELECT 0, " + safe.quoted_sql(fin.getfinbrontext(0)) + " FROM DUAL"
+ " UNION SELECT 1, " + safe.quoted_sql(L("lcl_fin_source_excel")) + " FROM DUAL" + " UNION SELECT 1, " + safe.quoted_sql(fin.getfinbrontext(1)) + " FROM DUAL"
+ " UNION SELECT 2, " + safe.quoted_sql(L("lcl_fin_source_mail")) + " FROM DUAL"; + " UNION SELECT 2, " + safe.quoted_sql(fin.getfinbrontext(2)) + " FROM DUAL";
FCLTselector("finbron", FCLTselector("finbron",
sql, sql,
{ initKey: fin_bron_key, { initKey: fin_bron_key,
@@ -254,7 +254,7 @@ var isContactpersoon = user.isContactpersoon();
trclass: "primsearch", trclass: "primsearch",
emptyOption: "" emptyOption: ""
}); });
<!-- status --> <!-- status -->
sql = "SELECT 1, " + safe.quoted_sql(fin.getfinstatustext(1)) + " FROM DUAL" sql = "SELECT 1, " + safe.quoted_sql(fin.getfinstatustext(1)) + " FROM DUAL"
+ " UNION SELECT 2, " + safe.quoted_sql(fin.getfinstatustext(2)) + " FROM DUAL" + " UNION SELECT 2, " + safe.quoted_sql(fin.getfinstatustext(2)) + " FROM DUAL"
@@ -269,8 +269,8 @@ var isContactpersoon = user.isContactpersoon();
label: L("lcl_fin_fin_status"), label: L("lcl_fin_fin_status"),
trclass: "primsearch", trclass: "primsearch",
emptyOption: "" emptyOption: ""
}); });
%> %>
<tr class="primsearch"> <tr class="primsearch">
<td class="label"><label><%=L("lcl_show")%>:</label></td> <td class="label"><label><%=L("lcl_show")%>:</label></td>
<td> <td>
@@ -279,7 +279,7 @@ var isContactpersoon = user.isContactpersoon();
<input type="checkbox" class="fldfindeleted" name="fin_deleted" id="fin_deleted" onClick="checkboxStatus()" value="1" <%=fin_deleted? "checked" : ""%>> <input type="checkbox" class="fldfindeleted" name="fin_deleted" id="fin_deleted" onClick="checkboxStatus()" value="1" <%=fin_deleted? "checked" : ""%>>
<label for=fin_deleted><%=L("lcl_fin_show_deleted")%></label> <label for=fin_deleted><%=L("lcl_fin_show_deleted")%></label>
</td> </td>
</tr> </tr>
</table> </table>
</td><!-- end column 1 --> </td><!-- end column 1 -->
@@ -341,7 +341,7 @@ var isContactpersoon = user.isContactpersoon();
<input type="text" class="fldopdrnr" name="opdrnr" <%=(opdrnr != -1) ? "value='" + opdrnr + "'" : ""%>> <input type="text" class="fldopdrnr" name="opdrnr" <%=(opdrnr != -1) ? "value='" + opdrnr + "'" : ""%>>
</td> </td>
</tr> </tr>
<% <%
// Persoon // Persoon
FCLTpersoonselector("budh_key", // budgethouders FCLTpersoonselector("budh_key", // budgethouders
"sgPerson", "sgPerson",

14
APPL/Shared/resultset_filter_table.inc
View File

@@ -556,6 +556,17 @@ function getRSFilterFinStatus(lparams, lStatusSep)
return lfilterStatus; return lfilterStatus;
} }
function getRSFilterFinBron(lparams, lStatusSep)
{
var lfilterStatus = "";
if (lparams.fin_bron_key == 0) lfilterStatus += (lfilterStatus == ""? "" : lStatusSep) + fin.getfinbrontext(0);
if (lparams.fin_bron_key == 1) lfilterStatus += (lfilterStatus == ""? "" : lStatusSep) + fin.getfinbrontext(1);
if (lparams.fin_bron_key == 2) lfilterStatus += (lfilterStatus == ""? "" : lStatusSep) + fin.getfinbrontext(2);
lfilterStatus = getRSFilterValueByValue(lfilterStatus, L("lcl_fin_invoice_source"));
return lfilterStatus;
}
function getRSFilterMldStatus(lparams, lStatusSep) function getRSFilterMldStatus(lparams, lStatusSep)
{ {
var lfilterStatus = ""; var lfilterStatus = "";
@@ -1570,6 +1581,9 @@ function getRSFilterColumns(lparams)
case "debtor": { lfilterValue = getRSFilterValueByValue(lparams[lparam], L("lcl_fin_debtor")); case "debtor": { lfilterValue = getRSFilterValueByValue(lparams[lparam], L("lcl_fin_debtor"));
break; break;
} }
case "fin_bron_key": { lfilterValue = getRSFilterFinBron(lparams, lStatusSep);
break;
}
case "finstatus": { lfilterValue = getRSFilterFinStatus(lparams, lStatusSep); case "finstatus": { lfilterValue = getRSFilterFinStatus(lparams, lStatusSep);
break; break;
} }