Merge pull request #13005 from RubenRuCh/11.0

FIX: #11975 When a product is split between multiple pages in a document, prices/quantity/etc appear on the last relevant page

htdocs/core/modules/commande/doc/pdf_einstein.modules.php

@@ -440,6 +440,11 @@ class pdf_einstein extends ModelePDFCommandes
 						else
 						{
 							// We found a page break
+
+							// Allows data in the first page if description is long enough to break in multiples pages
+							if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+								$showpricebeforepagebreak = 1;
+							else
 								$showpricebeforepagebreak = 0;
 						}
 					}

htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php

@@ -572,6 +572,11 @@ class pdf_eratosthene extends ModelePDFCommandes
 					        $pdf->setPage($pageposbefore+1);
 
 					        $curY = $tab_top_newpage;
+
+							// Allows data in the first page if description is long enough to break in multiples pages
+							if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+								$showpricebeforepagebreak = 1;
+							else
 								$showpricebeforepagebreak = 0;
 					    }
 
@@ -610,6 +615,11 @@ class pdf_eratosthene extends ModelePDFCommandes
     						else
     						{
     							// We found a page break
+
+								// Allows data in the first page if description is long enough to break in multiples pages
+								if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+									$showpricebeforepagebreak = 1;
+								else
 									$showpricebeforepagebreak = 0;
     						}
     					}

htdocs/core/modules/contract/doc/pdf_strato.modules.php

@@ -391,6 +391,11 @@ class pdf_strato extends ModelePDFContract
 							else
 							{
 								// We found a page break
+
+								// Allows data in the first page if description is long enough to break in multiples pages
+								if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+									$showpricebeforepagebreak = 1;
+								else
 									$showpricebeforepagebreak = 0;
 							}
 						}

htdocs/core/modules/expedition/doc/pdf_espadon.modules.php

@@ -433,6 +433,11 @@ class pdf_espadon extends ModelePdfExpedition
 					        $pdf->setPage($pageposbefore+1);
 
 					        $curY = $tab_top_newpage;
+
+							// Allows data in the first page if description is long enough to break in multiples pages
+							if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+								$showpricebeforepagebreak = 1;
+							else
 								$showpricebeforepagebreak = 0;
 					    }
 
@@ -475,6 +480,11 @@ class pdf_espadon extends ModelePdfExpedition
 					        else
 					        {
 					            // We found a page break
+
+								// Allows data in the first page if description is long enough to break in multiples pages
+								if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+									$showpricebeforepagebreak = 1;
+								else
 									$showpricebeforepagebreak = 0;
 					        }
 					    }

htdocs/core/modules/expedition/doc/pdf_rouget.modules.php

@@ -452,6 +452,11 @@ class pdf_rouget extends ModelePdfExpedition
 						$pdf->setPage($pageposbefore + 1);
 
 						$curY = $tab_top_newpage;
+
+						// Allows data in the first page if description is long enough to break in multiples pages
+						if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+							$showpricebeforepagebreak = 1;
+						else
 							$showpricebeforepagebreak = 0;
 					}
 
@@ -494,6 +499,11 @@ class pdf_rouget extends ModelePdfExpedition
 						else
 						{
 							// We found a page break
+
+							// Allows data in the first page if description is long enough to break in multiples pages
+							if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+								$showpricebeforepagebreak = 1;
+							else
 								$showpricebeforepagebreak = 0;
 						}
 					}

htdocs/core/modules/expensereport/doc/pdf_standard.modules.php

@@ -385,6 +385,11 @@ class pdf_standard extends ModeleExpenseReport
 						else
 						{
 							// We found a page break
+
+							// Allows data in the first page if description is long enough to break in multiples pages
+							if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+								$showpricebeforepagebreak = 1;
+							else
 								$showpricebeforepagebreak = 0;
 						}
 					}

htdocs/core/modules/facture/doc/pdf_crabe.modules.php

@@ -494,6 +494,11 @@ class pdf_crabe extends ModelePDFFactures
 						$pdf->setPage($pageposbefore + 1);
 
 						$curY = $tab_top_newpage;
+
+						// Allows data in the first page if description is long enough to break in multiples pages
+						if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+							$showpricebeforepagebreak = 1;
+						else
 							$showpricebeforepagebreak = 0;
 					}
 
@@ -534,6 +539,11 @@ class pdf_crabe extends ModelePDFFactures
 						else
 						{
 							// We found a page break
+
+							// Allows data in the first page if description is long enough to break in multiples pages
+							if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+								$showpricebeforepagebreak = 1;
+							else
 								$showpricebeforepagebreak = 0;
 						}
 					}

htdocs/core/modules/facture/doc/pdf_sponge.modules.php

@@ -600,6 +600,11 @@ class pdf_sponge extends ModelePDFFactures
     	                    $pdf->setPage($pageposbefore+1);
 
     	                    $curY = $tab_top_newpage;
+
+							// Allows data in the first page if description is long enough to break in multiples pages
+							if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+								$showpricebeforepagebreak = 1;
+							else
 								$showpricebeforepagebreak = 0;
     	                }
 
@@ -639,6 +644,11 @@ class pdf_sponge extends ModelePDFFactures
     	                    else
     	                    {
     	                        // We found a page break
+
+								// Allows data in the first page if description is long enough to break in multiples pages
+								if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+									$showpricebeforepagebreak = 1;
+								else
 									$showpricebeforepagebreak = 0;
     	                    }
     	                }

htdocs/core/modules/livraison/doc/pdf_typhon.modules.php

@@ -409,6 +409,11 @@ class pdf_typhon extends ModelePDFDeliveryOrder
                     	else
                     	{
                     		// We found a page break
+
+							// Allows data in the first page if description is long enough to break in multiples pages
+							if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+								$showpricebeforepagebreak = 1;
+							else
 								$showpricebeforepagebreak = 0;
                     	}
                     }

htdocs/core/modules/project/doc/pdf_baleine.modules.php

@@ -362,7 +362,13 @@ class pdf_baleine extends ModelePDFProjects
 						else
 						{
 							// We found a page break
+
+							// Allows data in the first page if description is long enough to break in multiples pages
+							if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+								$showpricebeforepagebreak = 1;
+							else
 								$showpricebeforepagebreak = 0;
+
 							$forcedesconsamepage=1;
 							if ($forcedesconsamepage)
 							{

htdocs/core/modules/project/doc/pdf_beluga.modules.php

@@ -512,7 +512,13 @@ class pdf_beluga extends ModelePDFProjects
 						            else
 						            {
 							            // We found a page break
+
+										// Allows data in the first page if description is long enough to break in multiples pages
+										if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+											$showpricebeforepagebreak = 1;
+										else
 											$showpricebeforepagebreak = 0;
+
 							            $forcedesconsamepage=1;
 							            if ($forcedesconsamepage)
 							            {

htdocs/core/modules/project/doc/pdf_timespent.modules.php

@@ -293,7 +293,13 @@ class pdf_timespent extends ModelePDFProjects
 						else
 						{
 							// We found a page break
+
+							// Allows data in the first page if description is long enough to break in multiples pages
+							if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+								$showpricebeforepagebreak = 1;
+							else
 								$showpricebeforepagebreak = 0;
+
 							$forcedesconsamepage=1;
 							if ($forcedesconsamepage)
 							{

htdocs/core/modules/propale/doc/pdf_azur.modules.php

@@ -502,6 +502,11 @@ class pdf_azur extends ModelePDFPropales
 						$pdf->setPage($pageposbefore + 1);
 
 						$curY = $tab_top_newpage;
+
+						// Allows data in the first page if description is long enough to break in multiples pages
+						if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+							$showpricebeforepagebreak = 1;
+						else
 							$showpricebeforepagebreak = 0;
 					}
 
@@ -543,6 +548,11 @@ class pdf_azur extends ModelePDFPropales
 						else
 						{
 							// We found a page break
+
+							// Allows data in the first page if description is long enough to break in multiples pages
+							if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+								$showpricebeforepagebreak = 1;
+							else
 								$showpricebeforepagebreak = 0;
 						}
 					}

htdocs/core/modules/propale/doc/pdf_cyan.modules.php

@@ -582,6 +582,11 @@ class pdf_cyan extends ModelePDFPropales
     						$pdf->setPage($pageposbefore+1);
 
     						$curY = $tab_top_newpage;
+
+							// Allows data in the first page if description is long enough to break in multiples pages
+							if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+								$showpricebeforepagebreak = 1;
+							else
 								$showpricebeforepagebreak = 0;
     					}
 
@@ -624,6 +629,11 @@ class pdf_cyan extends ModelePDFPropales
     						else
     						{
     							// We found a page break
+
+								// Allows data in the first page if description is long enough to break in multiples pages
+								if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+									$showpricebeforepagebreak = 1;
+								else
 									$showpricebeforepagebreak = 0;
     						}
     					}

htdocs/core/modules/reception/doc/pdf_squille.modules.php

@@ -374,6 +374,11 @@ class pdf_squille extends ModelePdfReception
 						$pdf->setPage($pageposbefore + 1);
 
 						$curY = $tab_top_newpage;
+
+						// Allows data in the first page if description is long enough to break in multiples pages
+						if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+							$showpricebeforepagebreak = 1;
+						else
 							$showpricebeforepagebreak = 0;
 					}
 
@@ -417,6 +422,11 @@ class pdf_squille extends ModelePdfReception
 						else
 						{
 							// We found a page break
+
+							// Allows data in the first page if description is long enough to break in multiples pages
+							if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+								$showpricebeforepagebreak = 1;
+							else
 								$showpricebeforepagebreak = 0;
 						}
 					}

htdocs/core/modules/stock/doc/pdf_standard.modules.php

@@ -383,6 +383,11 @@ class pdf_standard extends ModelePDFStock
 							else
 							{
 								// We found a page break
+
+								// Allows data in the first page if description is long enough to break in multiples pages
+								if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+									$showpricebeforepagebreak = 1;
+								else
 									$showpricebeforepagebreak = 0;
 							}
 						}

htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php

@@ -543,6 +543,11 @@ class pdf_stdmovement extends ModelePDFMovement
 							else
 							{
 								// We found a page break
+
+								// Allows data in the first page if description is long enough to break in multiples pages
+								if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+									$showpricebeforepagebreak = 1;
+								else
 									$showpricebeforepagebreak = 0;
 							}
 						}

htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php

@@ -430,6 +430,11 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 						else
 						{
 							// We found a page break
+
+							// Allows data in the first page if description is long enough to break in multiples pages
+							if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+								$showpricebeforepagebreak = 1;
+							else
 								$showpricebeforepagebreak = 0;
 						}
 					}

htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php

@@ -523,6 +523,11 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 						$pdf->setPage($pageposbefore+1);
 
 						$curY = $tab_top_newpage;
+
+						// Allows data in the first page if description is long enough to break in multiples pages
+						if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+							$showpricebeforepagebreak = 1;
+						else
 							$showpricebeforepagebreak = 0;
 					}
 
@@ -564,6 +569,11 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 					        else
 					        {
 					            // We found a page break
+
+								// Allows data in the first page if description is long enough to break in multiples pages
+								if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+									$showpricebeforepagebreak = 1;
+								else
 									$showpricebeforepagebreak = 0;
 					        }
 					    }

htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php

@@ -445,6 +445,11 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 						$pdf->setPage($pageposbefore+1);
 
 						$curY = $tab_top_newpage;
+
+						// Allows data in the first page if description is long enough to break in multiples pages
+						if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+							$showpricebeforepagebreak = 1;
+						else
 							$showpricebeforepagebreak = 0;
 					}
 
@@ -492,6 +497,11 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 						else
 						{
 							// We found a page break
+
+							// Allows data in the first page if description is long enough to break in multiples pages
+							if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+								$showpricebeforepagebreak = 1;
+							else
 								$showpricebeforepagebreak = 0;
 						}
 					}

htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php

@@ -365,6 +365,11 @@ class pdf_standard extends ModelePDFSuppliersPayments
 						else
 						{
 							// We found a page break
+
+							// Allows data in the first page if description is long enough to break in multiples pages
+							if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+								$showpricebeforepagebreak = 1;
+							else
 								$showpricebeforepagebreak = 0;
 						}
 					}

htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php

@@ -430,6 +430,11 @@ class pdf_aurore extends ModelePDFSupplierProposal
 						$pdf->setPage($pageposbefore+1);
 
 						$curY = $tab_top_newpage;
+
+						// Allows data in the first page if description is long enough to break in multiples pages
+						if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+							$showpricebeforepagebreak = 1;
+						else
 							$showpricebeforepagebreak = 0;
 					}
 
@@ -480,6 +485,11 @@ class pdf_aurore extends ModelePDFSupplierProposal
 						else
 						{
 							// We found a page break
+
+							// Allows data in the first page if description is long enough to break in multiples pages
+							if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+								$showpricebeforepagebreak = 1;
+							else
 								$showpricebeforepagebreak = 0;
 						}
 					}

htdocs/langs/es_ES/zapier.lang

@@ -0,0 +1,28 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleZapierForDolibarrName'
+ModuleZapierForDolibarrName = Zapier para Dolibarr
+# Module description 'ModuleZapierForDolibarrDesc'
+ModuleZapierForDolibarrDesc = Zapier para el módulo Dolibarr
+
+#
+# Admin page
+#
+ZapierForDolibarrSetup = Configuración de Zapier para Dolibarr