Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-08 00:52:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Laurent Destailleur
2025-10-19 17:56:22 +02:00
parent 68a8631cb5 1e329f2325
commit c5b4faffe7
27 changed files with 328 additions and 447 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/modules/cheque/doc/pdf_blochet.class.php
View File

@@ -208,7 +208,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
$this->Body($pdf, $pagenb, $pages, $outputlangs);
// Pied de page
// Page footer
$this->_pagefoot($pdf, null, $outputlangs);
if (method_exists($pdf, 'AliasNbPages')) {
$pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod
@@ -427,7 +427,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
* Show footer of page. Need this->emetteur object
*
* @param TCPDF $pdf PDF
* @param CommonObject $object Object to show
* @param ?CommonObject $object Object to show
* @param Translate $outputlangs Object lang for output
* @param int<0,1> $hidefreetext 1=Hide free text
* @return int

5
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
View File

@@ -228,8 +228,9 @@ class pdf_eratosthene extends ModelePDFCommandes
$realpath = null;
foreach ($pdir as $midir) {
if (!$arephoto) {
if ($conf->entity != $objphoto->entity) {
$dir = $conf->product->multidir_output[$objphoto->entity].'/'.$midir; //Check repertories of current entities
$entity = $objphoto->entity;
if ($entity !== null && $conf->entity != $entity) {
$dir = $conf->product->multidir_output[$entity].'/'.$midir; //Check repertories of current entities
} else {
$dir = $conf->product->dir_output.'/'.$midir; //Check repertory of the current product
}

43
htdocs/core/modules/facture/doc/pdf_octopus.modules.php
View File

@@ -329,8 +329,9 @@ class pdf_octopus extends ModelePDFFactures
$realpath = false;
foreach ($pdir as $midir) {
if (!$arephoto) {
if ($conf->entity != $objphoto->entity) {
$dir = $conf->product->multidir_output[$objphoto->entity].'/'.$midir; //Check repertories of current entities
$entity = $objphoto->entity;
if ($entity !== null && $conf->entity != $entity) {
$dir = $conf->product->multidir_output[$entity].'/'.$midir; //Check repertories of current entities
} else {
$dir = $conf->product->dir_output.'/'.$midir; //Check repertory of the current product
}
@@ -1480,13 +1481,13 @@ class pdf_octopus extends ModelePDFFactures
if ($object->status > Facture::STATUS_DRAFT && getDolGlobalInt('PDF_INVOICE_SHOW_BALANCE_SUMMARY')) {
// All customer previous invoices
$sql = "SELECT f.rowid, f.datef, f.total_ttc";
$sql.= " FROM " . MAIN_DB_PREFIX . "facture as f";
$sql.= " WHERE f.fk_soc = " . ((int) $object->socid);
$sql.= " AND f.entity IN (" . getEntity('invoice') . ")";
$sql.= " AND f.datef <= '" . $this->db->idate($object->date) . "'";
$sql.= " AND f.rowid < " . ((int) $object->id);
$sql.= " AND f.fk_statut > 0";
$sql.= " ORDER BY f.datef ASC";
$sql .= " FROM " . MAIN_DB_PREFIX . "facture as f";
$sql .= " WHERE f.fk_soc = " . ((int) $object->socid);
$sql .= " AND f.entity IN (" . getEntity('invoice') . ")";
$sql .= " AND f.datef <= '" . $this->db->idate($object->date) . "'";
$sql .= " AND f.rowid < " . ((int) $object->id);
$sql .= " AND f.fk_statut > 0";
$sql .= " ORDER BY f.datef ASC";
$old_balance = 0;
$invoices = array();
@@ -1501,12 +1502,12 @@ class pdf_octopus extends ModelePDFFactures
// All payments before current date
$sql_payments = "SELECT p.datep, pf.fk_facture, pf.amount";
$sql_payments.= " FROM " . MAIN_DB_PREFIX . "paiement_facture as pf";
$sql_payments.= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as p ON p.rowid = pf.fk_paiement";
$sql_payments.= " INNER JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = pf.fk_facture";
$sql_payments.= " WHERE f.fk_soc = " . ((int) $object->socid);
$sql_payments.= " AND p.datep < '" . $this->db->idate($object->date) . "'";
$sql_payments.= " ORDER BY p.datep ASC";
$sql_payments .= " FROM " . MAIN_DB_PREFIX . "paiement_facture as pf";
$sql_payments .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as p ON p.rowid = pf.fk_paiement";
$sql_payments .= " INNER JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = pf.fk_facture";
$sql_payments .= " WHERE f.fk_soc = " . ((int) $object->socid);
$sql_payments .= " AND p.datep < '" . $this->db->idate($object->date) . "'";
$sql_payments .= " ORDER BY p.datep ASC";
$total_payments = 0;
$resql_payments = $this->db->query($sql_payments);
@@ -1519,11 +1520,11 @@ class pdf_octopus extends ModelePDFFactures
// Payments made on current invoice date (including current invoice)
$sql_current_date_payments = "SELECT p.datep, pf.fk_facture, pf.amount";
$sql_current_date_payments.= " FROM " . MAIN_DB_PREFIX . "paiement_facture as pf";
$sql_current_date_payments.= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as p ON p.rowid = pf.fk_paiement";
$sql_current_date_payments.= " INNER JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = pf.fk_facture";
$sql_current_date_payments.= " WHERE f.fk_soc = " . ((int) $object->socid);
$sql_current_date_payments.= " AND DATE(p.datep) = DATE('" . $this->db->idate($object->date) . "')";
$sql_current_date_payments .= " FROM " . MAIN_DB_PREFIX . "paiement_facture as pf";
$sql_current_date_payments .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as p ON p.rowid = pf.fk_paiement";
$sql_current_date_payments .= " INNER JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = pf.fk_facture";
$sql_current_date_payments .= " WHERE f.fk_soc = " . ((int) $object->socid);
$sql_current_date_payments .= " AND DATE(p.datep) = DATE('" . $this->db->idate($object->date) . "')";
$current_date_payments = 0;
$resql_current_date = $this->db->query($sql_current_date_payments);
@@ -1547,7 +1548,7 @@ class pdf_octopus extends ModelePDFFactures
$pdf->MultiCell($posxval - $this->marge_gauche + 8, 4, $titre, 0, 'L', true);
$pdf->SetFont('', '', $default_font_size - 2);
$pdf->SetXY($posxval+8, $posy);
$pdf->SetXY($posxval + 8, $posy);
$titre = $outputlangs->transnoentities("NewBalance").' : '.price($new_balance);
$pdf->MultiCell($posxend - $posxval - 8, 4, $titre, 0, 'L', true);

43
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
View File

@@ -264,8 +264,9 @@ class pdf_sponge extends ModelePDFFactures
$realpath = false;
foreach ($pdir as $midir) {
if (!$arephoto) {
if ($conf->entity != $objphoto->entity) {
$dir = $conf->product->multidir_output[$objphoto->entity].'/'.$midir; //Check repertories of current entities
$entity = $objphoto->entity;
if ($entity !== null && $conf->entity != $entity) {
$dir = $conf->product->multidir_output[$entity].'/'.$midir; //Check repertories of current entities
} else {
$dir = $conf->product->dir_output.'/'.$midir; //Check repertory of the current product
}
@@ -1399,13 +1400,13 @@ class pdf_sponge extends ModelePDFFactures
if ($object->status > Facture::STATUS_DRAFT && getDolGlobalInt('PDF_INVOICE_SHOW_BALANCE_SUMMARY')) {
// All customer previous invoices
$sql = "SELECT f.rowid, f.datef, f.total_ttc";
$sql.= " FROM " . MAIN_DB_PREFIX . "facture as f";
$sql.= " WHERE f.fk_soc = " . ((int) $object->socid);
$sql.= " AND f.entity IN (" . getEntity('invoice') . ")";
$sql.= " AND f.datef <= '" . $this->db->idate($object->date) . "'";
$sql.= " AND f.rowid < " . ((int) $object->id);
$sql.= " AND f.fk_statut > 0";
$sql.= " ORDER BY f.datef ASC";
$sql .= " FROM " . MAIN_DB_PREFIX . "facture as f";
$sql .= " WHERE f.fk_soc = " . ((int) $object->socid);
$sql .= " AND f.entity IN (" . getEntity('invoice') . ")";
$sql .= " AND f.datef <= '" . $this->db->idate($object->date) . "'";
$sql .= " AND f.rowid < " . ((int) $object->id);
$sql .= " AND f.fk_statut > 0";
$sql .= " ORDER BY f.datef ASC";
$old_balance = 0;
$invoices = array();
@@ -1420,12 +1421,12 @@ class pdf_sponge extends ModelePDFFactures
// All payments before current date
$sql_payments = "SELECT p.datep, pf.fk_facture, pf.amount";
$sql_payments.= " FROM " . MAIN_DB_PREFIX . "paiement_facture as pf";
$sql_payments.= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as p ON p.rowid = pf.fk_paiement";
$sql_payments.= " INNER JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = pf.fk_facture";
$sql_payments.= " WHERE f.fk_soc = " . ((int) $object->socid);
$sql_payments.= " AND p.datep < '" . $this->db->idate($object->date) . "'";
$sql_payments.= " ORDER BY p.datep ASC";
$sql_payments .= " FROM " . MAIN_DB_PREFIX . "paiement_facture as pf";
$sql_payments .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as p ON p.rowid = pf.fk_paiement";
$sql_payments .= " INNER JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = pf.fk_facture";
$sql_payments .= " WHERE f.fk_soc = " . ((int) $object->socid);
$sql_payments .= " AND p.datep < '" . $this->db->idate($object->date) . "'";
$sql_payments .= " ORDER BY p.datep ASC";
$total_payments = 0;
$resql_payments = $this->db->query($sql_payments);
@@ -1438,11 +1439,11 @@ class pdf_sponge extends ModelePDFFactures
// Payments made on current invoice date (including current invoice)
$sql_current_date_payments = "SELECT p.datep, pf.fk_facture, pf.amount";
$sql_current_date_payments.= " FROM " . MAIN_DB_PREFIX . "paiement_facture as pf";
$sql_current_date_payments.= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as p ON p.rowid = pf.fk_paiement";
$sql_current_date_payments.= " INNER JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = pf.fk_facture";
$sql_current_date_payments.= " WHERE f.fk_soc = " . ((int) $object->socid);
$sql_current_date_payments.= " AND DATE(p.datep) = DATE('" . $this->db->idate($object->date) . "')";
$sql_current_date_payments .= " FROM " . MAIN_DB_PREFIX . "paiement_facture as pf";
$sql_current_date_payments .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as p ON p.rowid = pf.fk_paiement";
$sql_current_date_payments .= " INNER JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = pf.fk_facture";
$sql_current_date_payments .= " WHERE f.fk_soc = " . ((int) $object->socid);
$sql_current_date_payments .= " AND DATE(p.datep) = DATE('" . $this->db->idate($object->date) . "')";
$current_date_payments = 0;
$resql_current_date = $this->db->query($sql_current_date_payments);
@@ -1466,7 +1467,7 @@ class pdf_sponge extends ModelePDFFactures
$pdf->MultiCell($posxval - $this->marge_gauche + 8, 4, $titre, 0, 'L', true);
$pdf->SetFont('', '', $default_font_size - 2);
$pdf->SetXY($posxval+8, $posy);
$pdf->SetXY($posxval + 8, $posy);
$titre = $outputlangs->transnoentities("NewBalance").' : '.price($new_balance);
$pdf->MultiCell($posxend - $posxval - 8, 4, $titre, 0, 'L', true);

5
htdocs/core/modules/propale/doc/pdf_azur.modules.php
View File

@@ -243,8 +243,9 @@ class pdf_azur extends ModelePDFPropales
$realpath = '';
foreach ($pdir as $midir) {
if (!$arephoto) {
if ($conf->entity != $objphoto->entity) {
$dir = $conf->product->multidir_output[$objphoto->entity].'/'.$midir; //Check repertories of current entities
$entity = $objphoto->entity;
if ($entity !== null && $conf->entity != $entity) {
$dir = $conf->product->multidir_output[$entity].'/'.$midir; //Check repertories of current entities
} else {
$dir = $conf->product->dir_output.'/'.$midir; //Check repertory of the current product
}

5
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
View File

@@ -220,8 +220,9 @@ class pdf_cyan extends ModelePDFPropales
$arephoto = false;
foreach ($pdir as $midir) {
if (!$arephoto) {
if ($conf->entity != $objphoto->entity) {
$dir = $conf->product->multidir_output[$objphoto->entity].'/'.$midir; //Check repertories of current entities
$entity = $objphoto->entity;
if ($entity !== null && $conf->entity != $entity) {
$dir = $conf->product->multidir_output[$entity].'/'.$midir; //Check repertories of current entities
} else {
$dir = $conf->product->dir_output.'/'.$midir; //Check repertory of the current product
}