From a501c10054ef740224a60c8ef1b70ab1ac875bf0 Mon Sep 17 00:00:00 2001 From: sparkyx Date: Thu, 1 Dec 2022 19:06:08 +0100 Subject: [PATCH] WHen creating from follow-up , keep a link to the event in the operation --- include/class/acc_ledger_sale.class.php | 2 +- include/compta_ach.inc.php | 4 +- include/compta_ven.inc.php | 259 +++++++++--------- .../template/acc_ledger-input_extra_info.php | 1 + include/template/follow_up_detail_display.php | 4 +- 5 files changed, 138 insertions(+), 132 deletions(-) diff --git a/include/class/acc_ledger_sale.class.php b/include/class/acc_ledger_sale.class.php index 2c658c5f9..6816fdb4b 100644 --- a/include/class/acc_ledger_sale.class.php +++ b/include/class/acc_ledger_sale.class.php @@ -1251,7 +1251,7 @@ EOF; $r.='
'; $obj = new IText(); $r.=_('Numero de bon de commande : ') . $obj->input('bon_comm') . '
'; - $r.=_('Autre information : ') . $obj->input('other_info') . '
'; + $r.=_('Communication ou autre information : ') . $obj->input('other_info') . '
'; $r.='

'; $r.=''; return $r; diff --git a/include/compta_ach.inc.php b/include/compta_ach.inc.php index 73677f8ef..83e645191 100644 --- a/include/compta_ach.inc.php +++ b/include/compta_ach.inc.php @@ -241,10 +241,12 @@ try } else if (isset($_GET['create_feenote'])) { - $array=$Ledger->convert_from_follow($http->get('ag_id',"number")); + $action_id=$http->get('ag_id',"number"); + $array=$Ledger->convert_from_follow($action_id); echo HtmlInput::hidden("ledger_type", "VEN"); echo HtmlInput::hidden("ac",$http->get('ac')); echo HtmlInput::hidden("sa", "p"); + echo HtmlInput::hidden("action_gestion",$action_id); echo $Ledger->input($array); echo '
'; echo $Ledger->input_paid($payment,$acompte,$date_payment,$comm_payment); diff --git a/include/compta_ven.inc.php b/include/compta_ven.inc.php index abcce1167..732cd72b2 100644 --- a/include/compta_ven.inc.php +++ b/include/compta_ven.inc.php @@ -39,159 +39,159 @@ $post_jrn=$http->post("p_jrn", "string",""); // empty form for encoding //---------------------------------------------------------------------- - $Ledger=new Acc_Ledger_Sale($cn,0); +$Ledger=new Acc_Ledger_Sale($cn,0); - // Check privilege - if ( isset($_REQUEST['p_jrn']) && - $g_user->check_jrn($http->request("p_jrn","number")) != 'W' ) +// Check privilege +if ( isset($_REQUEST['p_jrn']) && + $g_user->check_jrn($http->request("p_jrn","number")) != 'W' ) +{ + + NoAccess(); + exit -1; +} + +/* if a new invoice is encoded, we display a form for confirmation */ +if ( isset ($_POST['view_invoice'] ) ) +{ + $p_jrn=$http->post("p_jrn","number"); + $Ledger=new Acc_Ledger_Sale($cn,$p_jrn); + try + { + $Ledger->verify_operation($_POST); + } + catch (Exception $e) + { + alert($e->getMessage()); + $p_msg=$e->getMessage(); + $correct=1; + } + // if correct is not set it means it is correct + if ( ! isset($correct)) + { + echo '
'; + + echo '
'; + echo h1(_("Confirmation")); + echo span(_("Vous devez encore confirmer"),' class="notice"'); + echo '
'; + + echo '
'; + echo '
'; + echo dossier::hidden(); + echo $Ledger->confirm($_POST ); + echo HtmlInput::hidden('ac',$strac); + $Ledger->input_extra_info(); + echo HtmlInput::submit("record", _("Enregistrement"), 'onClick="return verify_ca(\'\');"'); + echo HtmlInput::submit('correct', _("Corriger")); + echo '
'; + echo '
'; + if (DEBUGNOALYSS>1) { echo "";} + return; + } +} +//------------------------------ +/* Record the invoice */ +//------------------------------ + +if ( isset($_POST['record']) ) +{ +// Check privilege + if ( $g_user->check_jrn($post_jrn) != 'W' ) { NoAccess(); exit -1; } - /* if a new invoice is encoded, we display a form for confirmation */ - if ( isset ($_POST['view_invoice'] ) ) + $Ledger=new Acc_Ledger_Sale($cn,$post_jrn); + try { - $p_jrn=$http->post("p_jrn","number"); - $Ledger=new Acc_Ledger_Sale($cn,$p_jrn); - try - { - $Ledger->verify_operation($_POST); - } - catch (Exception $e) - { - alert($e->getMessage()); - $p_msg=$e->getMessage(); - $correct=1; - } - // if correct is not set it means it is correct - if ( ! isset($correct)) - { + $Ledger->verify_operation($_POST); + } + catch (Exception $e) + { + alert($e->getMessage()); + $correct=1; + } + + if ( ! isset($correct)) + { + if ( is_msie() == 0 ) + echo '
'; + else echo '
'; - echo '
'; - echo h1(_("Confirmation")); - echo span(_("Vous devez encore confirmer"),' class="notice"'); - echo '
'; - - echo '
'; - echo '
'; - echo dossier::hidden(); - echo $Ledger->confirm($_POST ); - echo HtmlInput::hidden('ac',$strac); - $Ledger->input_extra_info(); - echo HtmlInput::submit("record", _("Enregistrement"), 'onClick="return verify_ca(\'\');"'); - echo HtmlInput::submit('correct', _("Corriger")); - echo '
'; - echo '
'; - if (DEBUGNOALYSS>1) { echo "";} - return; - } - } - //------------------------------ - /* Record the invoice */ - //------------------------------ + $Ledger=new Acc_Ledger_Sale($cn,$_POST['p_jrn']); + $internal=$Ledger->insert($_POST); - if ( isset($_POST['record']) ) - { -// Check privilege - if ( $g_user->check_jrn($post_jrn) != 'W' ) + /* Save the predefined operation */ + if ( isset($_POST['opd_name']) && trim($_POST['opd_name']) != "" ) { - - NoAccess(); - exit -1; + $opd=new Pre_operation($cn); + $opd->get_post(); + $opd->save(); } - $Ledger=new Acc_Ledger_Sale($cn,$post_jrn); - try + /* Show button */ + echo '

Enregistrement

'; + + echo $Ledger->confirm($_POST,true); + /* Show link for Invoice */ + if (isset ($Ledger->doc) ) { - $Ledger->verify_operation($_POST); - } - catch (Exception $e) - { - alert($e->getMessage()); - $correct=1; + echo '

'._('Document').'

'; + echo $Ledger->doc; } - if ( ! isset($correct)) + + /* Save the additional information into jrn_info */ + $obj=new Acc_Ledger_Info($cn); + $obj->save_extra($Ledger->jr_id,$_POST); + + /* save followup */ + $Ledger->save_followup($http->request("action_gestion","string","")); + + // extourne + if (isset($_POST['reverse_ck'])) { - if ( is_msie() == 0 ) - echo '
'; - else - echo '
'; - - $Ledger=new Acc_Ledger_Sale($cn,$_POST['p_jrn']); - $internal=$Ledger->insert($_POST); - - /* Save the predefined operation */ - if ( isset($_POST['opd_name']) && trim($_POST['opd_name']) != "" ) + $p_date=$http->post('reverse_date', "string",''); + $p_msg=$http->post("ext_label"); + if (isDate($p_date)==$p_date) { - $opd=new Pre_operation($cn); - $opd->get_post(); - $opd->save(); - } - - /* Show button */ - echo '

Enregistrement

'; - - echo $Ledger->confirm($_POST,true); - /* Show link for Invoice */ - if (isset ($Ledger->doc) ) - { - echo '

'._('Document').'

'; - echo $Ledger->doc; - } - - - /* Save the additional information into jrn_info */ - $obj=new Acc_Ledger_Info($cn); - $obj->save_extra($Ledger->jr_id,$_POST); - - /* save followup */ - $Ledger->save_followup($http->request("action_gestion","string","")); - - // extourne - 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 { - // reverse the operation - try - { - $Ledger->reverse($p_date,$p_msg); - echo '

'; - echo _('Extourné au ').$p_date; - echo '

'; + $Ledger->reverse($p_date,$p_msg); + echo '

'; + echo _('Extourné au ').$p_date; + echo '

'; - } - catch (Exception $e) - { - echo ''._('Opération non extournée'). - $e->getMessage(). - ''; - } } - else + catch (Exception $e) { - // warning because date is invalid - echo ''._('Date invalide, opération non extournée').''; + echo ''._('Opération non extournée'). + $e->getMessage(). + ''; } } - echo '
    '; - echo "
  • "; - echo $Ledger->button_new_operation(); - echo "
    • "; - echo "
  • "; - echo $Ledger->button_copy_operation(); - echo "
    • "; - echo "
"; - echo '
'; - return; + else + { + // warning because date is invalid + echo ''._('Date invalide, opération non extournée').''; + } } + echo '
    '; + echo "
  • "; + echo $Ledger->button_new_operation(); + echo "
    • "; + echo "
  • "; + echo $Ledger->button_copy_operation(); + echo "
    • "; + echo "
"; + echo '
'; + return; } +} // ------------------------------ /* Display a blank form or a form with predef operation */ // ------------------------------ @@ -255,10 +255,12 @@ try } else if (isset($_GET['create_invoice'])) { - $array=$Ledger->convert_from_follow($http->get('ag_id',"number")); + $action_id=$http->get('ag_id',"number"); + $array=$Ledger->convert_from_follow($action_id); echo HtmlInput::hidden("ledger_type", "VEN"); echo HtmlInput::hidden("ac", $http->get('ac')); echo HtmlInput::hidden("sa", "p"); + echo HtmlInput::hidden("action_gestion",$action_id); echo $Ledger->input($array); echo '
'; echo $Ledger->input_paid($payment,$acompte,$date_payment,$comm_payment); @@ -272,7 +274,8 @@ try echo HtmlInput::hidden("ledger_type", "VEN"); echo HtmlInput::hidden("ac", $strac); echo HtmlInput::hidden("sa", "p"); - + $action_id=$http->get('ag_id',"number"); + echo HtmlInput::hidden("action_gestion",$action_id); echo $Ledger->input($array); echo '
'; echo $Ledger->input_paid($payment,$acompte,$date_payment,$comm_payment); diff --git a/include/template/acc_ledger-input_extra_info.php b/include/template/acc_ledger-input_extra_info.php index 9cd54d33d..0054e482b 100644 --- a/include/template/acc_ledger-input_extra_info.php +++ b/include/template/acc_ledger-input_extra_info.php @@ -144,6 +144,7 @@ if ( in_array("document",$a_show)) { Action gestion value=$http->request("action_gestion","string",""); echo $irelated_action->input(); ?>
diff --git a/include/template/follow_up_detail_display.php b/include/template/follow_up_detail_display.php index f05ebe47e..481057c9d 100644 --- a/include/template/follow_up_detail_display.php +++ b/include/template/follow_up_detail_display.php @@ -199,7 +199,7 @@ $menu=new Default_Menu(); dt_id)): ?> -
+
Dossier::id(), 'ag_id'=>$p_follow_up->ag_id, 'create_invoice'=>1, 'ac'=>$menu->get('code_invoice'))); echo HtmlInput::button_anchor(_("Transformer en Facture de Vente"), "do.php?".$query, "create_invoice", @@ -213,7 +213,7 @@ $menu=new Default_Menu(); dt_id)): ?> -
+
Dossier::id(), 'ag_id'=>$p_follow_up->ag_id, 'create_feenote'=>1, 'ac'=>$menu->get('code_feenote'))); echo HtmlInput::button_anchor(_("Transformer en Note de frais ou Facture Achat"), "do.php?".$query, "create_feenote",