[Noalyss-commit] [noalyss] 23/38: Merge branch 'devel'

[dwm]

sparkyx pushed a commit to branch devel
in repository noalyss.

commit b30138e6b06ecead8bbbe554cace84081b186a84
Merge: 7d9fb60cc e2b640420
Author: sparkyx <danydb@noalyss.eu>
AuthorDate: Sun Feb 11 17:32:29 2024 +0100

    Merge branch 'devel'

 include/class/acc_ledger.class.php          |  8 ++++----
 include/class/acc_ledger_purchase.class.php | 10 +++++-----
 include/class/acc_ledger_sale.class.php     | 13 +++++++------
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --cc include/class/acc_ledger_purchase.class.php
index d94a36977,e0f1323c9..cc1f2cdd6
--- a/include/class/acc_ledger_purchase.class.php
+++ b/include/class/acc_ledger_purchase.class.php
@@@ -920,11 -920,11 +920,11 @@@ class  Acc_Ledger_Purchase extends Acc_
              $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) {
++            if ($e_pj == $this->pj && noalyss_strlentrim($e_pj) != 0)
+             {
+                 $this->inc_seq_pj();
+             }
  
              /* Save the attachment */
              if ( isset ($_FILES))
diff --cc include/class/acc_ledger_sale.class.php
index f793c8e5b,a50876206..7358c3ff9
--- a/include/class/acc_ledger_sale.class.php
+++ b/include/class/acc_ledger_sale.class.php
@@@ -619,12 -619,14 +619,13 @@@ class Acc_Ledger_Sale extends Acc_Ledge
  
              $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]);