From 5ecef88b35c44b429c4731c6fb6b8a14fd08ce26 Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Sun, 23 Feb 2020 23:04:24 +0100
Subject: [PATCH 01/18] allow in extrafield conf to choose to add extrafield in
 a new col or append it to description, it could be useful for html or long
 text extrafields

---
 htdocs/core/actions_extrafields.inc.php       |  4 +-
 .../core/class/commondocgenerator.class.php   | 37 +++++++++++++++----
 .../facture/doc/pdf_sponge.modules.php        | 24 +++++++++++-
 htdocs/core/tpl/admin_extrafields_add.tpl.php |  2 +-
 .../core/tpl/admin_extrafields_edit.tpl.php   |  2 +-
 .../core/tpl/admin_extrafields_view.tpl.php   |  2 +-
 6 files changed, 58 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/actions_extrafields.inc.php b/htdocs/core/actions_extrafields.inc.php
index 486764b167e..b61c9209aa8 100644
--- a/htdocs/core/actions_extrafields.inc.php
+++ b/htdocs/core/actions_extrafields.inc.php
@@ -184,7 +184,7 @@ if ($action == 'add')
                     GETPOST('langfile', 'alpha'),
                     1,
                     (GETPOST('totalizable', 'alpha')?1:0),
-                    (GETPOST('documentpdf', 'alpha')?1:0)
+                    GETPOST('documentpdf', 'alpha')
                 );
     			if ($result > 0)
     			{
@@ -354,7 +354,7 @@ if ($action == 'update')
                     GETPOST('langfile'),
                     1,
                     (GETPOST('totalizable', 'alpha')?1:0),
-                    (GETPOST('documentpdf', 'alpha')?1:0)
+                    GETPOST('documentpdf', 'alpha')
     			);
     			if ($result > 0)
     			{
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index eb214516a6f..753002a39ee 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -1074,7 +1074,7 @@ abstract class CommonDocGenerator
     /**
      *  print standard column content
      *
-     *  @param	PDF		    $pdf    	pdf object
+     *  @param	TCPDF		    $pdf    	pdf object
      *  @param	float		$curY    	curent Y position
      *  @param	string		$colKey    	the column key
      *  @param	string		$columnText   column text
@@ -1179,6 +1179,8 @@ abstract class CommonDocGenerator
         $defaultParams = array(
             'style'         => '',
             'display'         => 'auto', // auto, table, list
+            'documentpdfEnable' => array(1),
+            'documentpdfEnableNotEmpty' => array(2),
 
             'table'         => array(
                 'maxItemsInRow' => 2,
@@ -1213,7 +1215,18 @@ abstract class CommonDocGenerator
             foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label)
             {
                 // Enable extrafield ?
-                $enabled = !empty($extrafields->attributes[$object->table_element]['documentpdf'][$key]);
+                $enabled = 0;
+                $disableOnEmpty = 0;
+                if(!empty($extrafields->attributes[$object->table_element]['documentpdf'][$key])) {
+                    $documentpdf = intval($extrafields->attributes[$object->table_element]['documentpdf'][$key]);
+                    if(in_array($documentpdf,$params['documentpdfEnable']) || in_array($documentpdf,$params['documentpdfEnableNotEmpty']) ) {
+                        $enabled = 1;
+                    }
+
+                    if (in_array($documentpdf,$params['documentpdfEnableNotEmpty'])) {
+                        $disableOnEmpty = 1;
+                    }
+                }
 
                 if(empty($enabled)){
                     continue;
@@ -1225,6 +1238,11 @@ abstract class CommonDocGenerator
                 $field->label = $outputlangs->transnoentities($label);
                 $field->type = $extrafields->attributes[$object->table_element]['type'][$key];
 
+                // dont display if empty
+                if($disableOnEmpty && empty($field->content)) {
+                    continue;
+                }
+
                 $fields[] = $field;
             }
         }
@@ -1234,10 +1252,7 @@ abstract class CommonDocGenerator
             // Sort extrafields by rank
             uasort($fields, function ($a, $b) {
                 return  ($a->rank > $b->rank) ? -1 : 1;
-			}
-            );
-
-
+			});
 
             // define some HTML content with style
             $html.= '<style>'.$params['style'].'</style>';
@@ -1425,8 +1440,16 @@ abstract class CommonDocGenerator
                 }
 
                 // Enable extrafield ?
-                $enabled = !empty($extrafields->attributes[$object->table_element]['documentpdf'][$key]);
+                $enabled = 0;
+                if(!empty($extrafields->attributes[$object->table_element]['documentpdf'][$key])) {
+                    $documentpdf = intval($extrafields->attributes[$object->table_element]['documentpdf'][$key]);
+                    if($documentpdf === 1 || $documentpdf === 2) {
+                        $enabled = 1;
+                    }
+                    // Note : if $documentpdf === 3 or 4 so, it's displayed after line description not in cols
+                }
 
+                if (!$enabled){ continue; } // don't wast resourses if we don't need them...
 
                 // Load language if required
                 if (!empty($extrafields->attributes[$object->table_element]['langfile'][$key])) $outputlangs->load($extrafields->attributes[$object->table_element]['langfile'][$key]);
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index cd9327e25b9..90290caaf61 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -638,12 +638,34 @@ class pdf_sponge extends ModelePDFFactures
 	                {
     	                $pdf->startTransaction();
     	                pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->getColumnContentWidth('desc'), 3, $this->getColumnContentXStart('desc'), $curY, $hideref, $hidedesc);
+                        $posYAfterDescription = $pdf->GetY();
+                        $params = array(
+                            'display'         => 'list',
+                            'documentpdfEnable' => array(3),
+                            'documentpdfEnableNotEmpty' => array(4)
+                        );
+                        $extrafieldDesc = $this->getExtrafieldsInHtml($object->lines[$i], $outputlangs, $params);
+                        if(!empty($extrafieldDesc)){
+                            $this->printStdColumnContent($pdf, $posYAfterDescription, 'desc', $extrafieldDesc);
+                        }
+
     	                $pageposafter = $pdf->getPage();
     	                if ($pageposafter > $pageposbefore)	// There is a pagebreak
     	                {
     	                    $pdf->rollbackTransaction(true);
     	                    $pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
     	                    pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->getColumnContentWidth('desc'), 3, $this->getColumnContentXStart('desc'), $curY, $hideref, $hidedesc);
+                            $posYAfterDescription = $pdf->GetY();
+                            $params = array(
+                                'display'         => 'list',
+                                'documentpdfEnable' => array(3),
+                                'documentpdfEnableNotEmpty' => array(4)
+                            );
+                            $extrafieldDesc = $this->getExtrafieldsInHtml($object->lines[$i], $outputlangs, $params);
+                            if(!empty($extrafieldDesc)){
+                                $this->printStdColumnContent($pdf, $posYAfterDescription, 'desc', $extrafieldDesc);
+                            }
+
     	                    $pageposafter = $pdf->getPage();
     	                    $posyafter = $pdf->GetY();
     	                    //var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
@@ -673,7 +695,7 @@ class pdf_sponge extends ModelePDFFactures
     	                $posYAfterDescription = $pdf->GetY();
 	                }
 
-	                $nexY = $pdf->GetY();
+                    $nexY = $pdf->GetY();
 	                $pageposafter = $pdf->getPage();
 	                $pdf->setPage($pageposbefore);
 	                $pdf->setTopMargin($this->marge_haute);
diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index 37872f2a5c0..a31b83309af 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -198,7 +198,7 @@ $langs->load("modulebuilder");
 </td><td class="valeur"><input id="list" class="minwidth100" type="text" name="list" value="<?php echo GETPOST('list', 'int')!='' ? GETPOST('list', 'int') : '1'; ?>"></td></tr>
 <!-- Visibility for PDF-->
 <tr><td class="extra_pdf"><?php echo $form->textwithpicto($langs->trans("DisplayOnPdf"), $langs->trans("DisplayOnPdfDesc")); ?>
-</td><td class="valeur"><input id="documentpdf" type="checkbox" name="documentpdf"<?php echo GETPOST('documentpdf', 'alpha')?' checked':''; ?>></td></tr>
+</td><td class="valeur"><input id="documentpdf" class="minwidth100" type="text" name="documentpdf" value="<?php echo dol_escape_htmltag(GETPOST('documentpdf', 'int')); ?>"></td></tr>
 <!-- Totalizable -->
 <tr class="extra_totalizable"><td><?php echo $langs->trans("Totalizable"); ?></td><td class="valeur"><input id="totalizable" type="checkbox" name="totalizable"<?php echo ((GETPOST('totalizable', 'alpha') || GETPOST('button', 'alpha'))?' checked':''); ?>></td></tr>
 <!-- Help tooltip -->
diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
index 8e14ad978ca..f92bdd1ada6 100644
--- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
@@ -267,7 +267,7 @@ else
 </td><td class="valeur"><input id="list" class="minwidth100" type="text" name="list" value="<?php echo ($list!=''?$list:'1'); ?>"></td></tr>
 <!-- Visibility for PDF-->
 <tr><td class="extra_pdf"><?php echo $form->textwithpicto($langs->trans("DisplayOnPdf"), $langs->trans("DisplayOnPdfDesc")); ?>
-</td><td class="valeur"><input id="documentpdf" type="checkbox" name="documentpdf"<?php echo !empty($documentpdf)?' checked':''; ?>></td></tr>
+</td><td class="valeur"><input id="documentpdf" class="minwidth100" type="text" name="documentpdf" value="<?php echo dol_escape_htmltag($documentpdf); ?>"></td></tr>
 <tr class="extra_totalizable"><td><?php echo $form->textwithpicto($langs->trans("Totalizable"), $langs->trans("TotalizableDesc")); ?></td><td class="valeur"><input id="totalizable" type="checkbox" name="totalizable"<?php echo ($totalizable?' checked':''); ?>></td></tr>
 <!-- Help tooltip -->
 <tr class="help"><td><?php echo $form->textwithpicto($langs->trans("HelpOnTooltip"), $langs->trans("HelpOnTooltipDesc")); ?></td><td class="valeur"><input id="help" class="quatrevingtpercent" type="text" name="help" value="<?php echo dol_escape_htmltag($help); ?>"></td></tr>
diff --git a/htdocs/core/tpl/admin_extrafields_view.tpl.php b/htdocs/core/tpl/admin_extrafields_view.tpl.php
index 3bec8cb8d6f..6ed1480a0ea 100644
--- a/htdocs/core/tpl/admin_extrafields_view.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_view.tpl.php
@@ -93,7 +93,7 @@ if (is_array($extrafields->attributes[$elementtype]['type']) && count($extrafiel
 		print '<td class="center">'.yn($extrafields->attributes[$elementtype]['required'][$key])."</td>\n";
 		print '<td class="center">'.yn($extrafields->attributes[$elementtype]['alwayseditable'][$key])."</td>\n";
 		print '<td class="center">'.$extrafields->attributes[$elementtype]['list'][$key]."</td>\n";
-		print '<td class="center">'.yn($extrafields->attributes[$elementtype]['documentpdf'][$key])."</td>\n";
+		print '<td class="center">'.$extrafields->attributes[$elementtype]['documentpdf'][$key]."</td>\n";
 		print '<td class="center">'.yn($extrafields->attributes[$elementtype]['totalizable'][$key])."</td>\n";
 		if (! empty($conf->multicompany->enabled))  {
 			print '<td class="center">';

From 316fa4068aecb20fe11b0e10d77095edd3993f8d Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Sun, 23 Feb 2020 23:14:01 +0100
Subject: [PATCH 02/18] revert commit fdfc45bbe978afa2e7c460749304e6fa30282c2f
 and fix y position

---
 htdocs/core/class/commondocgenerator.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 753002a39ee..c0656758789 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -1094,9 +1094,9 @@ abstract class CommonDocGenerator
         if (!$reshook)
         {
             if (empty($columnText)) return;
-            $pdf->SetXY($this->getColumnContentXStart($colKey) - 1, $curY); // Set curent position
+            $pdf->SetXY($this->getColumnContentXStart($colKey), $curY); // Set curent position
             $colDef = $this->cols[$colKey];
-            $pdf->writeHTMLCell($this->getColumnContentWidth($colKey) + 2, 2, $this->getColumnContentXStart($colKey) - 1, $curY, $columnText, 0, 0, 0, true, $colDef['content']['align']);
+            $pdf->writeHTMLCell($this->getColumnContentWidth($colKey), 2, $this->getColumnContentXStart($colKey), $curY, $columnText, 0, 1, 0, true, $colDef['content']['align']);
         }
     }
 

From acacbfd85e8651d396db7b07e5c59f0cf643dbd6 Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Sun, 23 Feb 2020 23:17:10 +0100
Subject: [PATCH 03/18] Fix list separator on first loop

---
 htdocs/core/class/commondocgenerator.class.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index c0656758789..e54527c0173 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -1255,7 +1255,7 @@ abstract class CommonDocGenerator
 			});
 
             // define some HTML content with style
-            $html.= '<style>'.$params['style'].'</style>';
+            $html.= !empty($params['style'])?'<style>'.$params['style'].'</style>':'';
 
             // auto select display format
             if($params['display'] == 'auto') {
@@ -1270,10 +1270,12 @@ abstract class CommonDocGenerator
 
             if($params['display'] == 'list') {
                 // Display in list format
+                $i=0;
                 foreach ($fields as $field) {
-                    $html .= !empty($html)?$params['list']['separator']:'';
+                    $html .= !empty($i)?$params['list']['separator']:'';
                     $html .= '<strong>' . $field->label . ' : </strong>';
                     $html .= $field->content;
+                    $i++;
                 }
             }
             elseif($params['display'] == 'table') {

From 33f3083f7039752e4de21840300c0d69cbd3a73a Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sun, 23 Feb 2020 22:26:27 +0000
Subject: [PATCH 04/18] Fixing style errors.

---
 htdocs/core/class/commondocgenerator.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index e54527c0173..80e5ec53181 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -1219,11 +1219,11 @@ abstract class CommonDocGenerator
                 $disableOnEmpty = 0;
                 if(!empty($extrafields->attributes[$object->table_element]['documentpdf'][$key])) {
                     $documentpdf = intval($extrafields->attributes[$object->table_element]['documentpdf'][$key]);
-                    if(in_array($documentpdf,$params['documentpdfEnable']) || in_array($documentpdf,$params['documentpdfEnableNotEmpty']) ) {
+                    if(in_array($documentpdf, $params['documentpdfEnable']) || in_array($documentpdf, $params['documentpdfEnableNotEmpty']) ) {
                         $enabled = 1;
                     }
 
-                    if (in_array($documentpdf,$params['documentpdfEnableNotEmpty'])) {
+                    if (in_array($documentpdf, $params['documentpdfEnableNotEmpty'])) {
                         $disableOnEmpty = 1;
                     }
                 }

From fab34d5114b04096d995cb9b7be48850ab6537a4 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sun, 23 Feb 2020 22:40:41 +0000
Subject: [PATCH 05/18] Fixing style errors.

---
 htdocs/core/class/commondocgenerator.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index d53cb5ebc69..7fa97349f01 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -1219,11 +1219,11 @@ abstract class CommonDocGenerator
                 $disableOnEmpty = 0;
                 if(!empty($extrafields->attributes[$object->table_element]['printable'][$key])) {
                     $printable = intval($extrafields->attributes[$object->table_element]['printable'][$key]);
-                    if(in_array($printable,$params['printableEnable']) || in_array($printable,$params['printableEnableNotEmpty']) ) {
+                    if(in_array($printable, $params['printableEnable']) || in_array($printable, $params['printableEnableNotEmpty']) ) {
                         $enabled = 1;
                     }
 
-                    if (in_array($printable,$params['printableEnableNotEmpty'])) {
+                    if (in_array($printable, $params['printableEnableNotEmpty'])) {
                         $disableOnEmpty = 1;
                     }
                 }

From 377b9a6b88d1f2c18c1038abf053f7af8fa643ed Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Mon, 24 Feb 2020 00:14:43 +0100
Subject: [PATCH 06/18] Add extrafields on PDF object lines desc for compatible
 pdf

---
 .../commande/doc/pdf_eratosthene.modules.php  | 15 ++++++++++-
 .../expedition/doc/pdf_espadon.modules.php    | 27 ++++++++++++++++++-
 .../facture/doc/pdf_sponge.modules.php        | 11 +++++---
 .../modules/propale/doc/pdf_cyan.modules.php  | 25 +++++++++++++++++
 .../supplier_order/doc/pdf_cornas.modules.php | 26 ++++++++++++++++++
 5 files changed, 98 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index fc1d737a7d5..18945fc6c43 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -604,7 +604,20 @@ class pdf_eratosthene extends ModelePDFCommandes
 					{
     					$pdf->startTransaction();
     					pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->getColumnContentWidth('desc'), 3, $this->getColumnContentXStart('desc'), $curY, $hideref, $hidedesc);
-    					$pageposafter = $pdf->getPage();
+                        $posYAfterDescription = $pdf->GetY();
+
+                        // Display extrafield if needed
+                        $params = array(
+                            'display'         => 'list',
+                            'printableEnable' => array(3),
+                            'printableEnableNotEmpty' => array(4)
+                        );
+                        $extrafieldDesc = $this->getExtrafieldsInHtml($object->lines[$i], $outputlangs, $params);
+                        if(!empty($extrafieldDesc)){
+                            $this->printStdColumnContent($pdf, $posYAfterDescription, 'desc', $extrafieldDesc);
+                        }
+
+                        $pageposafter = $pdf->getPage();
     					if ($pageposafter > $pageposbefore)	// There is a pagebreak
     					{
     						$pdf->rollbackTransaction(true);
diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index 0ef7acc7bef..29dee279924 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -474,7 +474,20 @@ class pdf_espadon extends ModelePdfExpedition
 					{
 					    $pdf->startTransaction();
 					    pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->getColumnContentWidth('desc'), 3, $this->getColumnContentXStart('desc'), $curY, $hideref, $hidedesc);
-					    $pageposafter = $pdf->getPage();
+                        $posYAfterDescription = $pdf->GetY();
+
+                        // Display extrafield if needed
+                        $params = array(
+                            'display'         => 'list',
+                            'printableEnable' => array(3),
+                            'printableEnableNotEmpty' => array(4)
+                        );
+                        $extrafieldDesc = $this->getExtrafieldsInHtml($object->lines[$i], $outputlangs, $params);
+                        if(!empty($extrafieldDesc)){
+                            $this->printStdColumnContent($pdf, $posYAfterDescription, 'desc', $extrafieldDesc);
+                        }
+
+                        $pageposafter = $pdf->getPage();
 					    if ($pageposafter > $pageposbefore)	// There is a pagebreak
 					    {
 					        $pdf->rollbackTransaction(true);
@@ -482,6 +495,18 @@ class pdf_espadon extends ModelePdfExpedition
 					        //print $pageposafter.'-'.$pageposbefore;exit;
 					        $pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 					        pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->getColumnContentWidth('desc'), 3, $this->getColumnContentXStart('desc'), $curY, $hideref, $hidedesc);
+					        $posYAfterDescription = $pdf->GetY();
+
+                            // Display extrafield if needed
+                            $params = array(
+                                'display'         => 'list',
+                                'printableEnable' => array(3),
+                                'printableEnableNotEmpty' => array(4)
+                            );
+                            $extrafieldDesc = $this->getExtrafieldsInHtml($object->lines[$i], $outputlangs, $params);
+                            if(!empty($extrafieldDesc)){
+                                $this->printStdColumnContent($pdf, $posYAfterDescription, 'desc', $extrafieldDesc);
+                            }
 
 					        $pageposafter = $pdf->getPage();
 					        $posyafter = $pdf->GetY();
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 90290caaf61..c4e0ef792ac 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -639,10 +639,13 @@ class pdf_sponge extends ModelePDFFactures
     	                $pdf->startTransaction();
     	                pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->getColumnContentWidth('desc'), 3, $this->getColumnContentXStart('desc'), $curY, $hideref, $hidedesc);
                         $posYAfterDescription = $pdf->GetY();
+
+                        // Display extrafield if needed
+
                         $params = array(
                             'display'         => 'list',
-                            'documentpdfEnable' => array(3),
-                            'documentpdfEnableNotEmpty' => array(4)
+                            'printableEnable' => array(3),
+                            'printableEnableNotEmpty' => array(4)
                         );
                         $extrafieldDesc = $this->getExtrafieldsInHtml($object->lines[$i], $outputlangs, $params);
                         if(!empty($extrafieldDesc)){
@@ -658,8 +661,8 @@ class pdf_sponge extends ModelePDFFactures
                             $posYAfterDescription = $pdf->GetY();
                             $params = array(
                                 'display'         => 'list',
-                                'documentpdfEnable' => array(3),
-                                'documentpdfEnableNotEmpty' => array(4)
+                                'printableEnable' => array(3),
+                                'printableEnableNotEmpty' => array(4)
                             );
                             $extrafieldDesc = $this->getExtrafieldsInHtml($object->lines[$i], $outputlangs, $params);
                             if(!empty($extrafieldDesc)){
diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index 702202be988..f55fd370132 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -622,6 +622,19 @@ class pdf_cyan extends ModelePDFPropales
 					{
     					$pdf->startTransaction();
     					pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->getColumnContentWidth('desc'), 3, $this->getColumnContentXStart('desc'), $curY, $hideref, $hidedesc);
+                        $posYAfterDescription = $pdf->GetY();
+
+                        // Display extrafield if needed
+                        $params = array(
+                            'display'         => 'list',
+                            'printableEnable' => array(3),
+                            'printableEnableNotEmpty' => array(4)
+                        );
+                        $extrafieldDesc = $this->getExtrafieldsInHtml($object->lines[$i], $outputlangs, $params);
+                        if(!empty($extrafieldDesc)){
+                            $this->printStdColumnContent($pdf, $posYAfterDescription, 'desc', $extrafieldDesc);
+                        }
+
     					$pageposafter = $pdf->getPage();
     					if ($pageposafter > $pageposbefore)	// There is a pagebreak
     					{
@@ -630,6 +643,18 @@ class pdf_cyan extends ModelePDFPropales
     						//print $pageposafter.'-'.$pageposbefore;exit;
     						$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
     						pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->getColumnContentWidth('desc'), 3, $this->getColumnContentXStart('desc'), $curY, $hideref, $hidedesc);
+                            $posYAfterDescription = $pdf->GetY();
+
+                            // Display extrafield if needed
+                            $params = array(
+                                'display'         => 'list',
+                                'printableEnable' => array(3),
+                                'printableEnableNotEmpty' => array(4)
+                            );
+                            $extrafieldDesc = $this->getExtrafieldsInHtml($object->lines[$i], $outputlangs, $params);
+                            if(!empty($extrafieldDesc)){
+                                $this->printStdColumnContent($pdf, $posYAfterDescription, 'desc', $extrafieldDesc);
+                            }
 
     						$pageposafter = $pdf->getPage();
     						$posyafter = $pdf->GetY();
diff --git a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
index 92bc5219688..24ad06fee38 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -556,6 +556,19 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 					{
 					    $pdf->startTransaction();
 					    pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->getColumnContentWidth('desc'), 3, $this->getColumnContentXStart('desc'), $curY, $hideref, $hidedesc);
+                        $posYAfterDescription = $pdf->GetY();
+
+                        // Display extrafield if needed
+                        $params = array(
+                            'display'         => 'list',
+                            'printableEnable' => array(3),
+                            'printableEnableNotEmpty' => array(4)
+                        );
+                        $extrafieldDesc = $this->getExtrafieldsInHtml($object->lines[$i], $outputlangs, $params);
+                        if(!empty($extrafieldDesc)){
+                            $this->printStdColumnContent($pdf, $posYAfterDescription, 'desc', $extrafieldDesc);
+                        }
+
 					    $pageposafter = $pdf->getPage();
 					    if ($pageposafter > $pageposbefore)	// There is a pagebreak
 					    {
@@ -564,6 +577,19 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 					        //print $pageposafter.'-'.$pageposbefore;exit;
 					        $pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 					        pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->getColumnContentWidth('desc'), 3, $this->getColumnContentXStart('desc'), $curY, $hideref, $hidedesc);
+                            $posYAfterDescription = $pdf->GetY();
+
+                            // Display extrafield if needed
+                            $params = array(
+                                'display'         => 'list',
+                                'printableEnable' => array(3),
+                                'printableEnableNotEmpty' => array(4)
+                            );
+                            $extrafieldDesc = $this->getExtrafieldsInHtml($object->lines[$i], $outputlangs, $params);
+                            if(!empty($extrafieldDesc)){
+                                $this->printStdColumnContent($pdf, $posYAfterDescription, 'desc', $extrafieldDesc);
+                            }
+
 					        $pageposafter = $pdf->getPage();
 					        $posyafter = $pdf->GetY();
 					        if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text

From 98407347e77b35c34282c5a62807580bf1836766 Mon Sep 17 00:00:00 2001
From: John Botella <john.botella@atm-consulting.fr>
Date: Mon, 24 Feb 2020 13:44:26 +0100
Subject: [PATCH 07/18] Update extrafield printable desc

---
 htdocs/langs/en_US/modulebuilder.lang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index 9f64e93f9d1..9dd6e9c9b30 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -84,7 +84,7 @@ ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
@@ -138,4 +138,4 @@ NotEditable=Not editable
 ForeignKey=Foreign key
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
 AsciiToHtmlConverter=Ascii to HTML converter
-AsciiToPdfConverter=Ascii to PDF converter
\ No newline at end of file
+AsciiToPdfConverter=Ascii to PDF converter

From 06b2d459c03ea622e4e71d8ce353f3f12a4d276e Mon Sep 17 00:00:00 2001
From: John Botella <john.botella@atm-consulting.fr>
Date: Mon, 24 Feb 2020 14:18:49 +0100
Subject: [PATCH 08/18] Fix cell padding

---
 htdocs/core/class/commondocgenerator.class.php         | 4 ++++
 htdocs/core/modules/facture/doc/pdf_sponge.modules.php | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 7fa97349f01..9e78672f0bd 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -1096,7 +1096,11 @@ abstract class CommonDocGenerator
             if (empty($columnText)) return;
             $pdf->SetXY($this->getColumnContentXStart($colKey), $curY); // Set curent position
             $colDef = $this->cols[$colKey];
+			$curentCellPaddinds = $pdf->getCellPaddings();
+			$pdf->setCellPadding(0);
             $pdf->writeHTMLCell($this->getColumnContentWidth($colKey), 2, $this->getColumnContentXStart($colKey), $curY, $columnText, 0, 1, 0, true, $colDef['content']['align']);
+			$curentCellPaddinds = $pdf->getCellPaddings();
+			$pdf->setCellPaddings( $curentCellPaddinds['L'], $curentCellPaddinds['T'], $curentCellPaddinds['R'], $curentCellPaddinds['B']);
         }
     }
 
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index c4e0ef792ac..68101161ce1 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -2242,7 +2242,7 @@ class pdf_sponge extends ModelePDFFactures
 	    // Default field style for content
 	    $this->defaultContentsFieldsStyle = array(
 	        'align' => 'R', // R,C,L
-	        'padding' => array(0.5, 0.5, 0.5, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+	        'padding' => array(0.5, 1, 0.5, 1), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 	    );
 
 	    // Default field style for content

From d07e2ab8fba5e825686107196d3eaa28cc9eaeda Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 24 Feb 2020 16:44:46 +0000
Subject: [PATCH 09/18] Fixing style errors.

---
 htdocs/core/class/commondocgenerator.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 9e78672f0bd..6ba5d446ecf 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -1100,7 +1100,7 @@ abstract class CommonDocGenerator
 			$pdf->setCellPadding(0);
             $pdf->writeHTMLCell($this->getColumnContentWidth($colKey), 2, $this->getColumnContentXStart($colKey), $curY, $columnText, 0, 1, 0, true, $colDef['content']['align']);
 			$curentCellPaddinds = $pdf->getCellPaddings();
-			$pdf->setCellPaddings( $curentCellPaddinds['L'], $curentCellPaddinds['T'], $curentCellPaddinds['R'], $curentCellPaddinds['B']);
+			$pdf->setCellPaddings($curentCellPaddinds['L'], $curentCellPaddinds['T'], $curentCellPaddinds['R'], $curentCellPaddinds['B']);
         }
     }
 

From 1ca1f0677b51c9a72387daed2dfc200e9215ea8c Mon Sep 17 00:00:00 2001
From: John Botella <john.botella@atm-consulting.fr>
Date: Mon, 24 Feb 2020 17:48:01 +0100
Subject: [PATCH 10/18] fix PDF cell padding

---
 htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php  | 4 ++--
 htdocs/core/modules/expedition/doc/pdf_espadon.modules.php    | 4 ++--
 htdocs/core/modules/facture/doc/pdf_sponge.modules.php        | 2 +-
 htdocs/core/modules/propale/doc/pdf_cyan.modules.php          | 4 ++--
 htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index 18945fc6c43..69bb0be2529 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -1704,7 +1704,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 	    // Default field style for content
 	    $this->defaultContentsFieldsStyle = array(
 	        'align' => 'R', // R,C,L
-	        'padding' => array(0.5, 0.5, 0.5, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+	        'padding' => array(0.5, 1, 0.5, 1), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 	    );
 
 	    // Default field style for content
@@ -1741,7 +1741,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 	            'align' => 'L',
 	            // 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
 	            // 'label' => ' ', // the final label
-	            'padding' => array(0.5, 0.5, 0.5, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+	            'padding' => array(0.5, 1, 0.5, 1), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 	        ),
 	        'content' => array(
 	            'align' => 'L',
diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index 29dee279924..7843eb6e087 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -1146,7 +1146,7 @@ class pdf_espadon extends ModelePdfExpedition
 	    // Default field style for content
 	    $this->defaultContentsFieldsStyle = array(
 	        'align' => 'R', // R,C,L
-	        'padding' => array(0.5, 0.5, 0.5, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+	        'padding' => array(0.5, 1, 0.5, 1), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 	    );
 
 	    // Default field style for content
@@ -1183,7 +1183,7 @@ class pdf_espadon extends ModelePdfExpedition
 	            'align' => 'L',
 	            // 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
 	            // 'label' => ' ', // the final label
-	            'padding' => array(0.5, 0.5, 0.5, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+	            'padding' => array(0.5, 1, 0.5, 1), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 	        ),
 	        'content' => array(
 	            'align' => 'L',
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 68101161ce1..3c914dbd478 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -2279,7 +2279,7 @@ class pdf_sponge extends ModelePDFFactures
 	            'align' => 'L',
 	            // 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
 	            // 'label' => ' ', // the final label
-	            'padding' => array(0.5, 0.5, 0.5, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+	            'padding' => array(0.5, 1, 0.5, 1), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 	        ),
 	        'content' => array(
 	            'align' => 'L',
diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index f55fd370132..aaa64b266de 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -1865,7 +1865,7 @@ class pdf_cyan extends ModelePDFPropales
 	    // Default field style for content
 	    $this->defaultContentsFieldsStyle = array(
 	        'align' => 'R', // R,C,L
-	        'padding' => array(0.5, 0.5, 0.5, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+	        'padding' => array(0.5, 1, 0.5, 1), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 	    );
 
 	    // Default field style for content
@@ -1902,7 +1902,7 @@ class pdf_cyan extends ModelePDFPropales
 	            'align' => 'L',
 	            // 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
 	            // 'label' => ' ', // the final label
-	            'padding' => array(0.5, 0.5, 0.5, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+	            'padding' => array(0.5, 1, 0.5, 1), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 	        ),
 	        'content' => array(
 	            'align' => 'L',
diff --git a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
index 24ad06fee38..e454e29835c 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -1509,7 +1509,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 	    // Default field style for content
 	    $this->defaultContentsFieldsStyle = array(
 	        'align' => 'R', // R,C,L
-	        'padding' => array(0.5, 0.5, 0.5, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+	        'padding' => array(0.5, 1, 0.5, 1), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 	    );
 
 	    // Default field style for content
@@ -1546,7 +1546,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 	            'align' => 'L',
 	            // 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
 	            // 'label' => ' ', // the final label
-	            'padding' => array(0.5, 0.5, 0.5, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+	            'padding' => array(0.5, 1, 0.5, 1), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 	        ),
 	        'content' => array(
 	            'align' => 'L',

From 3c4e7f7b07825a6fedd7299374f2119a460c1eb0 Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Mon, 24 Feb 2020 20:47:19 +0100
Subject: [PATCH 11/18] Fix cell padding sponge

---
 .../core/class/commondocgenerator.class.php   | 50 +++++++++++++++++--
 .../facture/doc/pdf_sponge.modules.php        | 41 ++++-----------
 2 files changed, 56 insertions(+), 35 deletions(-)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 6ba5d446ecf..048c70e7f68 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -1096,14 +1096,58 @@ abstract class CommonDocGenerator
             if (empty($columnText)) return;
             $pdf->SetXY($this->getColumnContentXStart($colKey), $curY); // Set curent position
             $colDef = $this->cols[$colKey];
+            // save curent cell padding
 			$curentCellPaddinds = $pdf->getCellPaddings();
-			$pdf->setCellPadding(0);
-            $pdf->writeHTMLCell($this->getColumnContentWidth($colKey), 2, $this->getColumnContentXStart($colKey), $curY, $columnText, 0, 1, 0, true, $colDef['content']['align']);
-			$curentCellPaddinds = $pdf->getCellPaddings();
+            // set cell padding with column content definition
+			$pdf->setCellPaddings($colDef['content']['padding'][3], $colDef['content']['padding'][0], $colDef['content']['padding'][1], $colDef['content']['padding'][2]);
+            $pdf->writeHTMLCell($colDef['width'], 2, $colDef['xStartPos'], $curY, $columnText, 0, 1, 0, true, $colDef['content']['align']);
+
+            // restore cell padding
 			$pdf->setCellPaddings($curentCellPaddinds['L'], $curentCellPaddinds['T'], $curentCellPaddinds['R'], $curentCellPaddinds['B']);
         }
     }
 
+
+    /**
+     *  print standard column content
+     *
+     *  @param	TCPDF		$pdf    	pdf object
+     *  @param  object      $object CommonObject
+     *  @param	string		$colKey    	the column key
+     *  @param  $i
+     *  @param  $outputlangs
+     *  @param	float		$curY    	curent Y position
+     *  @param $hideref
+     *  @param $hidedesc
+     *  @param $issupplierline
+     */
+    function printColDescContent($pdf, &$curY, $colKey, $object, $i, $outputlangs, $hideref = 0, $hidedesc = 0, $issupplierline = 0){
+        // load desc col params
+        $colDef = $this->cols[$colKey];
+        // save curent cell padding
+        $curentCellPaddinds = $pdf->getCellPaddings();
+        // set cell padding with column content definition
+        $pdf->setCellPaddings($colDef['content']['padding'][3], $colDef['content']['padding'][0], $colDef['content']['padding'][1], $colDef['content']['padding'][2]);
+
+        // line description
+        pdf_writelinedesc($pdf, $object, $i, $outputlangs, $colDef['width'], 3, $colDef['xStartPos'], $curY, $hideref, $hidedesc, $issupplierline);
+        $posYAfterDescription = $pdf->GetY() - $colDef['content']['padding'][0];
+
+        // restore cell padding
+        $pdf->setCellPaddings($curentCellPaddinds['L'], $curentCellPaddinds['T'], $curentCellPaddinds['R'], $curentCellPaddinds['B']);
+
+        // Display extrafield if needed
+        $params = array(
+            'display'         => 'list',
+            'printableEnable' => array(3),
+            'printableEnableNotEmpty' => array(4)
+        );
+        $extrafieldDesc = $this->getExtrafieldsInHtml($object->lines[$i], $outputlangs, $params);
+        if(!empty($extrafieldDesc)){
+            $this->printStdColumnContent($pdf, $posYAfterDescription, $colKey, $extrafieldDesc);
+        }
+    }
+
     /**
      *  get extrafield content for pdf writeHtmlCell compatibility
      *  usage for PDF line columns and object note block
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 3c914dbd478..224f3522382 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -584,7 +584,7 @@ class pdf_sponge extends ModelePDFFactures
 
 			    $iniY = $tab_top + $this->tabTitleHeight + 2;
 			    $curY = $tab_top + $this->tabTitleHeight + 2;
-			    $nexY = $tab_top + $this->tabTitleHeight + 2;
+			    $nexY = $tab_top + $this->tabTitleHeight + 0;
 
 	            // Loop on each lines
 	            $pageposbeforeprintlines = $pdf->getPage();
@@ -637,37 +637,15 @@ class pdf_sponge extends ModelePDFFactures
 	                if ($this->getColumnStatus('desc'))
 	                {
     	                $pdf->startTransaction();
-    	                pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->getColumnContentWidth('desc'), 3, $this->getColumnContentXStart('desc'), $curY, $hideref, $hidedesc);
-                        $posYAfterDescription = $pdf->GetY();
-
-                        // Display extrafield if needed
-
-                        $params = array(
-                            'display'         => 'list',
-                            'printableEnable' => array(3),
-                            'printableEnableNotEmpty' => array(4)
-                        );
-                        $extrafieldDesc = $this->getExtrafieldsInHtml($object->lines[$i], $outputlangs, $params);
-                        if(!empty($extrafieldDesc)){
-                            $this->printStdColumnContent($pdf, $posYAfterDescription, 'desc', $extrafieldDesc);
-                        }
 
+                        $this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
     	                $pageposafter = $pdf->getPage();
     	                if ($pageposafter > $pageposbefore)	// There is a pagebreak
     	                {
     	                    $pdf->rollbackTransaction(true);
     	                    $pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
-    	                    pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->getColumnContentWidth('desc'), 3, $this->getColumnContentXStart('desc'), $curY, $hideref, $hidedesc);
-                            $posYAfterDescription = $pdf->GetY();
-                            $params = array(
-                                'display'         => 'list',
-                                'printableEnable' => array(3),
-                                'printableEnableNotEmpty' => array(4)
-                            );
-                            $extrafieldDesc = $this->getExtrafieldsInHtml($object->lines[$i], $outputlangs, $params);
-                            if(!empty($extrafieldDesc)){
-                                $this->printStdColumnContent($pdf, $posYAfterDescription, 'desc', $extrafieldDesc);
-                            }
+
+                            $this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
 
     	                    $pageposafter = $pdf->getPage();
     	                    $posyafter = $pdf->GetY();
@@ -695,7 +673,6 @@ class pdf_sponge extends ModelePDFFactures
     	                {
     	                    $pdf->commitTransaction();
     	                }
-    	                $posYAfterDescription = $pdf->GetY();
 	                }
 
                     $nexY = $pdf->GetY();
@@ -848,12 +825,10 @@ class pdf_sponge extends ModelePDFFactures
                         $pdf->setPage($pageposafter);
                         $pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
                         //$pdf->SetDrawColor(190,190,200);
-                        $pdf->line($this->marge_gauche, $nexY + 1, $this->page_largeur - $this->marge_droite, $nexY + 1);
+                        $pdf->line($this->marge_gauche, $nexY, $this->page_largeur - $this->marge_droite, $nexY);
                         $pdf->SetLineStyle(array('dash'=>0));
                     }
 
-                    $nexY += 2; // Add space between lines
-
                     // Detect if some page were added automatically and output _tableau for past pages
                     while ($pagenb < $pageposafter) {
                         $pdf->setPage($pagenb);
@@ -2242,7 +2217,7 @@ class pdf_sponge extends ModelePDFFactures
 	    // Default field style for content
 	    $this->defaultContentsFieldsStyle = array(
 	        'align' => 'R', // R,C,L
-	        'padding' => array(0.5, 1, 0.5, 1), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+	        'padding' => array(1, 0.5, 1, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 	    );
 
 	    // Default field style for content
@@ -2279,10 +2254,11 @@ class pdf_sponge extends ModelePDFFactures
 	            'align' => 'L',
 	            // 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
 	            // 'label' => ' ', // the final label
-	            'padding' => array(0.5, 1, 0.5, 1), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+	            'padding' => array(0.5, 0.5, 0.5, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 	        ),
 	        'content' => array(
 	            'align' => 'L',
+                'padding' => array(1, 0.5, 1, 1.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 	        ),
 	    );
 
@@ -2429,4 +2405,5 @@ class pdf_sponge extends ModelePDFFactures
 	        $this->cols = $hookmanager->resArray;
 	    }
 	}
+
 }

From 6de74e774ec0d4af6ae43e2812448941553f2d6f Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 24 Feb 2020 19:50:07 +0000
Subject: [PATCH 12/18] Fixing style errors.

---
 htdocs/core/class/commondocgenerator.class.php         | 3 ++-
 htdocs/core/modules/facture/doc/pdf_sponge.modules.php | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 048c70e7f68..886e0a6df26 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -1121,7 +1121,8 @@ abstract class CommonDocGenerator
      *  @param $hidedesc
      *  @param $issupplierline
      */
-    function printColDescContent($pdf, &$curY, $colKey, $object, $i, $outputlangs, $hideref = 0, $hidedesc = 0, $issupplierline = 0){
+    function printColDescContent($pdf, &$curY, $colKey, $object, $i, $outputlangs, $hideref = 0, $hidedesc = 0, $issupplierline = 0)
+	{
         // load desc col params
         $colDef = $this->cols[$colKey];
         // save curent cell padding
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 224f3522382..b47fc724c63 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -2405,5 +2405,4 @@ class pdf_sponge extends ModelePDFFactures
 	        $this->cols = $hookmanager->resArray;
 	    }
 	}
-
 }

From 7f2dd19bb07621f975d60b108d4d3a5096f24470 Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Mon, 24 Feb 2020 21:43:33 +0100
Subject: [PATCH 13/18] Fix pdf cell padding for model cyan, erathosthene,
 espadon, cornas

---
 .../core/class/commondocgenerator.class.php   |  7 +--
 .../commande/doc/pdf_eratosthene.modules.php  | 32 ++++---------
 .../expedition/doc/pdf_espadon.modules.php    | 44 +++---------------
 .../facture/doc/pdf_sponge.modules.php        |  6 +--
 .../modules/propale/doc/pdf_cyan.modules.php  | 46 +++++--------------
 .../supplier_order/doc/pdf_cornas.modules.php | 43 +++--------------
 6 files changed, 39 insertions(+), 139 deletions(-)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 886e0a6df26..d1334a5cf03 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -1112,16 +1112,17 @@ abstract class CommonDocGenerator
      *  print standard column content
      *
      *  @param	TCPDF		$pdf    	pdf object
-     *  @param  object      $object CommonObject
+     *  @param	float		$curY    	curent Y position
      *  @param	string		$colKey    	the column key
+     *  @param  object      $object CommonObject
      *  @param  $i
      *  @param  $outputlangs
-     *  @param	float		$curY    	curent Y position
      *  @param $hideref
      *  @param $hidedesc
      *  @param $issupplierline
+     *  @return null
      */
-    function printColDescContent($pdf, &$curY, $colKey, $object, $i, $outputlangs, $hideref = 0, $hidedesc = 0, $issupplierline = 0)
+    public function printColDescContent($pdf, &$curY, $colKey, $object, $i, $outputlangs, $hideref = 0, $hidedesc = 0, $issupplierline = 0)
 	{
         // load desc col params
         $colDef = $this->cols[$colKey];
diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index 69bb0be2529..e83e164d076 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -546,9 +546,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 				$this->pdfTabTitles($pdf, $tab_top, $tab_height, $outputlangs, $hidetop);
 				$pdf->rollbackTransaction(true);
 
-				$iniY = $tab_top + $this->tabTitleHeight + 2;
-				$curY = $tab_top + $this->tabTitleHeight + 2;
-				$nexY = $tab_top + $this->tabTitleHeight + 2;
+				$nexY = $tab_top + $this->tabTitleHeight;
 
 				// Loop on each lines
 				$pageposbeforeprintlines = $pdf->getPage();
@@ -567,12 +565,9 @@ class pdf_eratosthene extends ModelePDFCommandes
 					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
 					$pageposbefore = $pdf->getPage();
 
-					// Description of product line
-					$curX = $this->posxdesc - 1;
 
 					$showpricebeforepagebreak = 1;
 					$posYAfterImage = 0;
-					$posYAfterDescription = 0;
 
 					if ($this->getColumnStatus('photo'))
 					{
@@ -603,19 +598,8 @@ class pdf_eratosthene extends ModelePDFCommandes
 					if ($this->getColumnStatus('desc'))
 					{
     					$pdf->startTransaction();
-    					pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->getColumnContentWidth('desc'), 3, $this->getColumnContentXStart('desc'), $curY, $hideref, $hidedesc);
-                        $posYAfterDescription = $pdf->GetY();
 
-                        // Display extrafield if needed
-                        $params = array(
-                            'display'         => 'list',
-                            'printableEnable' => array(3),
-                            'printableEnableNotEmpty' => array(4)
-                        );
-                        $extrafieldDesc = $this->getExtrafieldsInHtml($object->lines[$i], $outputlangs, $params);
-                        if(!empty($extrafieldDesc)){
-                            $this->printStdColumnContent($pdf, $posYAfterDescription, 'desc', $extrafieldDesc);
-                        }
+                        $this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
 
                         $pageposafter = $pdf->getPage();
     					if ($pageposafter > $pageposbefore)	// There is a pagebreak
@@ -624,7 +608,8 @@ class pdf_eratosthene extends ModelePDFCommandes
     						$pageposafter = $pageposbefore;
     						//print $pageposafter.'-'.$pageposbefore;exit;
     						$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
-    						pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->getColumnContentWidth('desc'), 3, $this->getColumnContentXStart('desc'), $curY, $hideref, $hidedesc);
+
+                            $this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
     						$pageposafter = $pdf->getPage();
     						$posyafter = $pdf->GetY();
     						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text
@@ -651,7 +636,6 @@ class pdf_eratosthene extends ModelePDFCommandes
     					{
     						$pdf->commitTransaction();
     					}
-    					$posYAfterDescription = $pdf->GetY();
 					}
 
 
@@ -788,11 +772,10 @@ class pdf_eratosthene extends ModelePDFCommandes
 						$pdf->setPage($pageposafter);
 						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
-						$pdf->line($this->marge_gauche, $nexY + 1, $this->page_largeur - $this->marge_droite, $nexY + 1);
+						$pdf->line($this->marge_gauche, $nexY, $this->page_largeur - $this->marge_droite, $nexY);
 						$pdf->SetLineStyle(array('dash'=>0));
 					}
 
-					$nexY += 2; // Add space between lines
 
 					// Detect if some page were added automatically and output _tableau for past pages
 					while ($pagenb < $pageposafter)
@@ -1704,7 +1687,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 	    // Default field style for content
 	    $this->defaultContentsFieldsStyle = array(
 	        'align' => 'R', // R,C,L
-	        'padding' => array(0.5, 1, 0.5, 1), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+            'padding' => array(1, 0.5, 1, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 	    );
 
 	    // Default field style for content
@@ -1741,10 +1724,11 @@ class pdf_eratosthene extends ModelePDFCommandes
 	            'align' => 'L',
 	            // 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
 	            // 'label' => ' ', // the final label
-	            'padding' => array(0.5, 1, 0.5, 1), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+                'padding' => array(0.5, 1, 0.5, 1.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 	        ),
 	        'content' => array(
 	            'align' => 'L',
+                'padding' => array(1, 0.5, 1, 1.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 	        ),
 	    );
 
diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index 7843eb6e087..6268f84d127 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -418,9 +418,7 @@ class pdf_espadon extends ModelePdfExpedition
 				$pdf->rollbackTransaction(true);
 
 
-				$iniY = $tab_top + $this->tabTitleHeight + 2;
-				$curY = $tab_top + $this->tabTitleHeight + 2;
-				$nexY = $tab_top + $this->tabTitleHeight + 2;
+				$nexY = $tab_top + $this->tabTitleHeight;
 
 				// Loop on each lines
 				for ($i = 0; $i < $nblines; $i++)
@@ -473,40 +471,15 @@ class pdf_espadon extends ModelePdfExpedition
 					if ($this->getColumnStatus('desc'))
 					{
 					    $pdf->startTransaction();
-					    pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->getColumnContentWidth('desc'), 3, $this->getColumnContentXStart('desc'), $curY, $hideref, $hidedesc);
-                        $posYAfterDescription = $pdf->GetY();
 
-                        // Display extrafield if needed
-                        $params = array(
-                            'display'         => 'list',
-                            'printableEnable' => array(3),
-                            'printableEnableNotEmpty' => array(4)
-                        );
-                        $extrafieldDesc = $this->getExtrafieldsInHtml($object->lines[$i], $outputlangs, $params);
-                        if(!empty($extrafieldDesc)){
-                            $this->printStdColumnContent($pdf, $posYAfterDescription, 'desc', $extrafieldDesc);
-                        }
+                        $this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
 
                         $pageposafter = $pdf->getPage();
 					    if ($pageposafter > $pageposbefore)	// There is a pagebreak
 					    {
 					        $pdf->rollbackTransaction(true);
-					        $pageposafter = $pageposbefore;
-					        //print $pageposafter.'-'.$pageposbefore;exit;
-					        $pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
-					        pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->getColumnContentWidth('desc'), 3, $this->getColumnContentXStart('desc'), $curY, $hideref, $hidedesc);
-					        $posYAfterDescription = $pdf->GetY();
 
-                            // Display extrafield if needed
-                            $params = array(
-                                'display'         => 'list',
-                                'printableEnable' => array(3),
-                                'printableEnableNotEmpty' => array(4)
-                            );
-                            $extrafieldDesc = $this->getExtrafieldsInHtml($object->lines[$i], $outputlangs, $params);
-                            if(!empty($extrafieldDesc)){
-                                $this->printStdColumnContent($pdf, $posYAfterDescription, 'desc', $extrafieldDesc);
-                            }
+                            $this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
 
 					        $pageposafter = $pdf->getPage();
 					        $posyafter = $pdf->GetY();
@@ -607,16 +580,13 @@ class pdf_espadon extends ModelePdfExpedition
                         }
                     }
 
-					$nexY += 3;
-					if ($weighttxt && $voltxt) $nexY += 2;
-
 					// Add line
 					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
 					{
 						$pdf->setPage($pageposafter);
 						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
-						$pdf->line($this->marge_gauche, $nexY - 1, $this->page_largeur - $this->marge_droite, $nexY - 1);
+						$pdf->line($this->marge_gauche, $nexY, $this->page_largeur - $this->marge_droite, $nexY);
 						$pdf->SetLineStyle(array('dash'=>0));
 					}
 
@@ -1146,7 +1116,7 @@ class pdf_espadon extends ModelePdfExpedition
 	    // Default field style for content
 	    $this->defaultContentsFieldsStyle = array(
 	        'align' => 'R', // R,C,L
-	        'padding' => array(0.5, 1, 0.5, 1), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+            'padding' => array(1, 0.5, 1, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 	    );
 
 	    // Default field style for content
@@ -1183,10 +1153,10 @@ class pdf_espadon extends ModelePdfExpedition
 	            'align' => 'L',
 	            // 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
 	            // 'label' => ' ', // the final label
-	            'padding' => array(0.5, 1, 0.5, 1), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+                'padding' => array(0.5, 1, 0.5, 1.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 	        ),
 	        'content' => array(
-	            'align' => 'L',
+                'padding' => array(1, 0.5, 1, 1.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 	        ),
 	    );
 
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index b47fc724c63..09acbbda46a 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -582,9 +582,7 @@ class pdf_sponge extends ModelePDFFactures
 			    $this->pdfTabTitles($pdf, $tab_top, $tab_height, $outputlangs, $hidetop);
 			    $pdf->rollbackTransaction(true);
 
-			    $iniY = $tab_top + $this->tabTitleHeight + 2;
-			    $curY = $tab_top + $this->tabTitleHeight + 2;
-			    $nexY = $tab_top + $this->tabTitleHeight + 0;
+			    $nexY = $tab_top + $this->tabTitleHeight;
 
 	            // Loop on each lines
 	            $pageposbeforeprintlines = $pdf->getPage();
@@ -605,7 +603,6 @@ class pdf_sponge extends ModelePDFFactures
 
 	                $showpricebeforepagebreak = 1;
 	                $posYAfterImage = 0;
-	                $posYAfterDescription = 0;
 
 	                if ($this->getColumnStatus('photo'))
 	                {
@@ -640,6 +637,7 @@ class pdf_sponge extends ModelePDFFactures
 
                         $this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
     	                $pageposafter = $pdf->getPage();
+
     	                if ($pageposafter > $pageposbefore)	// There is a pagebreak
     	                {
     	                    $pdf->rollbackTransaction(true);
diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index aaa64b266de..c45db2f8380 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -564,9 +564,7 @@ class pdf_cyan extends ModelePDFPropales
 				$this->pdfTabTitles($pdf, $tab_top, $tab_height, $outputlangs, $hidetop);
 				$pdf->rollbackTransaction(true);
 
-				$iniY = $tab_top + $this->tabTitleHeight + 2;
-				$curY = $tab_top + $this->tabTitleHeight + 2;
-				$nexY = $tab_top + $this->tabTitleHeight + 2;
+				$nexY = $tab_top + $this->tabTitleHeight;
 
 				// Loop on each lines
 				$pageposbeforeprintlines = $pdf->getPage();
@@ -621,40 +619,17 @@ class pdf_cyan extends ModelePDFPropales
 					if ($this->getColumnStatus('desc'))
 					{
     					$pdf->startTransaction();
-    					pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->getColumnContentWidth('desc'), 3, $this->getColumnContentXStart('desc'), $curY, $hideref, $hidedesc);
-                        $posYAfterDescription = $pdf->GetY();
-
-                        // Display extrafield if needed
-                        $params = array(
-                            'display'         => 'list',
-                            'printableEnable' => array(3),
-                            'printableEnableNotEmpty' => array(4)
-                        );
-                        $extrafieldDesc = $this->getExtrafieldsInHtml($object->lines[$i], $outputlangs, $params);
-                        if(!empty($extrafieldDesc)){
-                            $this->printStdColumnContent($pdf, $posYAfterDescription, 'desc', $extrafieldDesc);
-                        }
 
+                        $this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
     					$pageposafter = $pdf->getPage();
+
     					if ($pageposafter > $pageposbefore)	// There is a pagebreak
     					{
     						$pdf->rollbackTransaction(true);
-    						$pageposafter = $pageposbefore;
-    						//print $pageposafter.'-'.$pageposbefore;exit;
-    						$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
-    						pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->getColumnContentWidth('desc'), 3, $this->getColumnContentXStart('desc'), $curY, $hideref, $hidedesc);
-                            $posYAfterDescription = $pdf->GetY();
 
-                            // Display extrafield if needed
-                            $params = array(
-                                'display'         => 'list',
-                                'printableEnable' => array(3),
-                                'printableEnableNotEmpty' => array(4)
-                            );
-                            $extrafieldDesc = $this->getExtrafieldsInHtml($object->lines[$i], $outputlangs, $params);
-                            if(!empty($extrafieldDesc)){
-                                $this->printStdColumnContent($pdf, $posYAfterDescription, 'desc', $extrafieldDesc);
-                            }
+    						$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+
+                            $this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
 
     						$pageposafter = $pdf->getPage();
     						$posyafter = $pdf->GetY();
@@ -819,11 +794,11 @@ class pdf_cyan extends ModelePDFPropales
 						$pdf->setPage($pageposafter);
 						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
-						$pdf->line($this->marge_gauche, $nexY + 1, $this->page_largeur - $this->marge_droite, $nexY + 1);
+						$pdf->line($this->marge_gauche, $nexY, $this->page_largeur - $this->marge_droite, $nexY);
 						$pdf->SetLineStyle(array('dash'=>0));
 					}
 
-					$nexY += 2; // Add space between lines
+
 
 					// Detect if some page were added automatically and output _tableau for past pages
 					while ($pagenb < $pageposafter)
@@ -1865,7 +1840,7 @@ class pdf_cyan extends ModelePDFPropales
 	    // Default field style for content
 	    $this->defaultContentsFieldsStyle = array(
 	        'align' => 'R', // R,C,L
-	        'padding' => array(0.5, 1, 0.5, 1), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+	        'padding' => array(1, 0.5, 1, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 	    );
 
 	    // Default field style for content
@@ -1902,10 +1877,11 @@ class pdf_cyan extends ModelePDFPropales
 	            'align' => 'L',
 	            // 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
 	            // 'label' => ' ', // the final label
-	            'padding' => array(0.5, 1, 0.5, 1), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+	            'padding' => array(0.5, 1, 0.5, 1.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 	        ),
 	        'content' => array(
 	            'align' => 'L',
+                'padding' => array(1, 0.5, 1, 1.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 	        ),
 	    );
 
diff --git a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
index e454e29835c..2d3c766a7c2 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -496,9 +496,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				    $height_note = 0;
 				}
 
-				$iniY = $tab_top + 7;
-				$curY = $tab_top + 7;
-				$nexY = $tab_top + 7;
+				$nexY = $tab_top + 5;
 
 				// Use new auto collum system
 				$this->prepareArrayColumnField($object, $outputlangs, $hidedetails, $hidedesc, $hideref);
@@ -555,40 +553,14 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 					if ($this->getColumnStatus('desc'))
 					{
 					    $pdf->startTransaction();
-					    pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->getColumnContentWidth('desc'), 3, $this->getColumnContentXStart('desc'), $curY, $hideref, $hidedesc);
-                        $posYAfterDescription = $pdf->GetY();
-
-                        // Display extrafield if needed
-                        $params = array(
-                            'display'         => 'list',
-                            'printableEnable' => array(3),
-                            'printableEnableNotEmpty' => array(4)
-                        );
-                        $extrafieldDesc = $this->getExtrafieldsInHtml($object->lines[$i], $outputlangs, $params);
-                        if(!empty($extrafieldDesc)){
-                            $this->printStdColumnContent($pdf, $posYAfterDescription, 'desc', $extrafieldDesc);
-                        }
+                        $this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc, 1);
 
 					    $pageposafter = $pdf->getPage();
 					    if ($pageposafter > $pageposbefore)	// There is a pagebreak
 					    {
 					        $pdf->rollbackTransaction(true);
-					        $pageposafter = $pageposbefore;
-					        //print $pageposafter.'-'.$pageposbefore;exit;
-					        $pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
-					        pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->getColumnContentWidth('desc'), 3, $this->getColumnContentXStart('desc'), $curY, $hideref, $hidedesc);
-                            $posYAfterDescription = $pdf->GetY();
 
-                            // Display extrafield if needed
-                            $params = array(
-                                'display'         => 'list',
-                                'printableEnable' => array(3),
-                                'printableEnableNotEmpty' => array(4)
-                            );
-                            $extrafieldDesc = $this->getExtrafieldsInHtml($object->lines[$i], $outputlangs, $params);
-                            if(!empty($extrafieldDesc)){
-                                $this->printStdColumnContent($pdf, $posYAfterDescription, 'desc', $extrafieldDesc);
-                            }
+                            $this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc, 1);
 
 					        $pageposafter = $pdf->getPage();
 					        $posyafter = $pdf->GetY();
@@ -750,12 +722,10 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 						$pdf->setPage($pageposafter);
 						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
-						$pdf->line($this->marge_gauche, $nexY + 1, $this->page_largeur - $this->marge_droite, $nexY + 1);
+						$pdf->line($this->marge_gauche, $nexY, $this->page_largeur - $this->marge_droite, $nexY);
 						$pdf->SetLineStyle(array('dash'=>0));
 					}
 
-					$nexY += 2; // Add space between lines
-
 					// Detect if some page were added automatically and output _tableau for past pages
 					while ($pagenb < $pageposafter)
 					{
@@ -1509,7 +1479,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 	    // Default field style for content
 	    $this->defaultContentsFieldsStyle = array(
 	        'align' => 'R', // R,C,L
-	        'padding' => array(0.5, 1, 0.5, 1), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+            'padding' => array(1, 0.5, 1, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 	    );
 
 	    // Default field style for content
@@ -1546,10 +1516,11 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 	            'align' => 'L',
 	            // 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
 	            // 'label' => ' ', // the final label
-	            'padding' => array(0.5, 1, 0.5, 1), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+                'padding' => array(0.5, 1, 0.5, 1.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 	        ),
 	        'content' => array(
 	            'align' => 'L',
+                'padding' => array(1, 0.5, 1, 1.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 	        ),
 	    );
 

From ae890d021c60d43169bc1abda18155615bd9b01e Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Mon, 24 Feb 2020 21:50:01 +0100
Subject: [PATCH 14/18] Fix comments

---
 htdocs/core/class/commondocgenerator.class.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index d1334a5cf03..bf1fabb7d19 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -1109,17 +1109,17 @@ abstract class CommonDocGenerator
 
 
     /**
-     *  print standard column content
+     *  print description column content
      *
      *  @param	TCPDF		$pdf    	pdf object
      *  @param	float		$curY    	curent Y position
      *  @param	string		$colKey    	the column key
      *  @param  object      $object CommonObject
-     *  @param  $i
-     *  @param  $outputlangs
-     *  @param $hideref
-     *  @param $hidedesc
-     *  @param $issupplierline
+     *  @param  int $i
+     *  @param  Translate $outputlangs    Output language
+     *  @param  int $hideref hide ref
+     *  @param  int $hidedesc hide desc
+     *  @param  int $issupplierline if object need supplier product
      *  @return null
      */
     public function printColDescContent($pdf, &$curY, $colKey, $object, $i, $outputlangs, $hideref = 0, $hidedesc = 0, $issupplierline = 0)

From 3e492b8a5bbf1c5aede1cc33149c64932914442d Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Mon, 24 Feb 2020 22:08:04 +0100
Subject: [PATCH 15/18] Fix title padding

---
 .../core/class/commondocgenerator.class.php   | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index bf1fabb7d19..7f56832ece8 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -1400,7 +1400,7 @@ abstract class CommonDocGenerator
     /**
      * Print standard column content
      *
-     * @param PDF	    $pdf            Pdf object
+     * @param TCPDI	    $pdf            Pdf object
      * @param float     $tab_top        Tab top position
      * @param float     $tab_height     Default tab height
      * @param Translate $outputlangs    Output language
@@ -1436,18 +1436,27 @@ abstract class CommonDocGenerator
                 }
 
                 if (empty($hidetop)) {
-                    $pdf->SetXY($colDef['xStartPos'] + $colDef['title']['padding'][3], $tab_top + $colDef['title']['padding'][0]);
-                    $textWidth = $colDef['width'] - $colDef['title']['padding'][3] - $colDef['title']['padding'][1];
+
+                    // save curent cell padding
+                    $curentCellPaddinds = $pdf->getCellPaddings();
+                    // set cell padding with column content definition
+                    $pdf->setCellPaddings($colDef['content']['padding'][3], $colDef['content']['padding'][0], $colDef['content']['padding'][1], $colDef['content']['padding'][2]);
+
+                    $pdf->SetXY($colDef['xStartPos'], $tab_top);
+                    $textWidth = $colDef['width'];
                     $pdf->MultiCell($textWidth, 2, $colDef['title']['label'], '', $colDef['title']['align']);
 
                     global $outputlangsbis;
                     if (is_object($outputlangsbis)) {
-                    	$pdf->SetXY($colDef['xStartPos'] + $colDef['title']['padding'][3], $tab_top + $colDef['title']['padding'][0] + 4);
+                    	$pdf->SetXY($colDef['xStartPos'], $pdf->GetY() - $colDef['content']['padding'][0]);
                     	$textbis = $outputlangsbis->transnoentities($colDef['title']['textkey']);
                     	$pdf->MultiCell($textWidth, 2, $textbis, '', $colDef['title']['align']);
                     }
 
-                    $this->tabTitleHeight = max($pdf->GetY() - $tab_top + $colDef['title']['padding'][2], $this->tabTitleHeight);
+                    $this->tabTitleHeight = max($pdf->GetY() - $tab_top, $this->tabTitleHeight);
+
+                    // restore cell padding
+                    $pdf->setCellPaddings($curentCellPaddinds['L'], $curentCellPaddinds['T'], $curentCellPaddinds['R'], $curentCellPaddinds['B']);
                 }
             }
         }

From 5a77716b93b3ac55e0aa102ef68cbe76c7bcd5d1 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 24 Feb 2020 21:10:14 +0000
Subject: [PATCH 16/18] Fixing style errors.

---
 htdocs/core/class/commondocgenerator.class.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 7f56832ece8..4c256537609 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -1436,7 +1436,6 @@ abstract class CommonDocGenerator
                 }
 
                 if (empty($hidetop)) {
-
                     // save curent cell padding
                     $curentCellPaddinds = $pdf->getCellPaddings();
                     // set cell padding with column content definition

From 9c1fdf1c5273ed03f91bbc96db46af5d35d38cfd Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Mon, 24 Feb 2020 22:12:36 +0100
Subject: [PATCH 17/18] Fix missing php doc

---
 htdocs/core/class/commondocgenerator.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 7f56832ece8..932edd92901 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -1115,7 +1115,7 @@ abstract class CommonDocGenerator
      *  @param	float		$curY    	curent Y position
      *  @param	string		$colKey    	the column key
      *  @param  object      $object CommonObject
-     *  @param  int $i
+     *  @param  int         $i  the $object->lines array key
      *  @param  Translate $outputlangs    Output language
      *  @param  int $hideref hide ref
      *  @param  int $hidedesc hide desc

From c216b7cae5c2fdcf89a27db33971f988c0610b40 Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Mon, 24 Feb 2020 22:34:34 +0100
Subject: [PATCH 18/18] fix title padding definition source

---
 htdocs/core/class/commondocgenerator.class.php | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index f1065e170a8..6b82f3f11c1 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -1438,16 +1438,25 @@ abstract class CommonDocGenerator
                 if (empty($hidetop)) {
                     // save curent cell padding
                     $curentCellPaddinds = $pdf->getCellPaddings();
-                    // set cell padding with column content definition
-                    $pdf->setCellPaddings($colDef['content']['padding'][3], $colDef['content']['padding'][0], $colDef['content']['padding'][1], $colDef['content']['padding'][2]);
+
+                    global $outputlangsbis;
+                    if (is_object($outputlangsbis)) {
+                        // set cell padding with column title definition
+                        $pdf->setCellPaddings($colDef['title']['padding'][3], $colDef['title']['padding'][0], $colDef['title']['padding'][1], 0.5);
+                    }
+                    else{
+                        // set cell padding with column title definition
+                        $pdf->setCellPaddings($colDef['title']['padding'][3], $colDef['title']['padding'][0], $colDef['title']['padding'][1], $colDef['title']['padding'][2]);
+                    }
 
                     $pdf->SetXY($colDef['xStartPos'], $tab_top);
                     $textWidth = $colDef['width'];
                     $pdf->MultiCell($textWidth, 2, $colDef['title']['label'], '', $colDef['title']['align']);
 
-                    global $outputlangsbis;
+
                     if (is_object($outputlangsbis)) {
-                    	$pdf->SetXY($colDef['xStartPos'], $pdf->GetY() - $colDef['content']['padding'][0]);
+                        $pdf->setCellPaddings($colDef['title']['padding'][3], 0, $colDef['title']['padding'][1], $colDef['title']['padding'][2]);
+                    	$pdf->SetXY($colDef['xStartPos'], $pdf->GetY());
                     	$textbis = $outputlangsbis->transnoentities($colDef['title']['textkey']);
                     	$pdf->MultiCell($textWidth, 2, $textbis, '', $colDef['title']['align']);
                     }