lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Comment must be in english

Browse Source
This commit is contained in:
Laurent Destailleur 2020-08-08 13:22:55 +02:00
parent a32587d993
commit cab9f6daae
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
View File

@ -381,7 +381,7 @@ class pdf_standard extends ModeleExpenseReport
$pdf->setPage($pageposafter + 1); $pdf->setPage($pageposafter + 1);
$showpricebeforepagebreak = 1; $showpricebeforepagebreak = 1;
$nexY = $tab_top_newpage; $nexY = $tab_top_newpage;
$nexY += ($pdf->getFontSize() * 1.3); // Passe espace entre les lignes $nexY += ($pdf->getFontSize() * 1.3); // Add space between lines
$pdf->SetFont('', '', $default_font_size - 2); // Into loop to work with multipage $pdf->SetFont('', '', $default_font_size - 2); // Into loop to work with multipage
$pdf->SetTextColor(0, 0, 0); $pdf->SetTextColor(0, 0, 0);

28
htdocs/fichinter/class/fichinterrec.class.php
View File

@ -197,8 +197,6 @@ class FichinterRec extends Fichinter
*/ */
$num = count($fichintsrc->lines); $num = count($fichintsrc->lines);
for ($i = 0; $i < $num; $i++) { for ($i = 0; $i < $num; $i++) {
//$result=$fichintlignesrc->fetch($fichintsrc->lines[$i]->id);
//var_dump($fichintsrc->lines[$i]); //var_dump($fichintsrc->lines[$i]);
$result_insert = $this->addline( $result_insert = $this->addline(
$fichintsrc->lines[$i]->desc, $fichintsrc->lines[$i]->desc,
@ -243,7 +241,7 @@ class FichinterRec extends Fichinter
/** /**
* Recupere l'objet facture et ses lignes de factures * Get the template of intervention object and lines
* *
* @param int $rowid Id of object to load * @param int $rowid Id of object to load
* @param string $ref Reference of fichinter * @param string $ref Reference of fichinter
@ -295,9 +293,7 @@ class FichinterRec extends Fichinter
$this->brouillon = 1; $this->brouillon = 1;
/* // Lines
* Lines
*/
$result = $this->fetch_lines(); $result = $this->fetch_lines();
if ($result < 0) { if ($result < 0) {
$this->error = $this->db->error(); $this->error = $this->db->error();
@ -318,9 +314,9 @@ class FichinterRec extends Fichinter
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Recupere les lignes de factures predefinies dans this->lines * Load all lines of template of intervention into this->lines
* @param int $sall sall
* *
* @param int $sall sall
* @return int 1 if OK, < 0 if KO * @return int 1 if OK, < 0 if KO
*/ */
public function fetch_lines($sall = 0) public function fetch_lines($sall = 0)
@ -441,15 +437,15 @@ class FichinterRec extends Fichinter
* @param integer $duration Durée * @param integer $duration Durée
* @param string $datei Date * @param string $datei Date
* @param int $rang Position of line * @param int $rang Position of line
* @param double $pu_ht Prix unitaire HT (> 0 even for credit note) * @param double $pu_ht Unit price without tax (> 0 even for credit note)
* @param double $qty Quantite * @param double $qty Quantity
* @param double $txtva Taux de tva force, sinon -1 * @param double $txtva Forced VAT rate, otherwise -1
* @param int $fk_product Id du produit/service predefini * @param int $fk_product Id of predefined product/service
* @param double $remise_percent Pourcentage de remise de la ligne * @param double $remise_percent Percentage of discount on line
* @param string $price_base_type HT or TTC * @param string $price_base_type HT or TTC
* @param int $info_bits Bits de type de lignes * @param int $info_bits Bits for type of lines
* @param int $fk_remise_except Id remise * @param int $fk_remise_except Id discount
* @param double $pu_ttc Prix unitaire TTC (> 0 even for credit note) * @param double $pu_ttc Unit price with tax (> 0 even for credit note)
* @param int $type Type of line (0=product, 1=service) * @param int $type Type of line (0=product, 1=service)
* @param int $special_code Special code * @param int $special_code Special code
* @param string $label Label of the line * @param string $label Label of the line