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

Merge branch 'devel'

Browse source
This commit is contained in:
sparkyx 2024-02-11 17:32:29 +01:00
commit b30138e6b0
3 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1534,10 +1534,10 @@ class Acc_Ledger extends jrn_def_sql
$acc_end->pj=$e_pj;
/* if e_suggest != e_pj then do not increment sequence */
// if (strcmp($e_pj, $e_pj_suggest)==0&&noalyss_strlentrim($e_pj)!=0)
// {
// $this->inc_seq_pj();
// }
if ($e_pj == $e_pj_suggest &&noalyss_strlentrim($e_pj)!=0)
{
$this->inc_seq_pj();
}
$this->pj=$acc_end->set_pj();

10
include/class/acc_ledger_purchase.class.php
View file

@ -920,11 +920,11 @@ class Acc_Ledger_Purchase extends Acc_Ledger
$this->db->exec_sql('update quant_purchase set qp_internal = $1 where j_id in (select j_id from jrnx where j_grpt=$2)',
array($internal,$seq));
/**= e_pj then do not increment sequence */
// if ( strcmp($e_pj,$this->pj) == 0 && noalyss_strlentrim($e_pj) != 0 )
// {
// $this->inc_seq_pj();
// }
/**= e_pj then do not increment sequence , if the given receipt number is equal to one computed then increment */
if ($e_pj == $this->pj && noalyss_strlentrim($e_pj) != 0)
{
$this->inc_seq_pj();
}
/* Save the attachment */
if ( isset ($_FILES))

13
include/class/acc_ledger_sale.class.php
View file

@ -619,12 +619,13 @@ class Acc_Ledger_Sale extends Acc_Ledger {
$this->pj = $acc_operation->set_pj();
/* * = e_pj then do not increment sequence */
/* and e_pj is not null */
// if (strcmp($e_pj, $this->pj ) == 0 && noalyss_strlentrim($e_pj) != 0) {
// $this->inc_seq_pj();
// }
/**
*
* if the given receipt number is equal to one computed then increment
*/
if ($e_pj == $this->pj && noalyss_strlentrim($e_pj) != 0) {
$this->inc_seq_pj();
}
$this->db->exec_sql("update jrn set jr_internal=$1 where jr_grpt_id = $2" ,[$internal,$seq]);