[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 22/38: Fix : auto numbering receipt
From: |
dwm |
Subject: |
[Noalyss-commit] [noalyss] 22/38: Fix : auto numbering receipt |
Date: |
Sun, 18 Feb 2024 07:30:44 -0500 (EST) |
sparkyx pushed a commit to branch devel
in repository noalyss.
commit e2b640420083cf3e2531914d0b81d4b1356a6f14
Author: sparkyx <danydb@noalyss.eu>
AuthorDate: Sun Feb 11 16:59:01 2024 +0100
Fix : auto numbering receipt
---
include/class/acc_ledger.class.php | 2 +-
include/class/acc_ledger_purchase.class.php | 4 ++--
include/class/acc_ledger_sale.class.php | 8 +++++---
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/include/class/acc_ledger.class.php
b/include/class/acc_ledger.class.php
index 1ee0c9ab0..c6db9798f 100644
--- a/include/class/acc_ledger.class.php
+++ b/include/class/acc_ledger.class.php
@@ -1534,7 +1534,7 @@ 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)
+ if ($e_pj == $e_pj_suggest &&noalyss_strlentrim($e_pj)!=0)
{
$this->inc_seq_pj();
}
diff --git a/include/class/acc_ledger_purchase.class.php
b/include/class/acc_ledger_purchase.class.php
index 9722f4ee7..e0f1323c9 100644
--- a/include/class/acc_ledger_purchase.class.php
+++ b/include/class/acc_ledger_purchase.class.php
@@ -920,8 +920,8 @@ 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,$e_pj_suggest) == 0 && noalyss_strlentrim($e_pj)
!= 0 )
+ /**= 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();
}
diff --git a/include/class/acc_ledger_sale.class.php
b/include/class/acc_ledger_sale.class.php
index bfee92fa6..a50876206 100644
--- a/include/class/acc_ledger_sale.class.php
+++ b/include/class/acc_ledger_sale.class.php
@@ -619,9 +619,11 @@ 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, $e_pj_suggest) == 0 && noalyss_strlentrim($e_pj)
!= 0) {
+ /**
+ *
+ * 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();
}
- [Noalyss-commit] [noalyss] 05/38: SUIVI : détail , montre nom et prénom, (continued)
- [Noalyss-commit] [noalyss] 05/38: SUIVI : détail , montre nom et prénom, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 19/38: version 9.2, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 33/38: CARD : add button to epxort to PDF, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 26/38: Task #2321: erreur de numérotation, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 29/38: cosmetic, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 10/38: Filtre ne fonctionne pas tva_search_id est vide, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 11/38: Sécurité : bloquer le changement de date des opérations, Renforce mode strict : change de date impossible, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 17/38: FOLLOWUP : nom contact pas affiché, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 23/38: Merge branch 'devel', dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 13/38: FOLLOWUP : Cosmetic nombre pièces, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 22/38: Fix : auto numbering receipt,
dwm <=
- [Noalyss-commit] [noalyss] 32/38: cosmetic, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 36/38: Fix : Bug cannot filter a list of element, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 27/38: Nouvelle fonction pour ajouter des attributs à un élément DOM, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 31/38: DB protect against JS Injection, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 24/38: Nouveau #00022980002298: detail fiche , historique du suivi, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 35/38: Merge devel, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 09/38: Task #2321: Sécurité : empêcher changement de numéro de pièce, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 16/38: Follow-Up : bug ne peut pas ajouter fichier sur nouvel événement, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 18/38: Fix cosmetic bug : duplicate operation with autoreverse VAT has an VAT amount, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 20/38: Fix : auto numbering receipt, dwm, 2024/02/18