diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php index 1e71ff6d5c6..65e6716dc54 100644 --- a/htdocs/commande/tpl/linkedobjectblock.tpl.php +++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php @@ -21,7 +21,8 @@ -load("orders"); if ($somethingshown) { echo '
'; } print_titre($langs->trans('RelatedOrders')); ?> @@ -32,7 +33,7 @@ print_titre($langs->trans('RelatedOrders')); trans("AmountHTShort"); ?> trans("Status"); ?> - -load("bills"); if ($somethingshown) { echo '
'; } if ($num > 1) print_titre($langs->trans("RelatedBills")); else print_titre($langs->trans("RelatedBill")); @@ -33,7 +34,7 @@ else print_titre($langs->trans("RelatedBill")); trans("AmountHTShort"); ?> trans("Status"); ?> -total_ht; $i++; -} +} ?> trans("TotalHT"); ?> diff --git a/htdocs/contrat/tpl/linkedobjectblock.tpl.php b/htdocs/contrat/tpl/linkedobjectblock.tpl.php index 30cdf91d194..6ad5a77773e 100644 --- a/htdocs/contrat/tpl/linkedobjectblock.tpl.php +++ b/htdocs/contrat/tpl/linkedobjectblock.tpl.php @@ -21,9 +21,10 @@ -load("contracts"); if ($somethingshown) { echo '
'; } -print_titre($langs->trans('RelatedContract')); +print_titre($langs->trans('RelatedContracts')); ?> @@ -32,7 +33,7 @@ print_titre($langs->trans('RelatedContract')); -%s % TypeAmountOfEachNewDiscount=Input amount for each of two parts : TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to original discount amount. ConfirmRemoveDiscount=Are you sure you want to remove this discount ? +RelatedBill=Related invoice +RelatedBills=Related invoices # PaymentConditions PaymentConditionShortRECEP=Immediate diff --git a/htdocs/langs/en_US/contracts.lang b/htdocs/langs/en_US/contracts.lang index 2676f720bc0..ab98cf80133 100644 --- a/htdocs/langs/en_US/contracts.lang +++ b/htdocs/langs/en_US/contracts.lang @@ -84,6 +84,7 @@ ConfirmMoveToAnotherContract=I choosed new target contract and confirm I want to ConfirmMoveToAnotherContractQuestion=Choose in which existing contract (of same third party), you want to move this service to ? PaymentRenewContractId=Renew contract line (number %s) ExpiredSince=Expiration date +RelatedContracts=Related contracts ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract TypeContact_contrat_internal_SALESREPFOLL=Sales representative following-up contract diff --git a/htdocs/langs/en_US/propal.lang b/htdocs/langs/en_US/propal.lang index 71db48571c7..3c03c14c469 100644 --- a/htdocs/langs/en_US/propal.lang +++ b/htdocs/langs/en_US/propal.lang @@ -67,8 +67,6 @@ ValidityDuration=Validity duration CloseAs=Close with status ClassifyBilled=Classify billed BuildBill=Build invoice -RelatedBill=Related invoice -RelatedBills=Related invoices ErrorPropalNotFound=Propal %s not found Estimate=Estimate : EstimateShort=Estimate diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang index 01e2225a879..05924aa1890 100644 --- a/htdocs/langs/fr_FR/bills.lang +++ b/htdocs/langs/fr_FR/bills.lang @@ -270,6 +270,8 @@ ConfirmSplitDiscount=Êtes-vous sûr de vouloir scinder la réduction de %s
trans("AmountHTShort"); ?> trans("Status"); ?>