diff --git a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php index d38c9918af8..cc84e87ddba 100644 --- a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php +++ b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php @@ -33,19 +33,8 @@ global $user; $langs = $GLOBALS['langs']; $linkedObjectBlock = $GLOBALS['linkedObjectBlock']; -echo '
'; -print load_fiche_titre($langs->trans('RelatedCommercialProposals'), '', ''); -?> - - - - - - - - - -load("propal"); + $var=true; $total=0; foreach($linkedObjectBlock as $key => $objectlink) @@ -53,6 +42,7 @@ foreach($linkedObjectBlock as $key => $objectlink) $var=!$var; ?> > + @@ -66,17 +56,6 @@ foreach($linkedObjectBlock as $key => $objectlink) - - - - - - -
trans("Ref"); ?>trans('RefCustomer'); ?>trans("Date"); ?>trans("AmountHTShort"); ?>trans("Status"); ?>
trans("Proposal"); ?> getNomUrl(1); ?> ref_client; ?> date,'day'); ?>
trans('TotalHT'); ?>rights->propale->lire) { - echo price($total); - } ?>
diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php index 231f6034b00..1968caf2544 100644 --- a/htdocs/commande/tpl/linkedobjectblock.tpl.php +++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php @@ -27,22 +27,8 @@ global $user; $langs = $GLOBALS['langs']; $linkedObjectBlock = $GLOBALS['linkedObjectBlock']; - $langs->load("orders"); -echo '
'; -print load_fiche_titre($langs->trans('RelatedCustomerOrders'), '', ''); -?> - - - - - - - - - - $objectlink) @@ -50,6 +36,7 @@ foreach($linkedObjectBlock as $key => $objectlink) $var=!$var; ?> > + @@ -63,17 +50,6 @@ foreach($linkedObjectBlock as $key => $objectlink) - - - - - - -
trans("Ref"); ?>trans("RefCustomer"); ?>trans("Date"); ?>trans("AmountHTShort"); ?>trans("Status"); ?>
trans("CustomerOrder"); ?> getNomUrl(1); ?> ref_client; ?> date,'day'); ?>
trans('TotalHT'); ?>rights->commande->lire) { - echo price($total); - } ?>
\ No newline at end of file diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index e833c0629b3..9b381c1af04 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -619,7 +619,7 @@ else print "".$langs->trans("Author").''.$author->getFullName($langs).""; print ''.$langs->trans("AmountHT").''; - print ''.price($object->total_ht,'',$langs,1,-1,-1,$conf->currency).''; + print ''.price($object->total_ht,'',$langs,1,-1,-1,$conf->currency).''; print ''; print ''.$langs->trans("AmountVAT").''.price($object->total_tva,'',$langs,1,-1,-1,$conf->currency).''; diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php index d89dbceb689..56e8645b8c7 100644 --- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php +++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php @@ -27,21 +27,8 @@ global $user; $langs = $GLOBALS['langs']; $linkedObjectBlock = $GLOBALS['linkedObjectBlock']; - $langs->load("bills"); -echo '
'; -print load_fiche_titre($langs->trans("RelatedCustomerInvoices"), '', ''); -?> - - - - - - - - - - $objectlink) @@ -49,6 +36,7 @@ foreach($linkedObjectBlock as $key => $objectlink) $var=!$var; ?> > + @@ -63,15 +51,5 @@ foreach($linkedObjectBlock as $key => $objectlink) - - - - - - -
trans("Ref"); ?>trans("RefCustomer"); ?>trans("Date"); ?>trans("AmountHTShort"); ?>trans("Status"); ?>
trans("CustomerInvoice"); ?> getNomUrl(1); ?> ref_client; ?> date,'day'); ?>
trans("TotalHT"); ?>rights->facture->lire) { - echo price($total); - } ?>
\ No newline at end of file diff --git a/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php index a5870ac190e..ce94e4a1212 100644 --- a/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php +++ b/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php @@ -27,21 +27,8 @@ global $user; $langs = $GLOBALS['langs']; $linkedObjectBlock = $GLOBALS['linkedObjectBlock']; - $langs->load("bills"); -echo '
'; -print load_fiche_titre($langs->trans("RelatedRecurringCustomerInvoices"), '', ''); -?> - - - - - - - - - $objectlink) @@ -49,20 +36,20 @@ foreach($linkedObjectBlock as $key => $objectlink) $var=!$var; ?> > + - + + - + -
trans("Ref"); ?>trans("AmountHTShort"); ?>
trans("RepeatableInvoice"); ?> getNomUrl(1); ?>date,'day'); ?> rights->facture->lire) { $total = $total + $objectlink->total_ht; echo price($objectlink->total_ht); } ?> ">transnoentitiesnoconv("RemoveLink")); ?>
\ No newline at end of file diff --git a/htdocs/contrat/tpl/linkedobjectblock.tpl.php b/htdocs/contrat/tpl/linkedobjectblock.tpl.php index c5e4dd92a05..aa8d83bb803 100644 --- a/htdocs/contrat/tpl/linkedobjectblock.tpl.php +++ b/htdocs/contrat/tpl/linkedobjectblock.tpl.php @@ -21,22 +21,13 @@ load("contracts"); -echo '
'; -print load_fiche_titre($langs->trans('RelatedContracts'), '', ''); -?> - - - - - - - - - $objectlink) { @@ -44,7 +35,9 @@ foreach($linkedObjectBlock as $key => $objectlink) $var=!$var; ?> > + + @@ -52,6 +45,4 @@ foreach($linkedObjectBlock as $key => $objectlink) -
trans("Ref"); ?>trans("Date"); ?> trans("Status"); ?>
trans("Contract"); ?> getNomUrl(1); ?> date_contrat,'day'); ?>   getLibStatut(6); ?>
- \ No newline at end of file diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 6181f6eb6bf..b9e01f94a96 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -5101,7 +5101,8 @@ class Form if (empty($reshook)) { $num = count($object->linkedObjects); - + $numoutput=0; + foreach($object->linkedObjects as $objecttype => $objects) { $tplpath = $element = $subelement = $objecttype; @@ -5152,6 +5153,26 @@ class Form global $linkedObjectBlock; $linkedObjectBlock = $objects; + if (empty($numoutput)) + { + $numoutput++; + + echo '
'; + print load_fiche_titre($langs->trans('RelatedObjects'), '', ''); + + print ''; + + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + } + // Output template part (modules that overwrite templates must declare this into descriptor) $dirtpls=array_merge($conf->modules_parts['tpl'],array('/'.$tplpath.'/tpl')); foreach($dirtpls as $reldir) @@ -5161,6 +5182,11 @@ class Form } } + if ($numoutput) + { + print '
'.$langs->trans("Type").''.$langs->trans("Ref").''.$langs->trans("Date").''.$langs->trans("AmountHTShort").''.$langs->trans("Status").'
'; + } + return $num; } } diff --git a/htdocs/expedition/tpl/linkedobjectblock.tpl.php b/htdocs/expedition/tpl/linkedobjectblock.tpl.php index aea4127b50a..c14d3471421 100644 --- a/htdocs/expedition/tpl/linkedobjectblock.tpl.php +++ b/htdocs/expedition/tpl/linkedobjectblock.tpl.php @@ -28,20 +28,7 @@ $langs = $GLOBALS['langs']; $linkedObjectBlock = $GLOBALS['linkedObjectBlock']; $langs->load("sendings"); -echo '
'; -print load_fiche_titre($langs->trans('RelatedShippings'), '', ''); -?> - - - - - - - - - - $objectlink) @@ -49,8 +36,8 @@ foreach($linkedObjectBlock as $key => $objectlink) $var=!$var; ?> > + - - -
trans("Ref"); ?>trans("Date"); ?>trans("DateDeliveryPlanned"); ?>trans(""); ?>trans("Status"); ?>
trans("Shipment"); ?> getNomUrl(1); ?>date_creation,'day'); ?> date_delivery,'day'); ?> rights->expedition->lire) { @@ -62,19 +49,6 @@ foreach($linkedObjectBlock as $key => $objectlink)
diff --git a/htdocs/expensereport/tpl/linkedobjectblock.tpl.php b/htdocs/expensereport/tpl/linkedobjectblock.tpl.php index f2f26e625f7..743137ded67 100644 --- a/htdocs/expensereport/tpl/linkedobjectblock.tpl.php +++ b/htdocs/expensereport/tpl/linkedobjectblock.tpl.php @@ -29,18 +29,7 @@ $langs = $GLOBALS['langs']; $linkedObjectBlock = $GLOBALS['linkedObjectBlock']; $langs->load("expensereports"); -echo '
'; -print_titre($langs->trans("RelatedExpenseReports")); -?> - - - - - - - - - $objectlink) @@ -48,7 +37,9 @@ foreach($linkedObjectBlock as $key => $objectlink) $var=!$var; ?> > + + - - - - - -
trans("Ref"); ?>trans("Date"); ?>trans("AmountHTShort"); ?>trans("Status"); ?>
trans("ExpenseReport"); ?> getNomUrl(1); ?> date_debut,'day'); ?> rights->expensereport->lire) { @@ -61,15 +52,5 @@ foreach($linkedObjectBlock as $key => $objectlink) -
trans("TotalHT"); ?>rights->expensereport->lire) { - echo price($total); - } ?>
\ No newline at end of file diff --git a/htdocs/fichinter/tpl/linkedobjectblock.tpl.php b/htdocs/fichinter/tpl/linkedobjectblock.tpl.php index 0518d40cd91..bb973369adc 100644 --- a/htdocs/fichinter/tpl/linkedobjectblock.tpl.php +++ b/htdocs/fichinter/tpl/linkedobjectblock.tpl.php @@ -21,38 +21,29 @@ load("interventions"); -echo '
'; -print load_fiche_titre($langs->trans('RelatedInterventions'), '', ''); -?> - - - - - - - - $objectlink) { $var=!$var; ?> > + + + -
trans("Ref"); ?>trans("Date"); ?>trans("Status"); ?>
trans("Intervention"); ?> getNomUrl(1); ?> datev,'day'); ?> getLibStatut(3); ?> ">transnoentitiesnoconv("RemoveLink")); ?>
- \ No newline at end of file diff --git a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php index 96b014e2cab..4cb232add74 100644 --- a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php +++ b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php @@ -28,18 +28,7 @@ $langs = $GLOBALS['langs']; $linkedObjectBlock = $GLOBALS['linkedObjectBlock']; $langs->load("orders"); -echo '
'; -print load_fiche_titre($langs->trans('RelatedSupplierOrders'), '', ''); -?> - - - - - - - - - $objectlink) @@ -47,7 +36,9 @@ foreach($linkedObjectBlock as $key => $objectlink) $var=!$var; ?> > + + - - - - - - -
trans("Ref"); ?>trans("Date"); ?>trans("AmountHTShort"); ?>trans("Status"); ?>
trans("SupplierOrder"); ?> trans("ShowOrder"),"order").' '.$objectlink->ref; ?>ref_supplier; ?> date,'day'); ?> rights->fournisseur->commande->lire) { @@ -59,17 +50,6 @@ foreach($linkedObjectBlock as $key => $objectlink)
trans("TotalHT"); ?>rights->fournisseur->commande->lire) { - echo price($total); - } ?>
diff --git a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php index 10a83ade2f9..6762d836d52 100644 --- a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php +++ b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php @@ -29,20 +29,7 @@ $langs = $GLOBALS['langs']; $linkedObjectBlock = $GLOBALS['linkedObjectBlock']; $langs->load("bills"); -echo '
'; -print load_fiche_titre($langs->trans("RelatedSupplierInvoices"), '', ''); -?> - - - - - - - - - - $objectlink) @@ -50,6 +37,7 @@ foreach($linkedObjectBlock as $key => $objectlink) $var=!$var; ?> > + @@ -64,15 +52,5 @@ foreach($linkedObjectBlock as $key => $objectlink) - - - - - - -
trans("Ref"); ?>trans("RefSupplier"); ?>trans("Date"); ?>trans("AmountHTShort"); ?>trans("Status"); ?>
trans("SupplierInvoice"); ?> trans("ShowBill"),"bill").' '.$objectlink->ref; ?> ref_supplier; ?> date,'day'); ?>
trans("TotalHT"); ?>rights->fournisseur->facture->lire) { - echo price($total); - } ?>
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index e4f165be298..6c4ae8c18da 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -746,6 +746,7 @@ TooManyRecordForMassAction=Too many records selected for mass action. Such actio MassFilesArea=Area for files built by mass actions HideTempMassFilesArea=Hide area of files built by mass actions ShowTempMassFilesArea=Show area of files built by mass actions +RelatedObjects=Related Objects # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php b/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php index f0fa870d3de..d0b1b19278a 100644 --- a/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php +++ b/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php @@ -28,27 +28,15 @@ global $user; $langs = $GLOBALS['langs']; $linkedObjectBlock = $GLOBALS['linkedObjectBlock']; -echo '
'; -print load_fiche_titre($langs->trans('RelatedSupplierProposal'), '', ''); -?> - - - - - - - - - - $objectlink) { $var=!$var; ?> - > + > + + - - - - - - -
trans("Ref"); ?>trans("Date"); ?>trans("AmountHTShort"); ?>trans("Status"); ?>
- trans("ShowSupplierProposal"),"supplier_proposal").' '.$objectlink->ref; ?>
trans("SupplierProposal"); ?>trans("ShowSupplierProposal"),"supplier_proposal").' '.$objectlink->ref; ?> datec,'day'); ?> $objectlink)
trans('TotalHT'); ?>rights->supplier_proposal->lire) { - echo price($total); - } ?>