Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge pull request #28842 from frederic34/vinci

Browse Source 
some fix for vinci
This commit is contained in:
Laurent Destailleur
2024-03-14 22:44:41 +01:00
committed by GitHub
parent da199b3169 2670287dd4
commit dbcb2c2cd6
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
View File

@@ -5,7 +5,7 @@
* Copyright (C) 2010-2014 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2017 Ferran Marcet <fmarcet@2byte.es>
* Copyright (C) 2018-2023 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2018-2024 Frédéric France <frederic.france@free.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -124,13 +124,13 @@ class pdf_vinci extends ModelePDFMo
/**
* Function to build pdf onto disk
*
* @param CommandeFournisseur $object Id of object to generate
* @param Translate $outputlangs Lang output object
* @param string $srctemplatepath Full path of source filename for generator using a template file
* @param int $hidedetails Do not show line details
* @param int $hidedesc Do not show desc
* @param int $hideref Do not show ref
* @return int 1=OK, 0=KO
* @param Mo $object Id of object to generate
* @param Translate $outputlangs Lang output object
* @param string $srctemplatepath Full path of source filename for generator using a template file
* @param int $hidedetails Do not show line details
* @param int $hidedesc Do not show desc
* @param int $hideref Do not show ref
* @return int 1=OK, 0=KO
*/
public function write_file($object, $outputlangs = null, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
{
@@ -235,10 +235,10 @@ class pdf_vinci extends ModelePDFMo
$pdf->SetDrawColor(128, 128, 128);
$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
$pdf->SetSubject($outputlangs->transnoentities("Mo"));
$pdf->SetSubject($outputlangs->transnoentities("ManufacturingOrder"));
$pdf->SetCreator("Dolibarr ".DOL_VERSION);
$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Mo")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("ManufacturingOrder")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
if (getDolGlobalString('MAIN_DISABLE_PDF_COMPRESSION')) {
$pdf->SetCompression(false);
}
@@ -657,7 +657,7 @@ class pdf_vinci extends ModelePDFMo
* Show payments table
*
* @param TCPDF $pdf Object PDF
* @param CommandeFournisseur $object Object order
* @param Mo $object Object order
* @param int $posy Position y in PDF
* @param Translate $outputlangs Object langs for output
* @return int Return integer <0 if KO, >0 if OK
@@ -674,7 +674,7 @@ class pdf_vinci extends ModelePDFMo
* Show miscellaneous information (payment mode, payment term, ...)
*
* @param TCPDF $pdf Object PDF
* @param CommandeFournisseur $object Object to show
* @param Mo $object Object to show
* @param int $posy Y
* @param Translate $outputlangs Langs object
* @return integer
@@ -1016,7 +1016,7 @@ class pdf_vinci extends ModelePDFMo
* Show top header of page.
*
* @param TCPDF $pdf Object PDF
* @param CommandeFournisseur $object Object to show
* @param Mo $object Object to show
* @param int $showaddress 0=no, 1=yes
* @param Translate $outputlangs Object lang for output
* @return float|int Return topshift value
@@ -1031,7 +1031,7 @@ class pdf_vinci extends ModelePDFMo
}
// Load translation files required by the page
$outputlangs->loadLangs(array("main", "orders", "companies", "bills", "sendings"));
$outputlangs->loadLangs(array("main", "orders", "companies", "bills", "sendings", "mrp"));
$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -1074,7 +1074,7 @@ class pdf_vinci extends ModelePDFMo
$pdf->SetFont('', 'B', $default_font_size + 3);
$pdf->SetXY($posx, $posy);
$pdf->SetTextColor(0, 0, 60);
$title = $outputlangs->transnoentities("Mo")." ".$outputlangs->convToOutputCharset($object->ref);
$title = $outputlangs->transnoentities("ManufacturingOrder")." ".$outputlangs->convToOutputCharset($object->ref);
$pdf->MultiCell(100, 3, $title, '', 'R');
$posy += 1;
@@ -1311,7 +1311,7 @@ class pdf_vinci extends ModelePDFMo
* Show footer of page. Need this->emetteur object
*
* @param TCPDF $pdf PDF
* @param CommandeFournisseur $object Object to show
* @param Mo $object Object to show
* @param Translate $outputlangs Object lang for output
* @param int $hidefreetext 1=Hide free text
* @return int Return height of bottom margin including footer text
@@ -1323,15 +1323,14 @@ class pdf_vinci extends ModelePDFMo
}
/**
* Define Array Column Field
*
* @param object $object common object
* @param Mo $object common object
* @param Translate $outputlangs langs
* @param int $hidedetails Do not show line details
* @param int $hidedesc Do not show desc
* @param int $hideref Do not show ref
* @param int $hidedetails Do not show line details
* @param int $hidedesc Do not show desc
* @param int $hideref Do not show ref
* @return void
*/
public function defineColumnField($object, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
@@ -1422,7 +1421,7 @@ class pdf_vinci extends ModelePDFMo
'status' => true,
'width' => 25, // in mm
'title' => array(
'textkey' => 'Size'
'textkey' => 'Dimensions'
),
'border-left' => true, // add left line separator
);

1
htdocs/langs/en_US/main.lang
View File

@@ -562,6 +562,7 @@ New=New
Discount=Discount
Unknown=Unknown
General=General
Dimensions=Dimensions
Size=Size
OriginalSize=Original size
RotateImage=Rotate 90°