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

Fix option MAIN_USE_COMPANY_NAME_OF_CONTACT

Browse Source
This commit is contained in:
Laurent Destailleur 2020-12-02 21:27:15 +01:00
parent 37b6a15dbb
commit 46171a6ec8
37 changed files with 94 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
View File

@ -294,10 +294,11 @@ class doc_generic_bom_odt extends ModelePDFBom
if (!empty($usecontact)) if (!empty($usecontact))
{ {
// On peut utiliser le nom de la societe du contact // On peut utiliser le nom de la societe du contact
if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact; if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
else { $socobject = $object->contact;
} else {
$socobject = $object->thirdparty; $socobject = $object->thirdparty;
// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use // if we have a CUSTOMER contact and we dont use as recipient we store the contact object for later use
$contactobject = $object->contact; $contactobject = $object->contact;
} }
} else { } else {

8
htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
View File

@ -305,11 +305,11 @@ class doc_generic_order_odt extends ModelePDFCommandes
$contactobject = null; $contactobject = null;
if (!empty($usecontact)) if (!empty($usecontact))
{ {
// On peut utiliser le nom de la societe du contact if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact; $socobject = $object->contact;
else { } else {
$socobject = $object->thirdparty; $socobject = $object->thirdparty;
// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use // if we have a CUSTOMER contact and we dont use as recipient we store the contact object for later use
$contactobject = $object->contact; $contactobject = $object->contact;
} }
} else { } else {

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

@ -1446,9 +1446,8 @@ class pdf_einstein extends ModelePDFCommandes
$result = $object->fetch_contact($arrayidcontact[0]); $result = $object->fetch_contact($arrayidcontact[0]);
} }
//Recipient name // Recipient name
// On peut utiliser le nom de la societe du contact if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
$thirdparty = $object->contact; $thirdparty = $object->contact;
} else { } else {
$thirdparty = $object->thirdparty; $thirdparty = $object->thirdparty;

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

@ -1628,8 +1628,7 @@ class pdf_eratosthene extends ModelePDFCommandes
} }
//Recipient name //Recipient name
// On peut utiliser le nom de la societe du contact if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
$thirdparty = $object->contact; $thirdparty = $object->contact;
} else { } else {
$thirdparty = $object->thirdparty; $thirdparty = $object->thirdparty;

5
htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
View File

@ -291,12 +291,11 @@ class doc_generic_contract_odt extends ModelePDFContract
// Recipient name // Recipient name
$contactobject = null; $contactobject = null;
if (!empty($usecontact)) { if (!empty($usecontact)) {
// On peut utiliser le nom de la societe du contact if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
$socobject = $object->contact; $socobject = $object->contact;
} else { } else {
$socobject = $object->thirdparty; $socobject = $object->thirdparty;
// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use // if we have a CUSTOMER contact and we dont use as recipient we store the contact object for later use
$contactobject = $object->contact; $contactobject = $object->contact;
} }
} else { } else {

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

@ -711,9 +711,8 @@ class pdf_strato extends ModelePDFContract
$this->recipient = $object->thirdparty; $this->recipient = $object->thirdparty;
//Recipient name // Recipient name
// You can use the name of the contact company if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
$thirdparty = $object->contact; $thirdparty = $object->contact;
} else { } else {
$thirdparty = $object->thirdparty; $thirdparty = $object->thirdparty;

5
htdocs/core/modules/delivery/doc/pdf_storm.modules.php
View File

@ -860,9 +860,8 @@ class pdf_storm extends ModelePDFDeliveryOrder
$result = $object->fetch_contact($arrayidcontact[0]); $result = $object->fetch_contact($arrayidcontact[0]);
} }
//Recipient name // Recipient name
// On peut utiliser le nom de la societe du contact if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
$thirdparty = $object->contact; $thirdparty = $object->contact;
} else { } else {
$thirdparty = $object->thirdparty; $thirdparty = $object->thirdparty;

5
htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
View File

@ -850,9 +850,8 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$result = $object->fetch_contact($arrayidcontact[0]); $result = $object->fetch_contact($arrayidcontact[0]);
} }
//Recipient name // Recipient name
// On peut utiliser le nom de la societe du contact if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
$thirdparty = $object->contact; $thirdparty = $object->contact;
} else { } else {
$thirdparty = $object->thirdparty; $thirdparty = $object->thirdparty;

7
htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
View File

@ -304,12 +304,11 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
// Recipient name // Recipient name
$contactobject = null; $contactobject = null;
if (!empty($usecontact)) { if (!empty($usecontact)) {
// On peut utiliser le nom de la societe du contact if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT))
$socobject = $object->contact; $socobject = $object->contact;
else { } else {
$socobject = $object->thirdparty; $socobject = $object->thirdparty;
// if we have a SHIIPPING contact and we dont use it as recipient we store the contact object for later use // if we have a SHIPPING contact and we dont use as recipient we store the contact object for later use
$contactobject = $object->contact; $contactobject = $object->contact;
} }
} else { } else {

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

@ -1020,9 +1020,8 @@ class pdf_espadon extends ModelePdfExpedition
$result = $object->fetch_contact($arrayidcontact[0]); $result = $object->fetch_contact($arrayidcontact[0]);
} }
//Recipient name // Recipient name
// You can use the name of the contact company if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
$thirdparty = $object->contact; $thirdparty = $object->contact;
} else { } else {
$thirdparty = $object->thirdparty; $thirdparty = $object->thirdparty;

3
htdocs/core/modules/expedition/doc/pdf_merou.modules.php
View File

@ -678,8 +678,7 @@ class pdf_merou extends ModelePdfExpedition
} }
// Recipient name // Recipient name
// You can use the name of the contact company if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
$thirdparty = $object->contact; $thirdparty = $object->contact;
} else { } else {
$thirdparty = $object->thirdparty; $thirdparty = $object->thirdparty;

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

@ -1054,9 +1054,8 @@ class pdf_rouget extends ModelePdfExpedition
$result = $object->fetch_contact($arrayidcontact[0]); $result = $object->fetch_contact($arrayidcontact[0]);
} }
//Recipient name // Recipient name
// On peut utiliser le nom de la societe du contact if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
$thirdparty = $object->contact; $thirdparty = $object->contact;
} else { } else {
$thirdparty = $object->thirdparty; $thirdparty = $object->thirdparty;

5
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
View File

@ -305,10 +305,9 @@ class doc_generic_invoice_odt extends ModelePDFFactures
// Recipient name // Recipient name
$contactobject = null; $contactobject = null;
if (!empty($usecontact)) { if (!empty($usecontact)) {
// On peut utiliser le nom de la societe du contact if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT))
$socobject = $object->contact; $socobject = $object->contact;
else { } else {
$socobject = $object->thirdparty; $socobject = $object->thirdparty;
// if we have a BILLING contact and we dont use it as recipient we store the contact object for later use // if we have a BILLING contact and we dont use it as recipient we store the contact object for later use
$contactobject = $object->contact; $contactobject = $object->contact;

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

@ -1842,9 +1842,8 @@ class pdf_crabe extends ModelePDFFactures
$result = $object->fetch_contact($arrayidcontact[0]); $result = $object->fetch_contact($arrayidcontact[0]);
} }
//Recipient name // Recipient name
// On peut utiliser le nom de la societe du contact if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
$thirdparty = $object->contact; $thirdparty = $object->contact;
} else { } else {
$thirdparty = $object->thirdparty; $thirdparty = $object->thirdparty;

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

@ -2108,9 +2108,8 @@ class pdf_sponge extends ModelePDFFactures
$result = $object->fetch_contact($arrayidcontact[0]); $result = $object->fetch_contact($arrayidcontact[0]);
} }
//Recipient name // Recipient name
// On peut utiliser le nom de la societe du contact if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
$thirdparty = $object->contact; $thirdparty = $object->contact;
} else { } else {
$thirdparty = $object->thirdparty; $thirdparty = $object->thirdparty;

5
htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
View File

@ -665,9 +665,8 @@ class pdf_soleil extends ModelePDFFicheinter
$result = $object->fetch_contact($arrayidcontact[0]); $result = $object->fetch_contact($arrayidcontact[0]);
} }
//Recipient name // Recipient name
// On peut utiliser le nom de la societe du contact if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
$thirdparty = $object->contact; $thirdparty = $object->contact;
} else { } else {
$thirdparty = $object->thirdparty; $thirdparty = $object->thirdparty;

3
htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
View File

@ -280,8 +280,7 @@ class doc_generic_member_odt extends ModelePDFMember
// Recipient name // Recipient name
if (!empty($usecontact)) { if (!empty($usecontact)) {
// On peut utiliser le nom de la societe du contact if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
$socobject = $object->contact; $socobject = $object->contact;
} else { } else {
$socobject = $object->thirdparty; $socobject = $object->thirdparty;

9
htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
View File

@ -298,11 +298,10 @@ class doc_generic_mo_odt extends ModelePDFMo
// Recipient name // Recipient name
$contactobject = null; $contactobject = null;
if (!empty($usecontact)) if (!empty($usecontact)) {
{ if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
// On peut utiliser le nom de la societe du contact $socobject = $object->contact;
if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact; } else {
else {
$socobject = $object->thirdparty; $socobject = $object->thirdparty;
// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use // if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
$contactobject = $object->contact; $contactobject = $object->contact;

6
htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
View File

@ -315,10 +315,8 @@ class doc_generic_product_odt extends ModelePDFProduct
// Recipient name // Recipient name
$contactobject = null; $contactobject = null;
if (!empty($usecontact)) if (!empty($usecontact)) {
{ if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
// On peut utiliser le nom de la societe du contact
if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
$socobject = $object->contact; $socobject = $object->contact;
} else { } else {
$socobject = $object->thirdparty; $socobject = $object->thirdparty;

6
htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
View File

@ -334,9 +334,9 @@ class doc_generic_proposal_odt extends ModelePDFPropales
$contactobject = null; $contactobject = null;
if (!empty($usecontact)) if (!empty($usecontact))
{ {
// On peut utiliser le nom de la societe du contact if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact; $socobject = $object->contact;
else { } else {
$socobject = $object->thirdparty; $socobject = $object->thirdparty;
// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use // if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
$contactobject = $object->contact; $contactobject = $object->contact;

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

@ -1618,9 +1618,8 @@ class pdf_azur extends ModelePDFPropales
$result = $object->fetch_contact($arrayidcontact[0]); $result = $object->fetch_contact($arrayidcontact[0]);
} }
//Recipient name // Recipient name
// On peut utiliser le nom de la societe du contact if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
$thirdparty = $object->contact; $thirdparty = $object->contact;
} else { } else {
$thirdparty = $object->thirdparty; $thirdparty = $object->thirdparty;

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

@ -1729,9 +1729,8 @@ class pdf_cyan extends ModelePDFPropales
$result = $object->fetch_contact($arrayidcontact[0]); $result = $object->fetch_contact($arrayidcontact[0]);
} }
//Recipient name // Recipient name
// On peut utiliser le nom de la societe du contact if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
$thirdparty = $object->contact; $thirdparty = $object->contact;
} else { } else {
$thirdparty = $object->thirdparty; $thirdparty = $object->thirdparty;

13
htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
View File

@ -294,11 +294,14 @@ class doc_generic_reception_odt extends ModelePdfReception
} }
// Recipient name // Recipient name
if (!empty($usecontact)) if (!empty($usecontact)) {
{ if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
// On peut utiliser le nom de la societe du contact $socobject = $object->contact;
if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact; } else {
else $socobject = $object->thirdparty; $socobject = $object->thirdparty;
// if we have a BILLING contact and we dont use it as recipient we store the contact object for later use
$contactobject = $object->contact;
}
} else { } else {
$socobject = $object->thirdparty; $socobject = $object->thirdparty;
} }

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

@ -944,9 +944,8 @@ class pdf_squille extends ModelePdfReception
$result = $object->fetch_contact($arrayidcontact[0]); $result = $object->fetch_contact($arrayidcontact[0]);
} }
//Recipient name // Recipient name
// On peut utiliser le nom de la societe du contact if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
$thirdparty = $object->contact; $thirdparty = $object->contact;
} else { } else {
$thirdparty = $object->thirdparty; $thirdparty = $object->thirdparty;

3
htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
View File

@ -306,8 +306,7 @@ class doc_generic_stock_odt extends ModelePDFStock
$contactobject = null; $contactobject = null;
if (!empty($usecontact)) if (!empty($usecontact))
{ {
// On peut utiliser le nom de la societe du contact if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
$socobject = $object->contact; $socobject = $object->contact;
} else { } else {
$socobject = $object->thirdparty; $socobject = $object->thirdparty;

5
htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
View File

@ -1209,9 +1209,8 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
$result = $object->fetch_contact($arrayidcontact[0]); $result = $object->fetch_contact($arrayidcontact[0]);
} }
//Recipient name // Recipient name
// We can use the name of the contact's company if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
$thirdparty = $object->contact; $thirdparty = $object->contact;
} else { } else {
$thirdparty = $mysoc; $thirdparty = $mysoc;

6
htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
View File

@ -295,9 +295,9 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
$contactobject = null; $contactobject = null;
if (!empty($usecontact)) if (!empty($usecontact))
{ {
// On peut utiliser le nom de la societe du contact if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact; $socobject = $object->contact;
else { } else {
$socobject = $object->thirdparty; $socobject = $object->thirdparty;
// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use // if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
$contactobject = $object->contact; $contactobject = $object->contact;

5
htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
View File

@ -1371,9 +1371,8 @@ class pdf_cornas extends ModelePDFSuppliersOrders
$result = $object->fetch_contact($arrayidcontact[0]); $result = $object->fetch_contact($arrayidcontact[0]);
} }
//Recipient name // Recipient name
// On peut utiliser le nom de la societe du contact if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
$thirdparty = $object->contact; $thirdparty = $object->contact;
} else { } else {
$thirdparty = $object->thirdparty; $thirdparty = $object->thirdparty;

5
htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
View File

@ -1283,9 +1283,8 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$result = $object->fetch_contact($arrayidcontact[0]); $result = $object->fetch_contact($arrayidcontact[0]);
} }
//Recipient name // Recipient name
// On peut utiliser le nom de la societe du contact if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
$thirdparty = $object->contact; $thirdparty = $object->contact;
} else { } else {
$thirdparty = $object->thirdparty; $thirdparty = $object->thirdparty;

9
htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
View File

@ -330,15 +330,12 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
// Recipient name // Recipient name
$contactobject = null; $contactobject = null;
if (!empty($usecontact)) if (!empty($usecontact)) {
{ if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
// On peut utiliser le nom de la societe du contact
if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT))
{
$socobject = $object->contact; $socobject = $object->contact;
} else { } else {
$socobject = $object->thirdparty; $socobject = $object->thirdparty;
// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use // if we have a BILLING contact and we dont use it as recipient we store the contact object for later use
$contactobject = $object->contact; $contactobject = $object->contact;
} }
} else { } else {

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

@ -1417,14 +1417,17 @@ class pdf_aurore extends ModelePDFSupplierProposal
// Recipient name // Recipient name
if (!empty($usecontact)) if (!empty($usecontact))
{ {
// On peut utiliser le nom de la societe du contact if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname; $socname = $object->contact->socname;
else $socname = $object->thirdparty->name; } else {
$carac_client_name = $outputlangs->convToOutputCharset($socname); $socname = $object->thirdparty->name;
}
} else { } else {
$carac_client_name = $outputlangs->convToOutputCharset($object->thirdparty->name); $socname = $object->thirdparty->name;
} }
$carac_client_name = pdfBuildThirdpartyName($socname, $outputlangs);
$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), $usecontact, 'target', $object); $carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), $usecontact, 'target', $object);
// Show recipient // Show recipient

6
htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
View File

@ -323,9 +323,9 @@ class doc_generic_user_odt extends ModelePDFUser
// Recipient name // Recipient name
if (!empty($usecontact)) if (!empty($usecontact))
{ {
// On peut utiliser le nom de la societe du contact if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact; $socobject = $object->contact;
else { } else {
$socobject = $object->thirdparty; $socobject = $object->thirdparty;
// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use // if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
$contactobject = $object->contact; $contactobject = $object->contact;

6
htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
View File

@ -314,9 +314,9 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
// Recipient name // Recipient name
if (!empty($usecontact)) if (!empty($usecontact))
{ {
// On peut utiliser le nom de la societe du contact if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact; $socobject = $object->contact;
else { } else {
$socobject = $object->thirdparty; $socobject = $object->thirdparty;
// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use // if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
$contactobject = $object->contact; $contactobject = $object->contact;

6
htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
View File

@ -299,9 +299,9 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
$contactobject = null; $contactobject = null;
if (!empty($usecontact)) if (!empty($usecontact))
{ {
// On peut utiliser le nom de la societe du contact if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact; $socobject = $object->contact;
else { } else {
$socobject = $object->thirdparty; $socobject = $object->thirdparty;
// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use // if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
$contactobject = $object->contact; $contactobject = $object->contact;

2
htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
View File

@ -1091,7 +1091,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
} }
// Recipient name // Recipient name
if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) { if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
$thirdparty = $object->contact; $thirdparty = $object->contact;
} else { } else {
$thirdparty = $object->thirdparty; $thirdparty = $object->thirdparty;

6
htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
View File

@ -299,9 +299,9 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi
$contactobject = null; $contactobject = null;
if (!empty($usecontact)) if (!empty($usecontact))
{ {
// On peut utiliser le nom de la societe du contact if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact; $socobject = $object->contact;
else { } else {
$socobject = $object->thirdparty; $socobject = $object->thirdparty;
// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use // if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
$contactobject = $object->contact; $contactobject = $object->contact;

2
htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
View File

@ -1002,7 +1002,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
} }
// Recipient name // Recipient name
/*if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) { /*if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
$thirdparty = $object->contact; $thirdparty = $object->contact;
} else { } else {
$thirdparty = $object->thirdparty; $thirdparty = $object->thirdparty;