diff --git a/htdocs/admin/pdf_other.php b/htdocs/admin/pdf_other.php index 95a84ede1ce..e9103da1111 100644 --- a/htdocs/admin/pdf_other.php +++ b/htdocs/admin/pdf_other.php @@ -541,7 +541,7 @@ if (isModEnabled('invoice')) { print ajax_constantonoff('PDF_INVOICE_SHOW_VAT_ANALYSIS'); } else { $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes")); - print $form->selectarray("PDF_INVOICE_SHOW_VAT_ANALYSIS", $arrval, $conf->global->PDF_INVOICE_SHOW_VAT_ANALYSIS); + print $form->selectarray("PDF_INVOICE_SHOW_VAT_ANALYSIS", $arrval, getDolGlobalInt('PDF_INVOICE_SHOW_VAT_ANALYSIS')); } print ''; @@ -553,7 +553,7 @@ if (isModEnabled('invoice')) { print ajax_constantonoff('PDF_INVOICE_SHOW_BALANCE_SUMMARY'); } else { $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes")); - print $form->selectarray("PDF_INVOICE_SHOW_BALANCE_SUMMARY", $arrval, $conf->global->PDF_INVOICE_SHOW_BALANCE_SUMMARY); + print $form->selectarray("PDF_INVOICE_SHOW_BALANCE_SUMMARY", $arrval, getDolGlobalInt('PDF_INVOICE_SHOW_BALANCE_SUMMARY')); } print ''; @@ -565,7 +565,7 @@ if (isModEnabled('invoice')) { print ajax_constantonoff('SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT'); } else { $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes")); - print $form->selectarray("SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT", $arrval, $conf->global->SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT); + print $form->selectarray("SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT", $arrval, getDolGlobalInt('SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT')); } print ''; */ diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 2f6b34aebd3..f861467e2a6 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -2479,7 +2479,7 @@ INVOICE_SHOW_SHIPPING_ADDRESS=Show shipping address INVOICE_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...) SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing -INVOICE_HIDE_LINKED_OBJECT=Hide linked object +INVOICE_HIDE_LINKED_OBJECT=Hide linked objects INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document. UrlSocialNetworksDesc=Url link of social network. Use {socialid} for the variable part that contains the social network ID. IfThisCategoryIsChildOfAnother=If this category is a child of another one @@ -2668,7 +2668,7 @@ CaptchaDesc=If you want to protect your login page with a Captcha, you can choos DolibarrStandardCaptcha=A native captcha generated by Dolibarr SALES_ORDER_SHOW_SHIPPING_ADDRESS=Show shipping address SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...) -PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate +PDF_INVOICE_SHOW_VAT_ANALYSIS=Show the vat per rate analysis in columns (instead of in lines) MaxNbOfRecordOnListIsOk=You have a max size for lists set to %s lines. This is a good value. YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to %s lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than %s and use pagination to see record over this number. Change this in menu Home - Setup - Display. RoundBorders=Round borders