Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 01:28:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur
2025-10-17 13:44:54 +02:00
parent 412fe1df32 c902b2eeed
commit d87d6d10a4
10 changed files with 85 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
htdocs/accountancy/class/bookkeeping.class.php
View File

@@ -3539,7 +3539,7 @@ class BookKeeping extends CommonObject
*/
public function newCloneMass($toselect, $code_journal, $docdate)
{
global $langs;
global $langs, $user;
$error = 0;
$this->db->begin();
@@ -3593,22 +3593,55 @@ class BookKeeping extends CommonObject
if ($bookKeeping->fetch($toselectid)) {
$code_journal = getDolGlobalString('ACCOUNTING_CLONING_ENABLE_INPUT_JOURNAL') ? $code_journal : $bookKeeping->code_journal;
$journal_label = getDolGlobalString('ACCOUNTING_CLONING_ENABLE_INPUT_JOURNAL') ? $accountingJournal->label : $bookKeeping->journal_label;
$sql = "SELECT piece_num, label_operation, numero_compte, label_compte, doc_type, code_journal, fk_user_author, doc_ref, fk_doc, fk_docdet, debit, credit, journal_label, sens, montant ";
$sql .= "FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping WHERE rowid = " . ((int) $toselectid);
$sql = "SELECT piece_num, label_operation, numero_compte, label_compte, subledger_account, subledger_label, doc_type, code_journal, fk_user_author, doc_ref, fk_doc, fk_docdet, debit, credit, journal_label, sens, montant";
$sql .= " FROM ".$this->db->prefix()."accounting_bookkeeping WHERE rowid = " . ((int) $toselectid);
$resql = $this->db->query($sql);
if ($resql) {
while ($obj = $this->db->fetch_object($resql)) {
$docRef = $langs->trans("CloneOf", $obj->doc_ref);
$sql_insert = "INSERT INTO ".$this->db->prefix()."accounting_bookkeeping";
$sql_insert .= " (piece_num, label_operation, numero_compte, label_compte, doc_type, code_journal, doc_date,";
$sql_insert .= " fk_user_author, doc_ref, fk_doc, fk_docdet, debit, credit, journal_label, sens, montant";
$sql_insert = "INSERT INTO ".$this->db->prefix()."accounting_bookkeeping (";
$sql_insert .= " piece_num";
$sql_insert .= ", label_operation";
$sql_insert .= ", numero_compte";
$sql_insert .= ", label_compte";
$sql_insert .= ", subledger_account";
$sql_insert .= ", subledger_label";
$sql_insert .= ", doc_type";
$sql_insert .= ", code_journal";
$sql_insert .= ", doc_date";
$sql_insert .= ", date_creation";
$sql_insert .= ", fk_user_author";
$sql_insert .= ", doc_ref";
$sql_insert .= ", fk_doc";
$sql_insert .= ", fk_docdet";
$sql_insert .= ", debit";
$sql_insert .= ", credit";
$sql_insert .= ", journal_label";
$sql_insert .= ", sens";
$sql_insert .= ", montant";
$sql_insert .= ")";
$sql_insert .= " VALUES (" . ((int) $pieceNumNext) . ", '" . $this->db->escape($obj->label_operation) . "', '" . $this->db->escape($obj->numero_compte) . "',";
$sql_insert .= " '" . $this->db->escape($obj->label_compte) . "', '" . $this->db->escape($obj->doc_type) . "', '" . $this->db->escape($code_journal) . "', '" . $this->db->idate($docdate)."',";
$sql_insert .= " '" . $this->db->escape($obj->fk_user_author) . "', '" . $this->db->escape($docRef) . "', " . ((int) $obj->fk_doc) . ", " . ((int) $obj->fk_docdet) . ",";
$sql_insert .= " " . (float) $obj->debit . ", " . (float) $obj->credit . ", '" . $this->db->escape($journal_label) . "', '" . $this->db->escape($obj->sens) . "', " . (float) $obj->montant;
$sql_insert .= " VALUES (";
$sql_insert .= $pieceNumNext;
$sql_insert .= ", '" . $this->db->escape($obj->label_operation) . "'";
$sql_insert .= ", '" . $this->db->escape($obj->numero_compte) . "'";
$sql_insert .= ", '" . $this->db->escape($obj->label_compte) . "'";
$sql_insert .= ", '" . $this->db->escape($obj->subledger_account) . "'";
$sql_insert .= ", '" . $this->db->escape($obj->subledger_label) . "'";
$sql_insert .= ", ''";
$sql_insert .= ", '" . $this->db->escape($code_journal) . "'";
$sql_insert .= ", '" . $this->db->idate($docdate)."'";
$sql_insert .= ", '" . $this->db->idate($now)."'";
$sql_insert .= ", ".($user->id > 0 ? ((int) $user->id) : "NULL");
$sql_insert .= ", '" . $this->db->escape($docRef) . "'";
$sql_insert .= ", 0";
$sql_insert .= ", 0";
$sql_insert .= ", " . (float) $obj->debit;
$sql_insert .= ", " . (float) $obj->credit;
$sql_insert .= ", '" . $this->db->escape($journal_label) . "'";
$sql_insert .= ", '" . $this->db->escape($obj->sens) . "'";
$sql_insert .= ", " . (float) $obj->montant;
$sql_insert .= ")";
$resqlInsert = $this->db->query($sql_insert);