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

Merge pull request #13005 from RubenRuCh/11.0

Browse Source 
FIX: #11975 When a product is split between multiple pages in a document, prices/quantity/etc appear on the last relevant page
This commit is contained in:
Laurent Destailleur 2020-02-05 14:30:40 +01:00 committed by GitHub
commit 9515467300
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 229 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
View File

@ -440,7 +440,12 @@ class pdf_einstein extends ModelePDFCommandes
else
{
// We found a page break
$showpricebeforepagebreak=0;
// 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;
}
}
else // No pagebreak

14
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
View File

@ -572,7 +572,12 @@ class pdf_eratosthene extends ModelePDFCommandes
$pdf->setPage($pageposbefore+1);
$curY = $tab_top_newpage;
$showpricebeforepagebreak=0;
// 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;
}
if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height']))
@ -610,7 +615,12 @@ class pdf_eratosthene extends ModelePDFCommandes
else
{
// We found a page break
$showpricebeforepagebreak=0;
// 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;
}
}
else // No pagebreak

7
htdocs/core/modules/contract/doc/pdf_strato.modules.php
View File

@ -391,7 +391,12 @@ class pdf_strato extends ModelePDFContract
else
{
// We found a page break
$showpricebeforepagebreak=0;
// 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;
}
}
else // No pagebreak

14
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
View File

@ -433,7 +433,12 @@ class pdf_espadon extends ModelePdfExpedition
$pdf->setPage($pageposbefore+1);
$curY = $tab_top_newpage;
$showpricebeforepagebreak=0;
// 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,7 +480,12 @@ class pdf_espadon extends ModelePdfExpedition
else
{
// We found a page break
$showpricebeforepagebreak=0;
// 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;
}
}
else // No pagebreak

14
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
View File

@ -452,7 +452,12 @@ class pdf_rouget extends ModelePdfExpedition
$pdf->setPage($pageposbefore + 1);
$curY = $tab_top_newpage;
$showpricebeforepagebreak = 0;
// 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;
}
if (isset($imglinesize['width']) && isset($imglinesize['height']))
@ -494,7 +499,12 @@ class pdf_rouget extends ModelePdfExpedition
else
{
// We found a page break
$showpricebeforepagebreak = 0;
// 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;
}
}
else // No pagebreak

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

@ -385,7 +385,12 @@ class pdf_standard extends ModeleExpenseReport
else
{
// We found a page break
$showpricebeforepagebreak=0;
// 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;
}
}
else // No pagebreak

14
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
View File

@ -494,7 +494,12 @@ class pdf_crabe extends ModelePDFFactures
$pdf->setPage($pageposbefore + 1);
$curY = $tab_top_newpage;
$showpricebeforepagebreak = 0;
// 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;
}
if (isset($imglinesize['width']) && isset($imglinesize['height']))
@ -534,7 +539,12 @@ class pdf_crabe extends ModelePDFFactures
else
{
// We found a page break
$showpricebeforepagebreak = 0;
// 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;
}
}
else // No pagebreak

14
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
View File

@ -600,7 +600,12 @@ class pdf_sponge extends ModelePDFFactures
$pdf->setPage($pageposbefore+1);
$curY = $tab_top_newpage;
$showpricebeforepagebreak=0;
// 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;
}
if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height']))
@ -639,7 +644,12 @@ class pdf_sponge extends ModelePDFFactures
else
{
// We found a page break
$showpricebeforepagebreak=0;
// 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;
}
}
else // No pagebreak

7
htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
View File

@ -409,7 +409,12 @@ class pdf_typhon extends ModelePDFDeliveryOrder
else
{
// We found a page break
$showpricebeforepagebreak=0;
// 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;
}
}
else // No pagebreak

8
htdocs/core/modules/project/doc/pdf_baleine.modules.php
View File

@ -362,7 +362,13 @@ class pdf_baleine extends ModelePDFProjects
else
{
// We found a page break
$showpricebeforepagebreak=0;
// 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)
{

8
htdocs/core/modules/project/doc/pdf_beluga.modules.php
View File

@ -512,7 +512,13 @@ class pdf_beluga extends ModelePDFProjects
else
{
// We found a page break
$showpricebeforepagebreak=0;
// 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)
{

8
htdocs/core/modules/project/doc/pdf_timespent.modules.php
View File

@ -293,7 +293,13 @@ class pdf_timespent extends ModelePDFProjects
else
{
// We found a page break
$showpricebeforepagebreak=0;
// 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)
{

14
htdocs/core/modules/propale/doc/pdf_azur.modules.php
View File

@ -502,7 +502,12 @@ class pdf_azur extends ModelePDFPropales
$pdf->setPage($pageposbefore + 1);
$curY = $tab_top_newpage;
$showpricebeforepagebreak = 0;
// 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;
}
if (isset($imglinesize['width']) && isset($imglinesize['height']))
@ -543,7 +548,12 @@ class pdf_azur extends ModelePDFPropales
else
{
// We found a page break
$showpricebeforepagebreak = 0;
// 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;
}
}
else // No pagebreak

14
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
View File

@ -582,7 +582,12 @@ class pdf_cyan extends ModelePDFPropales
$pdf->setPage($pageposbefore+1);
$curY = $tab_top_newpage;
$showpricebeforepagebreak=0;
// 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,7 +629,12 @@ class pdf_cyan extends ModelePDFPropales
else
{
// We found a page break
$showpricebeforepagebreak=0;
// 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;
}
}
else // No pagebreak

14
htdocs/core/modules/reception/doc/pdf_squille.modules.php
View File

@ -374,7 +374,12 @@ class pdf_squille extends ModelePdfReception
$pdf->setPage($pageposbefore + 1);
$curY = $tab_top_newpage;
$showpricebeforepagebreak = 0;
// 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;
}
if (isset($imglinesize['width']) && isset($imglinesize['height']))
@ -417,7 +422,12 @@ class pdf_squille extends ModelePdfReception
else
{
// We found a page break
$showpricebeforepagebreak = 0;
// 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;
}
}
else // No pagebreak

7
htdocs/core/modules/stock/doc/pdf_standard.modules.php
View File

@ -383,7 +383,12 @@ class pdf_standard extends ModelePDFStock
else
{
// We found a page break
$showpricebeforepagebreak=0;
// 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;
}
}
else // No pagebreak

7
htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
View File

@ -543,7 +543,12 @@ class pdf_stdmovement extends ModelePDFMovement
else
{
// We found a page break
$showpricebeforepagebreak=0;
// 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;
}
}
else // No pagebreak

7
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
View File

@ -430,7 +430,12 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
else
{
// We found a page break
$showpricebeforepagebreak=0;
// 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;
}
}
else // No pagebreak

14
htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
View File

@ -523,7 +523,12 @@ class pdf_cornas extends ModelePDFSuppliersOrders
$pdf->setPage($pageposbefore+1);
$curY = $tab_top_newpage;
$showpricebeforepagebreak=0;
// 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;
}
if (!empty($imglinesize['width']) && !empty($imglinesize['height']))
@ -564,7 +569,12 @@ class pdf_cornas extends ModelePDFSuppliersOrders
else
{
// We found a page break
$showpricebeforepagebreak=0;
// 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;
}
}
else // No pagebreak

14
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
View File

@ -445,7 +445,12 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$pdf->setPage($pageposbefore+1);
$curY = $tab_top_newpage;
$showpricebeforepagebreak=0;
// 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;
}
if (!empty($imglinesize['width']) && !empty($imglinesize['height']))
@ -492,7 +497,12 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
else
{
// We found a page break
$showpricebeforepagebreak=0;
// 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;
}
}
else // No pagebreak

7
htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
View File

@ -365,7 +365,12 @@ class pdf_standard extends ModelePDFSuppliersPayments
else
{
// We found a page break
$showpricebeforepagebreak=0;
// 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;
}
}
else // No pagebreak

14
htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
View File

@ -430,7 +430,12 @@ class pdf_aurore extends ModelePDFSupplierProposal
$pdf->setPage($pageposbefore+1);
$curY = $tab_top_newpage;
$showpricebeforepagebreak=0;
// 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;
}
if (!empty($imglinesize['width']) && !empty($imglinesize['height']))
@ -480,7 +485,12 @@ class pdf_aurore extends ModelePDFSupplierProposal
else
{
// We found a page break
$showpricebeforepagebreak=0;
// 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;
}
}
else // No pagebreak

28
htdocs/langs/es_ES/zapier.lang Normal file
View File

@ -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