diff --git a/html/js/acc_ledger.js b/html/js/acc_ledger.js
index 1251eab8b..3472ea290 100644
--- a/html/js/acc_ledger.js
+++ b/html/js/acc_ledger.js
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with NOALYSS; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+ */
/* $Revision$ */
// Copyright Author Dany De Bontridder danydb@aevalys.eu
@@ -24,23 +24,23 @@
* compute the sum, add a row at the table..
*
*/
-var layer=1;
+var layer = 1;
/**
-* @brief update the list of available predefined operation when we change the ledger.
-*/
-function update_predef(p_type,p_direct,p_ac)
+ * @brief update the list of available predefined operation when we change the ledger.
+ */
+function update_predef(p_type, p_direct, p_ac)
{
- var jrn=g("p_jrn").value;
- var dossier=g("gDossier").value;
- var querystring='gDossier='+dossier+'&l='+jrn+'&t='+p_type+'&d='+p_direct+"&op=up_predef&ac="+p_ac;
- g("p_jrn_predef").value=jrn;
+ var jrn = g("p_jrn").value;
+ var dossier = g("gDossier").value;
+ var querystring = 'gDossier=' + dossier + '&l=' + jrn + '&t=' + p_type + '&d=' + p_direct + "&op=up_predef&ac=" + p_ac;
+ g("p_jrn_predef").value = jrn;
var action = new Ajax.Request(
"ajax_misc.php",
{
method: 'get',
parameters: querystring,
onFailure: error_get_predef,
- onSuccess: function(req) {
+ onSuccess: function (req) {
try {
$('info_div').innerHTML = "ok";
var answer = req.responseXML;
@@ -54,7 +54,7 @@ function update_predef(p_type,p_direct,p_ac)
var code_html = getNodeText(html[0]);
code_html = unescape_xml(code_html);
// document.getElementsByName(name_ctl)[0].value = code_html;
- $('modele_op_div').innerHTML=code_html;
+ $('modele_op_div').innerHTML = code_html;
} catch (e) {
$('info_div').innerHTML = e.getMessage;
}
@@ -64,27 +64,27 @@ function update_predef(p_type,p_direct,p_ac)
}
/**
-* @brief update the list of payment method when we change the ledger.
-*/
+ * @brief update the list of payment method when we change the ledger.
+ */
function update_pay_method()
{
waiting_box();
- var jrn=g("p_jrn").value;
- var dossier=g("gDossier").value;
- var querystring='gDossier='+dossier+'&l='+jrn+"&op=up_pay_method";
- var action=new Ajax.Request(
- "ajax_misc.php",
- {
- method:'get',
- parameters:querystring,
- onFailure:error_get_predef,
- onSuccess:function(req){
- remove_waiting_box();
- var answer=req.responseText;
- $('payment').innerHTML=answer;
+ var jrn = g("p_jrn").value;
+ var dossier = g("gDossier").value;
+ var querystring = 'gDossier=' + dossier + '&l=' + jrn + "&op=up_pay_method";
+ var action = new Ajax.Request(
+ "ajax_misc.php",
+ {
+ method: 'get',
+ parameters: querystring,
+ onFailure: error_get_predef,
+ onSuccess: function (req) {
+ remove_waiting_box();
+ var answer = req.responseText;
+ $('payment').innerHTML = answer;
+ }
}
- }
- );
+ );
}
/**
@@ -92,65 +92,65 @@ function update_pay_method()
*/
function update_name()
{
- var jrn_id=$('p_jrn').value;
- var dossier=g("gDossier").value;
- var querystring='gDossier='+dossier+'&l='+jrn_id+"&op=ledger_description";
- var action=new Ajax.Request(
- "ajax_misc.php",
- {
- method:'get',
- parameters:querystring,
- onFailure:error_get_pj,
- onSuccess:function (req){
- $('jrn_name_div').innerHTML=req.responseText;
- }
- }
- );
-
+ var jrn_id = $('p_jrn').value;
+ var dossier = g("gDossier").value;
+ var querystring = 'gDossier=' + dossier + '&l=' + jrn_id + "&op=ledger_description";
+ var action = new Ajax.Request(
+ "ajax_misc.php",
+ {
+ method: 'get',
+ parameters: querystring,
+ onFailure: error_get_pj,
+ onSuccess: function (req) {
+ $('jrn_name_div').innerHTML = req.responseText;
+ }
+ }
+ );
+
}
/**
* @brief update the field predef
*/
-function error_get_predef(request,json)
+function error_get_predef(request, json)
{
- alert ("Erreur mise à jour champs non possible");
+ alert("Erreur mise à jour champs non possible");
}
/**
-* @brief update the list of available predefined operation when we change the ledger.
-*/
+ * @brief update the list of available predefined operation when we change the ledger.
+ */
function update_pj()
{
- var jrn=g("p_jrn").value;
- var dossier=g("gDossier").value;
- var querystring='gDossier='+dossier+'&l='+jrn+"&op=upd_receipt";
- var action=new Ajax.Request(
- "ajax_misc.php",
- {
- method:'get',
- parameters:querystring,
- onFailure:error_get_pj,
- onSuccess:success_get_pj
- }
- );
+ var jrn = g("p_jrn").value;
+ var dossier = g("gDossier").value;
+ var querystring = 'gDossier=' + dossier + '&l=' + jrn + "&op=upd_receipt";
+ var action = new Ajax.Request(
+ "ajax_misc.php",
+ {
+ method: 'get',
+ parameters: querystring,
+ onFailure: error_get_pj,
+ onSuccess: success_get_pj
+ }
+ );
}
/**
*ask the name, quick_code of the bank for the ledger
*/
function update_bank()
{
- var jrn=g('p_jrn').value;
- var dossier=g('gDossier').value;
- var qs='gDossier='+dossier+'&op=bkname&p_jrn='+jrn;
- var action=new Ajax.Request(
- "ajax_misc.php",
- {
- method:'get',
- parameters:qs,
- onFailure:error_get_pj,
- onSuccess:success_update_bank
- }
- );
+ var jrn = g('p_jrn').value;
+ var dossier = g('gDossier').value;
+ var qs = 'gDossier=' + dossier + '&op=bkname&p_jrn=' + jrn;
+ var action = new Ajax.Request(
+ "ajax_misc.php",
+ {
+ method: 'get',
+ parameters: qs,
+ onFailure: error_get_pj,
+ onSuccess: success_update_bank
+ }
+ );
}
/**
@@ -158,55 +158,57 @@ function update_bank()
*/
function update_row(ctl)
{
- try
- {
- var jrn=g('p_jrn').value;
- var dossier=g('gDossier').value;
- var qs='gDossier='+dossier+'&op=minrow&j='+jrn+'&ctl='+ctl;
- var action=new Ajax.Request(
- "ajax_misc.php",
- {
- method:'get',
- parameters:qs,
- onFailure:null,
- onSuccess:function(request,json)
- {
- try {
- var answer=request.responseText.evalJSON(true);
- var row=parseFloat(answer.row);
- var current_row=parseFloat($('nb_item').value);
- if ( current_row > row ) {
- // Too many row
- var delta=$('nb_item').value-row;
- var idx=$('nb_item').value;
- for (var i=0;i row) {
+ // Too many row
+ var delta = $('nb_item').value - row;
+ var idx = $('nb_item').value;
+ for (var i = 0; i < delta; i++) {
+ $(ctl).deleteRow(-1);
+ idx--;
+ }
+ $('nb_item').value = row;
+ }
+ if (current_row < row) {
+ // We need to add rows
+ var delta = row - current_row;
+ for (var i = 0; i < delta; i++) {
+ if (ctl == 'fin_item') {
+ ledger_fin_add_row();
+ }
+ if (ctl == 'sold_item') {
+ ledger_add_row();
+ }
+ if (ctl == 'quick_item') {
+ quick_writing_add_row();
+ }
+ }
+ }
+ } catch (e) {
+ alert(e.getMessage);
+ }
+ }
+ }
+ );
+ } catch (e) {
+ alert(e.getMessage);
+ }
}
/**
* Put into the span, the name of the bank, the bank account
@@ -216,22 +218,22 @@ function success_update_bank(req)
{
try
{
- var answer=req.responseXML;
- var a=answer.getElementsByTagName('code');
- var html=answer.getElementsByTagName('value');
- if ( a.length == 0 )
+ var answer = req.responseXML;
+ var a = answer.getElementsByTagName('code');
+ var html = answer.getElementsByTagName('value');
+ if (a.length == 0)
{
- var rec=req.responseText;
- alert ('erreur :'+rec);
+ var rec = req.responseText;
+ alert('erreur :' + rec);
}
- var name_ctl=a[0].firstChild.nodeValue;
- var code_html=getNodeText(html[0]);
- code_html=unescape_xml(code_html);
- $(name_ctl).innerHTML=code_html;
+ var name_ctl = a[0].firstChild.nodeValue;
+ var code_html = getNodeText(html[0]);
+ code_html = unescape_xml(code_html);
+ $(name_ctl).innerHTML = code_html;
}
catch (e)
{
- alert("success_update_bank"+e.message);
+ alert("success_update_bank" + e.message);
}
}
/**
@@ -239,18 +241,18 @@ function success_update_bank(req)
*/
function get_last_date()
{
- var jrn=g('p_jrn').value;
- var dossier=g('gDossier').value;
- var qs='gDossier='+dossier+'&op=lastdate&p_jrn='+jrn;
- var action=new Ajax.Request(
- "ajax_misc.php",
- {
- method:'get',
- parameters:qs,
- onFailure:error_get_pj,
- onSuccess:success_get_last_date
- }
- );
+ var jrn = g('p_jrn').value;
+ var dossier = g('gDossier').value;
+ var qs = 'gDossier=' + dossier + '&op=lastdate&p_jrn=' + jrn;
+ var action = new Ajax.Request(
+ "ajax_misc.php",
+ {
+ method: 'get',
+ parameters: qs,
+ onFailure: error_get_pj,
+ onSuccess: success_get_last_date
+ }
+ );
}
/**
* callback ajax, set the ctl with the last date from the ledger
@@ -259,18 +261,18 @@ function success_get_last_date(req)
{
try
{
- var answer=req.responseXML;
- var a=answer.getElementsByTagName('code');
- var html=answer.getElementsByTagName('value');
- if ( a.length == 0 )
+ var answer = req.responseXML;
+ var a = answer.getElementsByTagName('code');
+ var html = answer.getElementsByTagName('value');
+ if (a.length == 0)
{
- var rec=req.responseText;
- alert ('erreur :'+rec);
+ var rec = req.responseText;
+ alert('erreur :' + rec);
}
- var name_ctl=a[0].firstChild.nodeValue;
- var code_html=getNodeText(html[0]);
- code_html=unescape_xml(code_html);
- document.getElementsByName(name_ctl)[0].value=code_html;
+ var name_ctl = a[0].firstChild.nodeValue;
+ var code_html = getNodeText(html[0]);
+ code_html = unescape_xml(code_html);
+ document.getElementsByName(name_ctl)[0].value = code_html;
}
catch (e)
{
@@ -280,20 +282,21 @@ function success_get_last_date(req)
/**
* @brief update the field predef
*/
-function success_get_pj(request,json)
+function success_get_pj(request, json)
{
- var answer=request.responseText.evalJSON(true);
- obj=g("e_pj");
- obj.value='';
- if ( answer.count == 0 ) return;
- obj.value=answer.pj;
- g("e_pj_suggest").value=answer.pj;
+ var answer = request.responseText.evalJSON(true);
+ obj = g("e_pj");
+ obj.value = '';
+ if (answer.count == 0)
+ return;
+ obj.value = answer.pj;
+ g("e_pj_suggest").value = answer.pj;
}
/**
* @brief update the field predef
*/
-function error_get_pj(request,json)
+function error_get_pj(request, json)
{
alert("Ajax a echoue");
}
@@ -303,41 +306,41 @@ function error_get_pj(request,json)
*/
function ledger_fin_add_row()
{
- var style='class="input_text"';
- var mytable=g("fin_item").tBodies[0];
- var line=mytable.rows.length;
- var row=mytable.insertRow(line);
- var nb=g("nb_item");
- var rowToCopy=mytable.rows[1];
- var nNumberCell=rowToCopy.cells.length;
- for ( var e=0;e < nNumberCell;e++)
+ var style = 'class="input_text"';
+ var mytable = g("fin_item").tBodies[0];
+ var line = mytable.rows.length;
+ var row = mytable.insertRow(line);
+ var nb = g("nb_item");
+ var rowToCopy = mytable.rows[1];
+ var nNumberCell = rowToCopy.cells.length;
+ for (var e = 0; e < nNumberCell; e++)
{
- var newCell=row.insertCell(e);
- if ( e==0) {
- newCell.id='tdchdate'+nb.value;
- }
- var tt=rowToCopy.cells[e].innerHTML;
- var new_tt=tt.replace(/e_other0/g,"e_other"+nb.value);
- new_tt=new_tt.replace(/e_other0_comment/g,"e_other"+nb.value+'_comment');
- new_tt=new_tt.replace(/e_other_name0/g,"e_other_name"+nb.value);
- new_tt=new_tt.replace(/e_other0_amount/g,"e_other"+nb.value+'_amount');
- new_tt=new_tt.replace(/e_concerned0/g,"e_concerned"+nb.value);
- new_tt=new_tt.replace(/e_other0_label/g,"e_other"+nb.value+'_label');
- new_tt=new_tt.replace(/dateop0/g,"dateop"+nb.value);
- newCell.innerHTML=new_tt;
+ var newCell = row.insertCell(e);
+ if (e == 0) {
+ newCell.id = 'tdchdate' + nb.value;
+ }
+ var tt = rowToCopy.cells[e].innerHTML;
+ var new_tt = tt.replace(/e_other0/g, "e_other" + nb.value);
+ new_tt = new_tt.replace(/e_other0_comment/g, "e_other" + nb.value + '_comment');
+ new_tt = new_tt.replace(/e_other_name0/g, "e_other_name" + nb.value);
+ new_tt = new_tt.replace(/e_other0_amount/g, "e_other" + nb.value + '_amount');
+ new_tt = new_tt.replace(/e_concerned0/g, "e_concerned" + nb.value);
+ new_tt = new_tt.replace(/e_other0_label/g, "e_other" + nb.value + '_label');
+ new_tt = new_tt.replace(/dateop0/g, "dateop" + nb.value);
+ newCell.innerHTML = new_tt;
new_tt.evalScripts();
}
- g("e_other"+nb.value).value="";
- g("e_other_name"+nb.value).value="";
- g("e_other"+nb.value+'_amount').value="0";
- g("e_other"+nb.value+'_comment').value="";
- g("e_concerned"+nb.value).value="";
+ g("e_other" + nb.value).value = "";
+ g("e_other_name" + nb.value).value = "";
+ g("e_other" + nb.value + '_amount').value = "0";
+ g("e_other" + nb.value + '_comment').value = "";
+ g("e_concerned" + nb.value).value = "";
- var ch=$('chdate').options[$('chdate').selectedIndex].value;
- if (ch == 1 ) {
- $('tdchdate'+nb.value).hide();
- }
- nb.value++;
+ var ch = $('chdate').options[$('chdate').selectedIndex].value;
+ if (ch == 1) {
+ $('tdchdate' + nb.value).hide();
+ }
+ nb.value++;
}
/**
@@ -347,38 +350,41 @@ function ledger_fin_add_row()
*/
function ledger_add_row()
{
- try{
- style='class="input_text"';
- var mytable=g("sold_item").tBodies[0];
- var ofirstRow=mytable.rows[1];
- var line=mytable.rows.length;
- var nCell=mytable.rows[1].cells.length;
- var row=mytable.insertRow(line);
- var nb=g("nb_item");
- for (var e=0;e';
- new_tt = new_tt + '';
+ new_tt = new_tt + '';
+ new_tt = new_tt + '';
newCell.innerHTML = new_tt;
- if ( mytable.rows[1].cells[e].hasClassName("num") ) {
+ if (mytable.rows[1].cells[e].hasClassName("num")) {
newCell.addClassName("num");
}
new_tt.evalScripts();
@@ -1068,7 +1100,7 @@ function gestion_add_row()
g("e_march" + nb.value + "_price").value = '0';
g("e_march" + nb.value).value = "";
g("e_quant" + nb.value).value = "1";
- g('tvac_march'+nb.value).value="0";
+ g('tvac_march' + nb.value).value = "0";
if ($("e_march" + nb.value + "_tva_amount"))
g("e_march" + nb.value + "_tva_amount").value = 0;