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

FIX Translation of "Name" is not a good choice for floow-up.

Browse Source
This commit is contained in:
Laurent Destailleur 2016-09-08 17:31:42 +02:00
parent 71cef95dda
commit 417b2f566f
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1473,7 +1473,8 @@ class pdf_azur extends ModelePDFPropales
if (count($arrayidcontact) > 0) if (count($arrayidcontact) > 0)
{ {
$object->fetch_user($arrayidcontact[0]); $object->fetch_user($arrayidcontact[0]);
$carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->transnoentities("Name").": ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n"; $labelbeforecontactname=($outputlangs->transnoentities("FromContactName")!='FromContactName'?$outputlangs->transnoentities("FromContactName"):$outputlangs->transnoentities("Name"));
$carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$labelbeforecontactname." ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
} }
$carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty); $carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty);

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

@ -1293,7 +1293,8 @@ class pdf_aurore extends ModelePDFSupplierProposal
if (count($arrayidcontact) > 0) if (count($arrayidcontact) > 0)
{ {
$object->fetch_user($arrayidcontact[0]); $object->fetch_user($arrayidcontact[0]);
$carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->transnoentities("Name").": ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n"; $labelbeforecontactname=($outputlangs->transnoentities("FromContactName")!='FromContactName'?$outputlangs->transnoentities("FromContactName"):$outputlangs->transnoentities("Name"));
$carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$labelbeforecontactname.": ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
} }
$carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty); $carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty);

1
htdocs/langs/en_US/companies.lang
View File

@ -263,6 +263,7 @@ EditContactAddress=Edit contact/address
Contact=Contact Contact=Contact
ContactId=Contact id ContactId=Contact id
ContactsAddresses=Contacts/Addresses ContactsAddresses=Contacts/Addresses
FromContactName=Name:
NoContactDefinedForThirdParty=No contact defined for this third party NoContactDefinedForThirdParty=No contact defined for this third party
NoContactDefined=No contact defined NoContactDefined=No contact defined
DefaultContact=Default contact/address DefaultContact=Default contact/address