Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Laurent Destailleur 2024-04-27 05:03:15 +02:00
commit f156610572
7 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/barcode/printsheet.php
View File

@ -328,7 +328,7 @@ foreach (array_keys($_Avery_Labels) as $codecards) {
$arrayoflabels[$codecards] = $labeltoshow;
}
asort($arrayoflabels);
print $form->selectarray('modellabel', $arrayoflabels, (GETPOST('modellabel') ? GETPOST('modellabel') : $conf->global->ADHERENT_ETIQUETTE_TYPE), 1, 0, 0, '', 0, 0, 0, '', '', 1);
print $form->selectarray('modellabel', $arrayoflabels, (GETPOST('modellabel') ? GETPOST('modellabel') : getDolGlobalString('ADHERENT_ETIQUETTE_TYPE')), 1, 0, 0, '', 0, 0, 0, '', '', 1);
print '</div></div>';
// Number of stickers to print

15
htdocs/core/lib/pdf.lib.php
View File

@ -1352,17 +1352,16 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
}
}
}
// Show page nb only on iso languages (so default Helvetica font)
// Show page nb and apply correction for some font.
$pdf->SetXY($dims['wk'] - $dims['rm'] - 18 - getDolGlobalInt('PDF_FOOTER_PAGE_NUMBER_X', 0), -$posy - getDolGlobalInt('PDF_FOOTER_PAGE_NUMBER_Y', 0));
if (getDolGlobalString('PDF_USE_GETALIASNBPAGE_FOR_TOTAL')) {
// $pagination = $pdf->getAliasNumPage().' / '.$pdf->getAliasNbPages(); // works with $pdf->Cell
$pagination = $pdf->PageNo().' / '.$pdf->getAliasNbPages(); // seems to not work with all fonts like ru_UK
} else {
$pagination = $pdf->PageNo().' / '.$pdf->getNumPages(); // seems to always work even with $pdf->Cell. But some users have reported wrong nb (no way to reproduce)
$pagination = $pdf->PageNo().' / '.$pdf->getAliasNbPages();
$fontRenderCorrection = 0;
if (in_array(pdf_getPDFFont($outputlangs), array('freemono', 'DejaVuSans'))) {
$fontRenderCorrection = 10;
}
$pdf->MultiCell(18, 2, $pagination, 0, 'R', 0);
$pdf->MultiCell(18 + $fontRenderCorrection, 2, $pagination, 0, 'R', 0);
// Show Draft Watermark
if (!empty($watermark)) {

4
htdocs/core/modules/modFacture.class.php
View File

@ -491,8 +491,8 @@ class modFacture extends DolibarrModules
$langs->loadLangs(array("suppliers", "multicurrency", "bills"));
$uselocaltax1 = $mysoc->localtax1_assuj;
$uselocaltax2 = $mysoc->localtax2_assuj;
$uselocaltax1 = $mysoc->localtax1_assuj ?? 0;
$uselocaltax2 = $mysoc->localtax2_assuj ?? 0;
$alias_product_perentity = !getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED') ? "p" : "ppe";

4
htdocs/core/modules/modFournisseur.class.php
View File

@ -326,8 +326,8 @@ class modFournisseur extends DolibarrModules
// Exports
//--------
$uselocaltax1 = $mysoc->localtax1_assuj;
$uselocaltax2 = $mysoc->localtax2_assuj;
$uselocaltax1 = $mysoc->localtax1_assuj ?? 0;
$uselocaltax2 = $mysoc->localtax2_assuj ?? 0;
$r = 0;

1
htdocs/install/mysql/migration/19.0.0-20.0.0.sql
View File

@ -298,6 +298,7 @@ ALTER TABLE llx_receptiondet_batch CHANGE COLUMN fk_commandefourndet fk_elementd
ALTER TABLE llx_supplier_proposaldet MODIFY ref_fourn VARCHAR(128) NULL;
ALTER TABLE llx_projet ADD COLUMN ref_ext varchar(50) after ref;
ALTER TABLE llx_projet ADD COLUMN email_date datetime after email_msgid;
-- bookcal
ALTER TABLE llx_bookcal_calendar ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER rowid;

1
htdocs/install/mysql/tables/llx_projet.sql
View File

@ -43,6 +43,7 @@ create table llx_projet
note_private text,
note_public text,
email_msgid varchar(175), -- if project or lead is created by email collector, we store here MSG ID. Do not use a too large value, it generates trouble with unique index
email_date datetime, -- if project or lead is created by email collector, we store here Date of message
--budget_days real, -- budget in days is sum of field planned_workload of tasks
opp_amount double(24,8),
budget_amount double(24,8),

1
htdocs/langs/fr_FR/members.lang
View File

@ -77,6 +77,7 @@ ConfirmDeleteMemberType=Êtes-vous sur de vouloir supprimer ce type d' adhérent
MemberTypeDeleted=Type d'adhérent supprimé
MemberTypeCanNotBeDeleted=Ce type d'adhérent ne peut pas être supprimé
NewSubscription=Nouvelle cotisation
NewMembership=Nouvelle cotisation
NewSubscriptionDesc=Ce formulaire permet de vous inscrire comme nouvel adhérent de l'association. Pour un renouvellement (si vous êtes déjà adhérent), contactez plutôt l'association par email %s.
Subscription=Adhésion / cotisation
AnyAmountWithAdvisedAmount=N'importe quel montant de votre choix, recommandé %s