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

Extourne : correct reverse operation for autoliquidation

Browse source
This commit is contained in:
Dany De Bontridder 2017-10-10 13:46:33 +02:00
parent 5d4ba5cf27
commit 0fdc4fa711
2 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
include/ajax/ajax_ledger.php
View file

@ -46,12 +46,7 @@ $http=new HttpInput();
/**
* Check if we receive the needed data (jr_id...)
*/
if ( ! isset ($_REQUEST['act'])|| ! isset ($_REQUEST['jr_id'])
|| ! isset ($_REQUEST['div']))
{
exit();
}
global $g_user,$cn,$g_parameter;
global $g_user,$cn,$g_parameter;
mb_internal_encoding("UTF-8");
try
@ -559,10 +554,11 @@ case 'reverseop':
ob_start();
try
{
$ext_date=$http->request("ext_date","date");
$cn->start();
$oLedger=new Acc_Ledger($cn,$ledger);
$oLedger->jr_id=$_REQUEST['jr_id'];
$oLedger->reverse($_REQUEST['ext_date']);
$oLedger->jr_id=$jr_id;
$oLedger->reverse($ext_date);
$cn->commit();
echo _("Opération extournée");
}

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

@ -264,9 +264,9 @@ class Acc_Ledger extends jrn_def_sql
// reverse in QUANT_SOLD
$Res = $this->db->exec_sql("INSERT INTO quant_sold(
qs_internal, qs_fiche, qs_quantite, qs_price, qs_vat,
qs_vat_code, qs_client, qs_valid, j_id)
qs_vat_code, qs_client, qs_valid, j_id,qs_vat_sided,qs_unit)
SELECT $1, qs_fiche, qs_quantite*(-1), qs_price*(-1), qs_vat*(-1),
qs_vat_code, qs_client, qs_valid, $2
qs_vat_code, qs_client, qs_valid, $2,qs_vat_sided*(-1),qs_unit*(-1)
FROM quant_sold where j_id=$3", array($p_internal, $j_id, $row));
if ($Res == false)
@ -274,10 +274,10 @@ class Acc_Ledger extends jrn_def_sql
$Res = $this->db->exec_sql("INSERT INTO quant_purchase(
qp_internal, j_id, qp_fiche, qp_quantite, qp_price, qp_vat,
qp_vat_code, qp_nd_amount, qp_nd_tva, qp_nd_tva_recup, qp_supplier,
qp_valid, qp_dep_priv)
qp_valid, qp_dep_priv,qp_vat_sided,qp_unit)
SELECT $1, $2, qp_fiche, qp_quantite*(-1), qp_price*(-1), qp_vat*(-1),
qp_vat_code, qp_nd_amount*(-1), qp_nd_tva*(-1), qp_nd_tva_recup*(-1), qp_supplier,
qp_valid, qp_dep_priv*(-1)
qp_valid, qp_dep_priv*(-1),qp_vat_sided*(-1),qp_unit*(-1)
FROM quant_purchase where j_id=$3", array($p_internal, $j_id, $row));
if ($Res == false)