admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Task #1326 & #1512 = ajout détail extourne, libellé directement après ajout opération

Browse source
This commit is contained in:
Dany De Bontridder 2018-01-11 18:36:50 +01:00
parent a233f2446c
commit 08c5d6e501
5 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/class/acc_ledger.class.php
View file

@ -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";

9
include/compta_ach.inc.php
View file

@ -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 '</div>';
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 '<p>';
printf ( _('Extourné au %s'),$p_date);
echo '</p>';

3
include/compta_ods.inc.php
View file

@ -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 '<p>';
echo _('Extourné au ').$p_date;
echo '</p>';

7
include/compta_ven.inc.php
View file

@ -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 '</div>';
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 '<p>';
echo _('Extourné au ').$p_date;
echo '</p>';

7
include/operation_ods_confirm.inc.php
View file

@ -58,10 +58,14 @@ echo $ledger->confirm($_POST,false);
</div>
<div id="reverse_div_id" style="display:none;height:185px;height:10rem">
<?php
$reverse_date=new IDate('reverse_date');
$reverse_ck=new ICheckBox('reverse_ck');
echo _('Extourne opération')." ".$reverse_ck->input()." ";
$reverse_date=new IDate('reverse_date');
echo $reverse_date->input();
$msg_reverse=new IText("ext_label");
$msg_reverse->size=60;
$msg_reverse->placeholder=_("Message extourne");
echo _("Message")." ".$msg_reverse->input();
?>
</div>
<div id="document_div_id" style="display:none;height:185px;height:10rem">
@ -77,7 +81,6 @@ echo $ledger->confirm($_POST,false);
<div id="operationtype_div_id" style="display:none;height:185px;height:10rem">
<?php
$status=$http->request("jr_optype","string","NOR");
echo $_POST['jr_optype'];
echo Acc_Operation::select_operation_type($status)->input();
?>
</div>