Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0

Conflicts: htdocs/compta/facture.php
Dolibarr · Jul 25, 2017 · cba898e · cba898e
2 parents 9043249 + fdcc067
commit cba898e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 0 deletions.
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
@@ -1750,6 +1750,7 @@
 	$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->propal->creer, 'string', '', null, null, '', 1);
     // Thirdparty
     $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+	if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref.=' (<a href="'.DOL_URL_ROOT.'/comm/propal/list.php?socid='.$object->thirdparty->id.'">'.$langs->trans("OtherProposals").'</a>)';
     // Project
     if (! empty($conf->projet->enabled))
     {

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
@@ -1924,6 +1924,7 @@
 		$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->commande->creer, 'string', '', null, null, '', 1);
 	    // Thirdparty
 	    $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
+		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref.=' (<a href="'.DOL_URL_ROOT.'/commande/list.php?socid='.$object->thirdparty->id.'">'.$langs->trans("OtherOrders").'</a>)';
 	    // Project
 	    if (! empty($conf->projet->enabled))
 	    {

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
@@ -3075,6 +3075,7 @@
 	$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->facture->creer, 'string', '', null, null, '', 1);
 	// Thirdparty
 	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+	if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref.=' (<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$object->thirdparty->id.'">'.$langs->trans("OtherBills").'</a>)';
 	// Project
 	if (! empty($conf->projet->enabled))
 	{

diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang
@@ -117,6 +117,7 @@ SecondApprovalAlreadyDone=Second approval already done
 SupplierOrderReceivedInDolibarr=Supplier order %s received %s
 SupplierOrderSubmitedInDolibarr=Supplier order %s submited
 SupplierOrderClassifiedBilled=Supplier order %s set billed
+OtherOrders=Other orders
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
 TypeContact_commande_internal_SHIPPING=Representative following-up shipping

diff --git a/htdocs/langs/en_US/propal.lang b/htdocs/langs/en_US/propal.lang
@@ -63,6 +63,7 @@ ProposalLine=Proposal line
 AvailabilityPeriod=Availability delay
 SetAvailability=Set availability delay
 AfterOrder=after order
+OtherProposals=Other proposals
 ##### Availability #####
 AvailabilityTypeAV_NOW=Immediate
 AvailabilityTypeAV_1W=1 week