diff --git a/include/class/acc_ledger.class.php b/include/class/acc_ledger.class.php index 25e95ccd3..93c3140c5 100644 --- a/include/class/acc_ledger.class.php +++ b/include/class/acc_ledger.class.php @@ -306,11 +306,11 @@ class Acc_Ledger extends jrn_def_sql jr_date, jr_grpt_id, jr_internal - ,jr_tech_per, jr_valid + ,jr_tech_per, jr_valid,jr_optype ) select $1,jr_def_id,jr_montant,$7, to_date($2,'DD.MM.YYYY'),$3,$4, - $5, true + $5, true,'EXT' from jrn where jr_id=$6"; diff --git a/include/compta_ach.inc.php b/include/compta_ach.inc.php index ef6f46f36..c44e18549 100644 --- a/include/compta_ach.inc.php +++ b/include/compta_ach.inc.php @@ -105,6 +105,10 @@ if (isset($_POST['view_invoice'])) $reverse_ck=new ICheckBox('reverse_ck'); echo _('Extourne opération')." ".$reverse_ck->input()." "; echo $reverse_date->input(); + $msg_reverse=new IText("ext_label"); + $msg_reverse->placeholder=_("Message extourne"); + $msg_reverse->size=60; + echo _("Message")." ".$msg_reverse->input(); echo ''; echo HtmlInput::submit("record", _("Enregistrement"), 'onClick="return verify_ca(\'\');"'); @@ -175,13 +179,14 @@ if (isset($_POST['record'])) // extourne if (isset($_POST['reverse_ck'])) { - $p_date=$htt->post('reverse_date','string', ''); + $p_date=$http->post('reverse_date','string', ''); + $p_msg=$http->post("ext_label"); if (isDate($p_date)==$p_date) { // reverse the operation try { - $Ledger->reverse($p_date); + $Ledger->reverse($p_date,$p_msg); echo '
'; printf ( _('Extourné au %s'),$p_date); echo '
'; diff --git a/include/compta_ods.inc.php b/include/compta_ods.inc.php index 08d75cd26..cab936d30 100644 --- a/include/compta_ods.inc.php +++ b/include/compta_ods.inc.php @@ -105,12 +105,13 @@ elseif (isset($_POST['save'])) if (isset($_POST['reverse_ck'])) { $p_date=$http->post('reverse_date',"string", ''); + $p_msg=$http->post("ext_label"); if (isDate($p_date)==$p_date) { // reverse the operation try { - $ledger->reverse($p_date); + $ledger->reverse($p_date,$p_msg); echo ''; echo _('Extourné au ').$p_date; echo '
'; diff --git a/include/compta_ven.inc.php b/include/compta_ven.inc.php index eb6872fb2..dbde1017b 100644 --- a/include/compta_ven.inc.php +++ b/include/compta_ven.inc.php @@ -112,6 +112,10 @@ $p_msg=""; $reverse_ck=new ICheckBox('reverse_ck'); echo _('Extourne opération')." ".$reverse_ck->input()." "; echo $reverse_date->input(); + $msg_reverse=new IText("ext_label"); + $msg_reverse->placeholder=_("Message extourne"); + $msg_reverse->size=60; + echo _("Message")." ".$msg_reverse->input(); echo ''; echo HtmlInput::hidden('ac',$_REQUEST['ac']); @@ -193,12 +197,13 @@ show_tab(a_tab,'facturation_div_id'); if (isset($_POST['reverse_ck'])) { $p_date=$http->post('reverse_date', "string",''); + $p_msg=$http->post("ext_label"); if (isDate($p_date)==$p_date) { // reverse the operation try { - $Ledger->reverse($p_date); + $Ledger->reverse($p_date,$p_msg); echo ''; echo _('Extourné au ').$p_date; echo '
'; diff --git a/include/operation_ods_confirm.inc.php b/include/operation_ods_confirm.inc.php index 8bb510c83..8007ef472 100644 --- a/include/operation_ods_confirm.inc.php +++ b/include/operation_ods_confirm.inc.php @@ -58,10 +58,14 @@ echo $ledger->confirm($_POST,false);