diff --git a/html/js/acc_ledger.js b/html/js/acc_ledger.js index 4afbd76fa..c211b75a3 100644 --- a/html/js/acc_ledger.js +++ b/html/js/acc_ledger.js @@ -286,6 +286,7 @@ function ledger_add_row() } g("e_march"+nb.value+"_label").innerHTML=' '; + g("e_march"+nb.value+"_label").value=''; g("e_march"+nb.value+"_price").value='0'; g("e_march"+nb.value).value=""; g("e_quant"+nb.value).value="1"; diff --git a/include/class_acc_ledger.php b/include/class_acc_ledger.php index 932809017..bb370b4ef 100644 --- a/include/class_acc_ledger.php +++ b/include/class_acc_ledger.php @@ -354,7 +354,7 @@ class Acc_Ledger extends jrn_def_sql case j_debit when 't' then j_montant::text else ' ' end as deb_montant, case j_debit when 'f' then j_montant::text else ' ' end as cred_montant, j_debit as debit,j_poste as poste,jr_montant , ". - "coalesce(j_text,pcm_lib) as description,j_grpt as grp, + "case when j_text='' or j_text is null then pcm_lib else j_text end as description,j_grpt as grp, jr_comment||' ('||jr_internal||')' as jr_comment, jr_pj_number, j_qcode, @@ -374,7 +374,7 @@ class Acc_Ledger extends jrn_def_sql case j_debit when 't' then j_montant::text else ' ' end as deb_montant, case j_debit when 'f' then j_montant::text else ' ' end as cred_montant, j_debit as debit,j_poste as poste,". - "coalesce(j_text,pcm_lib) as description,j_grpt as grp, + "case when j_text='' or j_text is null then pcm_lib else j_text end as description,j_grpt as grp, jr_comment||' ('||jr_internal||')' as jr_comment, jr_pj_number, jr_montant, @@ -409,7 +409,7 @@ class Acc_Ledger extends jrn_def_sql $tot_op=$line['jr_montant']; /* Check first if there is a quickcode */ - if ( strlen(trim($line['j_qcode'])) != 0 ) + if (strlen(trim($line['description']))==0 && strlen(trim($line['j_qcode'])) != 0 ) { if ( $fiche->get_by_qcode($line['j_qcode'],false) == 0 ) { diff --git a/include/class_acc_ledger_purchase.php b/include/class_acc_ledger_purchase.php index dcf42b4cd..581b73d05 100644 --- a/include/class_acc_ledger_purchase.php +++ b/include/class_acc_ledger_purchase.php @@ -1490,6 +1490,7 @@ class Acc_Ledger_Purchase extends Acc_Ledger for ($i=0;$i < $nb_item;$i++) { $r.=HtmlInput::hidden("e_march".$i,${"e_march".$i}); + if (isset (${"e_march".$i."_label"})) $r.=HtmlInput::hidden("e_march".$i."_label",${"e_march".$i."_label"}); $r.=HtmlInput::hidden("e_march".$i."_price",${"e_march".$i."_price"}); if ( $g_parameter->MY_TVA_USE=='Y' ) { diff --git a/include/class_acc_ledger_sold.php b/include/class_acc_ledger_sold.php index 333fa4f0b..9d8e3a68b 100644 --- a/include/class_acc_ledger_sold.php +++ b/include/class_acc_ledger_sold.php @@ -902,6 +902,7 @@ class Acc_Ledger_Sold extends Acc_Ledger for ($i=0;$i < $nb_item;$i++) { $r.=HtmlInput::hidden("e_march".$i,${"e_march".$i}); + if (isset (${"e_march".$i."_label"})) $r.=HtmlInput::hidden("e_march".$i."_label",${"e_march".$i."_label"}); $r.=HtmlInput::hidden("e_march".$i."_price",${"e_march".$i."_price"}); if ( $g_parameter->MY_TVA_USE=='Y') { diff --git a/include/compta_ach.inc.php b/include/compta_ach.inc.php index d7355692a..2ad8f09e6 100644 --- a/include/compta_ach.inc.php +++ b/include/compta_ach.inc.php @@ -141,7 +141,7 @@ if (isset($_POST['record'])) /* Save the additional information into jrn_info */ $obj = new Acc_Ledger_Info($cn); $obj->save_extra($Ledger->jr_id, $_POST); - printf('%s
', $jr_id, dossier::id(), $internal); + printf('%s
', $jr_id, dossier::id(), $internal); // Feedback echo $Ledger->confirm($_POST, true); echo ''; diff --git a/include/compta_ven.inc.php b/include/compta_ven.inc.php index 5b0826f42..cc2bc3ef4 100644 --- a/include/compta_ven.inc.php +++ b/include/compta_ven.inc.php @@ -149,7 +149,7 @@ global $g_parameter; echo '

'._('Attention numéro pièce existante, elle a du être adaptée').'

'; } - printf ('%s
', + printf ('%s
', $jr_id,dossier::id(),$internal); echo $Ledger->confirm($_POST,true); /* Show link for Invoice */ diff --git a/include/template/ledger_detail_ach.php b/include/template/ledger_detail_ach.php index a61735750..15611ea80 100644 --- a/include/template/ledger_detail_ach.php +++ b/include/template/ledger_detail_ach.php @@ -153,7 +153,7 @@ echo ''; { $l_lib = ($q['j_text'] == '') ? $fiche->strAttribut(ATTR_DEF_NAME) : $q['j_text']; $hidden = HtmlInput::hidden("j_id[]", $q['j_id']); - $input = new IText("e_march" . $q[$e]['j_id'] . "_label", $l_lib); + $input = new IText("e_march" . $q['j_id'] . "_label", $l_lib); } else {