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

CONN#20969

Browse Source 
svn path=/Website/trunk/; revision=4176
This commit is contained in:
Maykel Geerdink
2011-07-27 09:53:54 +00:00
parent c1f92c103d
commit 78e14056d5
6 changed files with 58 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
APPL/FIN/details.inc
View File

@@ -1,6 +1,6 @@
<% /*
$Revision: 8 $
$Modtime: 13-12-10 12:00 $
$Revision: 9 $
$Modtime: 27-07-11 11:36 $
*/ %>
<%
@@ -21,14 +21,17 @@ function generateDetails(fin_key)
+ ", fr.fin_factuurregel_btw + fr.fin_factuurregel_totaal sumBTW"
+ ", fr.fin_factuurregel_omschrijving descr"
+ ", fr.fin_factuurregel_referentie ref"
+ ", fr.prs_kostensoort_key ksrt_key"
+ " FROM fin_factuurregel fr"
+ " WHERE fr.fin_factuur_key = " + fin_key
+ ", prs_kostensoort ks"
+ " WHERE fr.prs_kostensoort_key = ks.prs_kostensoort_key(+)"
+ " AND fr.fin_factuur_key = " + fin_key
+ " ORDER BY fr.fin_factuurregel_nr ";
oRs = Oracle.Execute(sql);
%>
<script type="text/javascript">
function ItemToAdd(fin_key, finrow_key, finrow_nr, sum, BTW, btwkey, sumBTW, descr, ref)
function ItemToAdd(fin_key, finrow_key, finrow_nr, sum, BTW, btwkey, sumBTW, descr, ref, ksrt_key)
{
this.fin_key = fin_key;
this.finrow_key = finrow_key;
@@ -39,6 +42,7 @@ function generateDetails(fin_key)
this.sumBTW = parseFloat(sumBTW);
this.descr = descr;
this.ref = ref;
this.ksrt_key = ksrt_key;
}
details_Items = new Array();
@@ -52,7 +56,8 @@ function generateDetails(fin_key)
<%=oRs("btwkey").value? oRs("btwkey").value : -1%>,
<%=safe.jsfloat(oRs("sumBTW").value)%>,
"<%=safe.jsstring(oRs("descr").value)%>",
"<%=safe.jsstring(oRs("ref").value)%>");
"<%=safe.jsstring(oRs("ref").value)%>",
<%=oRs("ksrt_key").value? oRs("ksrt_key").value : -1%>);
<% oRs.moveNext();
}

8
APPL/FIN/fin_edit_factuur.asp
View File

@@ -1,7 +1,7 @@
<%@ LANGUAGE="JavaScript" %>
<% /*
$Revision: 34 $
$Modtime: 25-07-11 10:27 $
$Revision: 35 $
$Modtime: 26-07-11 15:42 $
*/ %>
<!-- #include file="../../cust/install.inc" -->
@@ -432,6 +432,10 @@ var fin_btwtabel_key = oRs("fin_btwtabel_key").value; // Standaard btw tabel key
</th>
<th><%=lcl_descr%></th>
<th><%=lcl_location%></th>
<% if (fin_enable_kostensoort != 0)
{ %>
<th><%=LCL.shared.charge_type%></th>
<% } %>
<th align="right"><%=lcl_fin_total_sum_exBTW + " (" + currency_pref + currency_suff + ")"%></th>
<th align="right"><%=lcl_fin_btwtarief%></th>
<th align="right"><%=lcl_fin_total_sum_inBTW%></th>

7
APPL/FIN/fin_edit_factuur.js
View File

@@ -1,6 +1,6 @@
/*
$Revision: 15 $
$Modtime: 20-06-11 15:32 $
$Revision: 16 $
$Modtime: 27-07-11 11:57 $
File: fin_edit_factuur.js
*/
@@ -40,6 +40,7 @@ function checkInput()
{ // Er zijn geen volledig ingevulde factuurregels.
if (blank_lines == 0)
AddItem();
alert(LCL.fin.no_complete_invoice_rows);
return false;
}
@@ -50,7 +51,7 @@ function checkInput()
{ fac_nr: $("#finnr").val(),
deb_nr: $("#findebtor").val(),
fin_key: $("#fin_key").val() },
checkFactuurExistCallback);
checkFactuurExistCallback);
}
function fin_submit()

11
APPL/FIN/fin_edit_factuur_save.asp
View File

@@ -1,7 +1,7 @@
<%@ LANGUAGE = JavaScript %>
<% /*
$Revision: 15 $
$Modtime: 13-12-10 12:20 $
$Revision: 16 $
$Modtime: 27-07-11 12:03 $
File: fin_edit_factuur_save.asp
Description: Sla de wijzigingen van het fin_edit_factuur formulier op.
@@ -19,9 +19,7 @@
*/ %>
<!-- #include file="../../cust/install.inc" -->
<!-- #include file="../Shared/date_sql.inc" -->
<!-- #include file="../Shared/iface.inc" -->
<!-- #include file="../Shared/datetime.inc" -->
<!-- #include file="../shared/save2db.inc" -->
<!-- #include file="../Shared/kenmerk_common.inc" -->
<!-- #include file="fin.inc" -->
@@ -162,6 +160,7 @@ while (frnum <= rowIndex)
oRs = Oracle.Execute(sql);
// Er moet een waarde zijn
var BTW = oRs("fin_btwtabelwaarde_perc").value;
var fincostsrt = getFParamInt("fincostsrt" + frnum, -1);
frnum++;
if ((descr != '' || sum != 0))
@@ -174,6 +173,7 @@ while (frnum <= rowIndex)
+ ", fin_factuurregel_omschrijving"
+ ", fin_factuurregel_referentie"
+ ", fin_btwtabelwaarde_key"
+ ", prs_kostensoort_key"
+ ") VALUES ("
+ fin_key
+ ", " + regelnr
@@ -181,7 +181,8 @@ while (frnum <= rowIndex)
+ ", " + (sum * (BTW / 100))
+ ", " + safe.quoted_sql(descr)
+ ", " + safe.quoted_sql(ref)
+ ", " + BTWkey + ")";
+ ", " + BTWkey
+ ", " + (fincostsrt > 0? fincostsrt : "NULL") + ")";
oRs = Oracle.Execute(sql);
regelnr++;
}

9
APPL/FIN/fin_show_factuur.asp
View File

@@ -1,7 +1,7 @@
<%@ LANGUAGE="JavaScript" %>
<% /*
$Revision: 27 $
$Modtime: 25-07-11 10:28 $
$Revision: 28 $
$Modtime: 26-07-11 15:41 $
*/ %>
<!-- #include file="../../cust/install.inc" -->
@@ -35,6 +35,7 @@ ref_info = fin.getreferentieinfo(fin_factuur, fin_factuur.fin_nr);
<script language="vbscript" src="../LocalScripts/num2curr.vbs"></script>
<script type="text/javascript" >
var fin_key = <%=fin_key%>;
var fin_enable_kostensoort = <%=fin_enable_kostensoort%>;
jQuery(document).ready(function()
{
@@ -217,6 +218,10 @@ ref_info = fin.getreferentieinfo(fin_factuur, fin_factuur.fin_nr);
<tr>
<th><%=lcl_descr%></th>
<th><%=lcl_location%></th>
<% if (fin_enable_kostensoort != 0)
{ %>
<th><%=LCL.shared.charge_type%></th>
<% } %>
<th align="right"><%=lcl_fin_total_sum_exBTW + " (" + currency_pref + currency_suff + ")"%></th>
<th align="right"><%=lcl_fin_btwtarief%></th>
<th align="right"><%=lcl_fin_total_sum_inBTW%></th>

43
APPL/FIN/sel_items_tab.js
View File

@@ -1,6 +1,6 @@
/*
$Revision: 11 $
$Modtime: 21-06-11 16:08 $
$Revision: 12 $
$Modtime: 27-07-11 12:08 $
*/
function FinItem(sum, BTW, btwkey, descr, referentie, row)
@@ -30,19 +30,19 @@ function AddAllItems(editable)
for (i in details_Items)
{
var dii = details_Items[i]; // shortcut
//if (!dii.fin_key) continue; // Skip Prototype.js spul
CreateRow(dii.sum,
dii.BTW,
dii.btwkey,
dii.sumBTW,
dii.descr,
dii.ref);
dii.ref,
dii.ksrt_key);
}
}
function AddItem()
{
CreateRow(0, -1 /*DUMMY*/, fin_btw_default, 0, "", $("#loc_code").val()); // default waarde voor BTW meegeven.
CreateRow(0, -1 /*DUMMY*/, fin_btw_default, 0, "", $("#loc_code").val(), -1); // default waarde voor BTW meegeven.
}
function setPrice(index, sum)
@@ -54,12 +54,13 @@ function setPrice(index, sum)
var totalBTW = parseFloat(document.forms.u2.totalBTW.value.replace(',', '.'));
selectedItems[index].sumBTW = sumBTW;
selectedItems[index].row.cells[canInvLinChange?5:4].innerHTML = "<nobr>" + currency_pref
+ num2currEditable(selectedItems[index].sumBTW)
+ currency_suff + "</nobr>"
+ "<input type='hidden' id='sumBTW" + index
+ "' value='" + num2currEditable(selectedItems[index].sumBTW) + "'>"; // Fill sumBTW
// is dropbox en kostensoort veld aanwezig?
var cellindex = 6 - (!canInvLinChange? 1 : 0) - (fin_enable_kostensoort == 0? 1 : 0);
selectedItems[index].row.cells[cellindex].innerHTML = "<nobr>" + currency_pref
+ num2currEditable(selectedItems[index].sumBTW)
+ currency_suff + "</nobr>"
+ "<input type='hidden' id='sumBTW" + index
+ "' value='" + num2currEditable(selectedItems[index].sumBTW) + "'>"; // Fill sumBTW
var new_sum = sum;
var new_sumBTW = sumBTW;
@@ -72,7 +73,7 @@ function setPrice(index, sum)
document.all.totalBTW_txt.innerHTML = currency_pref + num2currEditable(parseFloat(totalBTW)) + currency_suff;
}
function CreateRow(sum, BTW, btwkey, sumBTW, descr, ref)
function CreateRow(sum, BTW, btwkey, sumBTW, descr, ref, ksrt_key)
{
rowIndex++;
table = document.all.sel_items;
@@ -101,6 +102,16 @@ function CreateRow(sum, BTW, btwkey, sumBTW, descr, ref)
+ " onfocus='document.all.ref" + rowIndex + ".select();'"
+ " id='ref" + rowIndex + "' name='ref" + rowIndex + "' maxlength=30 value='" + ref + "'>";
if (fin_enable_kostensoort != 0)
{
// Create charge type field
cell = tr.insertCell();
cell.innerHTML = "<div id='selectchargetypediv" + rowIndex + "'></div>";
$("#selectchargetypediv" + rowIndex).load("../Shared/loadChargeType.asp?idindex=" + rowIndex
+ (canInvLinChange? "" : "&readonly=1")
+ "&fin_costsrt_key=" + ksrt_key);
}
// Create sum field
cell = tr.insertCell();
cell.innerHTML = "<input type='text' class='fldfinsom'"
@@ -128,8 +139,8 @@ function CreateRow(sum, BTW, btwkey, sumBTW, descr, ref)
else
cell.innerHTML = BTW + "%"
+ "<input type='hidden' id='BTW" + rowIndex
+ "' name='BTW" + rowIndex + "' onChange='BTWChanged();'"
+ "value=" + btwkey + ">";
+ "' name='BTW" + rowIndex + "'"
+ " value=" + btwkey + ">";
cell.align = 'right';
// Sum incl. tax
@@ -200,10 +211,6 @@ function isGoodNumber(str, checkInteger)
function SumChanged()
{
// enable the OK button
//str1 = "enableButton('btnMakeOrder', true, MakeOrder);";
//setTimeout(str1,50);
obj = event.srcElement;
sum = parseFloat(obj.value.replace(',', '.'));
defaultamount = 0;