diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php index 64e4d690308..9400d1f1ebe 100644 --- a/htdocs/core/class/commondocgenerator.class.php +++ b/htdocs/core/class/commondocgenerator.class.php @@ -97,6 +97,7 @@ abstract class CommonDocGenerator public $option_multilang; public $option_freetext; public $option_draft_watermark; + public $watermark; public $option_modereg; public $option_condreg; diff --git a/htdocs/core/modules/commande/modules_commande.php b/htdocs/core/modules/commande/modules_commande.php index d6ecda2b2e7..839be6c9627 100644 --- a/htdocs/core/modules/commande/modules_commande.php +++ b/htdocs/core/modules/commande/modules_commande.php @@ -39,6 +39,23 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'; */ abstract class ModelePDFCommandes extends CommonDocGenerator { + public $posxpicture; + public $posxtva; + public $posxup; + public $posxqty; + public $posxunit; + public $posxdesc; + public $posxdiscount; + public $postotalht; + + public $tva; + public $tva_array; + public $localtax1; + public $localtax2; + + public $atleastoneratenotnull = 0; + public $atleastonediscount = 0; + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps /** diff --git a/htdocs/core/modules/facture/modules_facture.php b/htdocs/core/modules/facture/modules_facture.php index ff541550d4e..8fda383291d 100644 --- a/htdocs/core/modules/facture/modules_facture.php +++ b/htdocs/core/modules/facture/modules_facture.php @@ -42,6 +42,15 @@ abstract class ModelePDFFactures extends CommonDocGenerator */ public $error = ''; + public $posxpicture; + public $posxtva; + public $posxup; + public $posxqty; + public $posxunit; + public $posxdesc; + public $posxdiscount; + public $postotalht; + public $tva; public $tva_array; public $localtax1; diff --git a/htdocs/core/modules/propale/modules_propale.php b/htdocs/core/modules/propale/modules_propale.php index f69fd5e763e..089c0adfa22 100644 --- a/htdocs/core/modules/propale/modules_propale.php +++ b/htdocs/core/modules/propale/modules_propale.php @@ -41,6 +41,23 @@ abstract class ModelePDFPropales extends CommonDocGenerator */ public $error = ''; + public $posxpicture; + public $posxtva; + public $posxup; + public $posxqty; + public $posxunit; + public $posxdesc; + public $posxdiscount; + public $postotalht; + + public $tva; + public $tva_array; + public $localtax1; + public $localtax2; + + public $atleastonediscount = 0; + public $atleastoneratenotnull = 0; + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps /** diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php index 457679abbb9..0601ab06b0a 100644 --- a/htdocs/core/modules/rapport/pdf_paiement.class.php +++ b/htdocs/core/modules/rapport/pdf_paiement.class.php @@ -24,15 +24,36 @@ * \ingroup banque * \brief File to build payment reports */ + require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php'; /** - * Classe permettant de generer les rapports de paiement + * Class to manage reporting of payments */ -class pdf_paiement +class pdf_paiement extends CommonDocGenerator { + public $tab_top; + + public $line_height; + + public $line_per_page; + + public $tab_height; + + public $posxdate; + + public $posxpaymenttype; + public $posxinvoice; + public $posxbankaccount; + public $posxinvoiceamount; + public $posxpaymentamount; + + public $doc_type; + + /** * Constructor *