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

NEW Merge all boxes "related objects" into one. This save a lot of room

Browse Source 
on most card and avoid often horizontal scoll.
This commit is contained in:
Laurent Destailleur 2016-03-30 19:18:31 +02:00
parent a36abd43fd
commit 2d9c53fc26
14 changed files with 61 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
View File

@ -33,19 +33,8 @@ global $user;
$langs = $GLOBALS['langs'];
$linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
echo '<br>';
print load_fiche_titre($langs->trans('RelatedCommercialProposals'), '', '');
?>
<table class="noborder allwidth">
<tr class="liste_titre">
<td><?php echo $langs->trans("Ref"); ?></td>
<td><?php echo $langs->trans('RefCustomer'); ?></td>
<td align="center"><?php echo $langs->trans("Date"); ?></td>
<td align="right"><?php echo $langs->trans("AmountHTShort"); ?></td>
<td align="right"><?php echo $langs->trans("Status"); ?></td>
<td></td>
</tr>
<?php
$langs->load("propal");
$var=true;
$total=0;
foreach($linkedObjectBlock as $key => $objectlink)
@ -53,6 +42,7 @@ foreach($linkedObjectBlock as $key => $objectlink)
$var=!$var;
?>
<tr <?php echo $bc[$var]; ?> >
<td><?php echo $langs->trans("Proposal"); ?></td>
<td><?php echo $objectlink->getNomUrl(1); ?></td>
<td><?php echo $objectlink->ref_client; ?></td>
<td align="center"><?php echo dol_print_date($objectlink->date,'day'); ?></td>
@ -66,17 +56,6 @@ foreach($linkedObjectBlock as $key => $objectlink)
</tr>
<?php
}
?>
<tr class="liste_total">
<td align="left" colspan="3"><?php echo $langs->trans('TotalHT'); ?></td>
<td align="right"><?php
if ($user->rights->propale->lire) {
echo price($total);
} ?></td>
<td></td>
<td></td>
</tr>
</table>
<!-- END PHP TEMPLATE -->

26
htdocs/commande/tpl/linkedobjectblock.tpl.php
View File

@ -27,22 +27,8 @@ global $user;
$langs = $GLOBALS['langs'];
$linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
$langs->load("orders");
echo '<br>';
print load_fiche_titre($langs->trans('RelatedCustomerOrders'), '', '');
?>
<table class="noborder allwidth">
<tr class="liste_titre">
<td><?php echo $langs->trans("Ref"); ?></td>
<td align="center"><?php echo $langs->trans("RefCustomer"); ?></td>
<td align="center"><?php echo $langs->trans("Date"); ?></td>
<td align="right"><?php echo $langs->trans("AmountHTShort"); ?></td>
<td align="right"><?php echo $langs->trans("Status"); ?></td>
<td></td>
</tr>
<?php
$var=true;
$total=0;
foreach($linkedObjectBlock as $key => $objectlink)
@ -50,6 +36,7 @@ foreach($linkedObjectBlock as $key => $objectlink)
$var=!$var;
?>
<tr <?php echo $GLOBALS['bc'][$var]; ?> >
<td><?php echo $langs->trans("CustomerOrder"); ?></td>
<td><?php echo $objectlink->getNomUrl(1); ?></td>
<td align="center"><?php echo $objectlink->ref_client; ?></td>
<td align="center"><?php echo dol_print_date($objectlink->date,'day'); ?></td>
@ -63,17 +50,6 @@ foreach($linkedObjectBlock as $key => $objectlink)
</tr>
<?php
}
?>
<tr class="liste_total">
<td align="left" colspan="3"><?php echo $langs->trans('TotalHT'); ?></td>
<td align="right"><?php
if ($user->rights->commande->lire) {
echo price($total);
} ?></td>
<td></td>
<td></td>
</tr>
</table>
<!-- END PHP TEMPLATE -->

2
htdocs/compta/facture/fiche-rec.php
View File

@ -619,7 +619,7 @@ else
print "<tr><td>".$langs->trans("Author").'</td><td colspan="3">'.$author->getFullName($langs)."</td></tr>";
print '<tr><td>'.$langs->trans("AmountHT").'</td>';
print '<td colspan="3"><b>'.price($object->total_ht,'',$langs,1,-1,-1,$conf->currency).'</b></td>';
print '<td colspan="3">'.price($object->total_ht,'',$langs,1,-1,-1,$conf->currency).'</td>';
print '</tr>';
print '<tr><td>'.$langs->trans("AmountVAT").'</td><td colspan="3">'.price($object->total_tva,'',$langs,1,-1,-1,$conf->currency).'</td>';

26
htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
View File

@ -27,21 +27,8 @@ global $user;
$langs = $GLOBALS['langs'];
$linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
$langs->load("bills");
echo '<br>';
print load_fiche_titre($langs->trans("RelatedCustomerInvoices"), '', '');
?>
<table class="noborder allwidth">
<tr class="liste_titre">
<td><?php echo $langs->trans("Ref"); ?></td>
<td align="center"><?php echo $langs->trans("RefCustomer"); ?></td>
<td align="center"><?php echo $langs->trans("Date"); ?></td>
<td align="right"><?php echo $langs->trans("AmountHTShort"); ?></td>
<td align="right"><?php echo $langs->trans("Status"); ?></td>
<td></td>
</tr>
<?php
$var=true;
$total=0;
foreach($linkedObjectBlock as $key => $objectlink)
@ -49,6 +36,7 @@ foreach($linkedObjectBlock as $key => $objectlink)
$var=!$var;
?>
<tr <?php echo $GLOBALS['bc'][$var]; ?> >
<td><?php echo $langs->trans("CustomerInvoice"); ?></td>
<td><?php echo $objectlink->getNomUrl(1); ?></td>
<td align="center"><?php echo $objectlink->ref_client; ?></td>
<td align="center"><?php echo dol_print_date($objectlink->date,'day'); ?></td>
@ -63,15 +51,5 @@ foreach($linkedObjectBlock as $key => $objectlink)
<?php
}
?>
<tr class="liste_total">
<td align="left" colspan="3"><?php echo $langs->trans("TotalHT"); ?></td>
<td align="right"><?php
if ($user->rights->facture->lire) {
echo price($total);
} ?></td>
<td></td>
<td></td>
</tr>
</table>
<!-- END PHP TEMPLATE -->

23
htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
View File

@ -27,21 +27,8 @@ global $user;
$langs = $GLOBALS['langs'];
$linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
$langs->load("bills");
echo '<br>';
print load_fiche_titre($langs->trans("RelatedRecurringCustomerInvoices"), '', '');
?>
<table class="noborder allwidth">
<tr class="liste_titre">
<td><?php echo $langs->trans("Ref"); ?></td>
<!-- <td align="center"><?php echo $langs->trans("RefCustomer"); ?></td>
<td align="center"><?php echo $langs->trans("Date"); ?></td>-->
<td align="right"><?php echo $langs->trans("AmountHTShort"); ?></td>
<!-- <td align="right"><?php echo $langs->trans("Status"); ?></td> -->
<td></td>
</tr>
<?php
$var=true;
$total=0;
foreach($linkedObjectBlock as $key => $objectlink)
@ -49,20 +36,20 @@ foreach($linkedObjectBlock as $key => $objectlink)
$var=!$var;
?>
<tr <?php echo $GLOBALS['bc'][$var]; ?> >
<td><?php echo $langs->trans("RepeatableInvoice"); ?></td>
<td><?php echo $objectlink->getNomUrl(1); ?></td>
<!-- <td align="center"><?php echo $objectlink->ref_client; ?></td>
<td align="center"><?php echo dol_print_date($objectlink->date,'day'); ?></td> -->
<td align="center"></td>
<td align="center"><?php echo dol_print_date($objectlink->date,'day'); ?></td>
<td align="right"><?php
if ($user->rights->facture->lire) {
$total = $total + $objectlink->total_ht;
echo price($objectlink->total_ht);
} ?></td>
<!-- <td align="right"><?php echo $objectlink->getLibStatut(3); ?></td> -->
<td align="right"></td>
<td align="right"><a href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_delete($langs->transnoentitiesnoconv("RemoveLink")); ?></a></td>
</tr>
<?php
}
?>
</table>
<!-- END PHP TEMPLATE -->

19
htdocs/contrat/tpl/linkedobjectblock.tpl.php
View File

@ -21,22 +21,13 @@
<?php
global $user;
$langs = $GLOBALS['langs'];
$linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
$langs->load("contracts");
echo '<br>';
print load_fiche_titre($langs->trans('RelatedContracts'), '', '');
?>
<table class="noborder allwidth">
<tr class="liste_titre">
<td><?php echo $langs->trans("Ref"); ?></td>
<td align="center"><?php echo $langs->trans("Date"); ?></td>
<td align="right">&nbsp;</td>
<td align="right"><?php echo $langs->trans("Status"); ?></td>
<td></td>
</tr>
<?php
$var=true;
foreach($linkedObjectBlock as $key => $objectlink)
{
@ -44,7 +35,9 @@ foreach($linkedObjectBlock as $key => $objectlink)
$var=!$var;
?>
<tr <?php echo $bc[$var]; ?> >
<td><?php echo $langs->trans("Contract"); ?></td>
<td><?php echo $objectlink->getNomUrl(1); ?></td>
<td></td>
<td align="center"><?php echo dol_print_date($objectlink->date_contrat,'day'); ?></td>
<td align="right">&nbsp;</td>
<td align="right"><?php echo $objectlink->getLibStatut(6); ?></td>
@ -52,6 +45,4 @@ foreach($linkedObjectBlock as $key => $objectlink)
</tr>
<?php } ?>
</table>
<!-- END PHP TEMPLATE -->

28
htdocs/core/class/html.form.class.php
View File

@ -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 '<br>';
print load_fiche_titre($langs->trans('RelatedObjects'), '', '');
print '<table class="noborder allwidth">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Type").'</td>';
print '<td>'.$langs->trans("Ref").'</td>';
print '<td align="center"></td>';
print '<td align="center">'.$langs->trans("Date").'</td>';
print '<td align="right">'.$langs->trans("AmountHTShort").'</td>';
print '<td align="right">'.$langs->trans("Status").'</td>';
print '<td></td>';
print '</tr>';
}
// 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 '</table>';
}
return $num;
}
}

28
htdocs/expedition/tpl/linkedobjectblock.tpl.php
View File

@ -28,20 +28,7 @@ $langs = $GLOBALS['langs'];
$linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
$langs->load("sendings");
echo '<br>';
print load_fiche_titre($langs->trans('RelatedShippings'), '', '');
?>
<table class="noborder allwidth">
<tr class="liste_titre">
<td><?php echo $langs->trans("Ref"); ?></td>
<td align="center"><?php echo $langs->trans("Date"); ?></td>
<td align="center"><?php echo $langs->trans("DateDeliveryPlanned"); ?></td>
<td align="right"><?php echo $langs->trans(""); ?></td>
<td align="right"><?php echo $langs->trans("Status"); ?></td>
<td></td>
</tr>
<?php
$total=0;
$var=true;
foreach($linkedObjectBlock as $key => $objectlink)
@ -49,8 +36,8 @@ foreach($linkedObjectBlock as $key => $objectlink)
$var=!$var;
?>
<tr <?php echo $GLOBALS['bc'][$var]; ?> >
<td><?php echo $langs->trans("Shipment"); ?></td>
<td><?php echo $objectlink->getNomUrl(1); ?></td>
<td align="center"><?php echo dol_print_date($objectlink->date_creation,'day'); ?></td>
<td align="center"><?php echo dol_print_date($objectlink->date_delivery,'day'); ?></td>
<td align="right"><?php
/*if ($user->rights->expedition->lire) {
@ -62,19 +49,6 @@ foreach($linkedObjectBlock as $key => $objectlink)
</tr>
<?php
}
?>
<!--
<tr class="liste_total">
<td align="left" colspan="3"><?php echo $langs->trans('TotalHT'); ?></td>
<td align="right"><?php
/*if ($user->rights->expedition->lire) {
echo price($total);
}*/ ?></td>
<td></td>
<td></td>
</tr>
-->
</table>
<!-- END PHP TEMPLATE -->

25
htdocs/expensereport/tpl/linkedobjectblock.tpl.php
View File

@ -29,18 +29,7 @@ $langs = $GLOBALS['langs'];
$linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
$langs->load("expensereports");
echo '<br>';
print_titre($langs->trans("RelatedExpenseReports"));
?>
<table class="noborder allwidth">
<tr class="liste_titre">
<td><?php echo $langs->trans("Ref"); ?></td>
<td align="center"><?php echo $langs->trans("Date"); ?></td>
<td align="right"><?php echo $langs->trans("AmountHTShort"); ?></td>
<td align="right"><?php echo $langs->trans("Status"); ?></td>
<td></td>
</tr>
<?php
$var=true;
$total=0;
foreach($linkedObjectBlock as $key => $objectlink)
@ -48,7 +37,9 @@ foreach($linkedObjectBlock as $key => $objectlink)
$var=!$var;
?>
<tr <?php echo $GLOBALS['bc'][$var]; ?> >
<td><?php echo $langs->trans("ExpenseReport"); ?></td>
<td><?php echo $objectlink->getNomUrl(1); ?></td>
<td></td>
<td align="center"><?php echo dol_print_date($objectlink->date_debut,'day'); ?></td>
<td align="right"><?php
if ($user->rights->expensereport->lire) {
@ -61,15 +52,5 @@ foreach($linkedObjectBlock as $key => $objectlink)
<?php
}
?>
<tr class="liste_total">
<td align="left" colspan="3"><?php echo $langs->trans("TotalHT"); ?></td>
<td align="right"><?php
if ($user->rights->expensereport->lire) {
echo price($total);
} ?></td>
<td></td>
<td></td>
</tr>
</table>
<!-- END PHP TEMPLATE -->

19
htdocs/fichinter/tpl/linkedobjectblock.tpl.php
View File

@ -21,38 +21,29 @@
<?php
global $user;
$langs = $GLOBALS['langs'];
$linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
$langs->load("interventions");
echo '<br>';
print load_fiche_titre($langs->trans('RelatedInterventions'), '', '');
?>
<table class="noborder allwidth">
<tr class="liste_titre">
<td><?php echo $langs->trans("Ref"); ?></td>
<td align="center"><?php echo $langs->trans("Date"); ?></td>
<td align="right"><?php echo $langs->trans("Status"); ?></td>
<td></td>
</tr>
<?php
$var=true;
foreach($linkedObjectBlock as $key => $objectlink)
{
$var=!$var;
?>
<tr <?php echo $GLOBALS['bc'][$var]; ?> >
<td><?php echo $langs->trans("Intervention"); ?></td>
<td><?php echo $objectlink->getNomUrl(1); ?></td>
<td></td>
<td align="center"><?php echo dol_print_date($objectlink->datev,'day'); ?></td>
<td></td>
<td align="right"><?php echo $objectlink->getLibStatut(3); ?></td>
<td align="right"><a href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_delete($langs->transnoentitiesnoconv("RemoveLink")); ?></a></td>
</tr>
<?php
}
?>
</table>
<!-- END PHP TEMPLATE -->

26
htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
View File

@ -28,18 +28,7 @@ $langs = $GLOBALS['langs'];
$linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
$langs->load("orders");
echo '<br>';
print load_fiche_titre($langs->trans('RelatedSupplierOrders'), '', '');
?>
<table class="noborder allwidth">
<tr class="liste_titre">
<td><?php echo $langs->trans("Ref"); ?></td>
<td align="center"><?php echo $langs->trans("Date"); ?></td>
<td align="right"><?php echo $langs->trans("AmountHTShort"); ?></td>
<td align="right"><?php echo $langs->trans("Status"); ?></td>
<td></td>
</tr>
<?php
$total=0;
$var=true;
foreach($linkedObjectBlock as $key => $objectlink)
@ -47,7 +36,9 @@ foreach($linkedObjectBlock as $key => $objectlink)
$var=!$var;
?>
<tr <?php echo $bc[$var]; ?> >
<td><?php echo $langs->trans("SupplierOrder"); ?></td>
<td><a href="<?php echo DOL_URL_ROOT.'/fourn/commande/card.php?id='.$objectlink->id ?>"><?php echo img_object($langs->trans("ShowOrder"),"order").' '.$objectlink->ref; ?></a></td>
<td align="left"><?php echo $objectlink->ref_supplier; ?></td>
<td align="center"><?php echo dol_print_date($objectlink->date,'day'); ?></td>
<td align="right"><?php
if ($user->rights->fournisseur->commande->lire) {
@ -59,17 +50,6 @@ foreach($linkedObjectBlock as $key => $objectlink)
</tr>
<?php
}
?>
<tr class="liste_total">
<td align="left" colspan="2"><?php echo $langs->trans("TotalHT"); ?></td>
<td align="right"><?php
if ($user->rights->fournisseur->commande->lire) {
echo price($total);
} ?></td>
<td></td>
<td></td>
</tr>
</table>
<!-- END PHP TEMPLATE -->

24
htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
View File

@ -29,20 +29,7 @@ $langs = $GLOBALS['langs'];
$linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
$langs->load("bills");
echo '<br>';
print load_fiche_titre($langs->trans("RelatedSupplierInvoices"), '', '');
?>
<table class="noborder allwidth">
<tr class="liste_titre">
<td><?php echo $langs->trans("Ref"); ?></td>
<td align="left"><?php echo $langs->trans("RefSupplier"); ?></td>
<td align="center"><?php echo $langs->trans("Date"); ?></td>
<td align="right"><?php echo $langs->trans("AmountHTShort"); ?></td>
<td align="right"><?php echo $langs->trans("Status"); ?></td>
<td></td>
</tr>
<?php
$total=0;
$var=true;
foreach($linkedObjectBlock as $key => $objectlink)
@ -50,6 +37,7 @@ foreach($linkedObjectBlock as $key => $objectlink)
$var=!$var;
?>
<tr <?php echo $bc[$var]; ?> >
<td><?php echo $langs->trans("SupplierInvoice"); ?></td>
<td><a href="<?php echo DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$objectlink->id ?>"><?php echo img_object($langs->trans("ShowBill"),"bill").' '.$objectlink->ref; ?></a></td>
<td align="left"><?php echo $objectlink->ref_supplier; ?></td>
<td align="center"><?php echo dol_print_date($objectlink->date,'day'); ?></td>
@ -64,15 +52,5 @@ foreach($linkedObjectBlock as $key => $objectlink)
<?php
}
?>
<tr class="liste_total">
<td align="left" colspan="3"><?php echo $langs->trans("TotalHT"); ?></td>
<td align="right"><?php
if ($user->rights->fournisseur->facture->lire) {
echo price($total);
} ?></td>
<td></td>
<td></td>
</tr>
</table>
<!-- END PHP TEMPLATE -->

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

@ -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

29
htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
View File

@ -28,27 +28,15 @@ global $user;
$langs = $GLOBALS['langs'];
$linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
echo '<br>';
print load_fiche_titre($langs->trans('RelatedSupplierProposal'), '', '');
?>
<table class="noborder allwidth">
<tr class="liste_titre">
<td><?php echo $langs->trans("Ref"); ?></td>
<td></td>
<td align="center"><?php echo $langs->trans("Date"); ?></td>
<td align="right"><?php echo $langs->trans("AmountHTShort"); ?></td>
<td align="right"><?php echo $langs->trans("Status"); ?></td>
<td></td>
</tr>
<?php
$var=true;
$total=0;
foreach($linkedObjectBlock as $key => $objectlink)
{
$var=!$var;
?>
<tr <?php echo $bc[$var]; ?> ><td>
<a href="<?php echo DOL_URL_ROOT.'/supplier_proposal/card.php?id='.$objectlink->id ?>"><?php echo img_object($langs->trans("ShowSupplierProposal"),"supplier_proposal").' '.$objectlink->ref; ?></a></td>
<tr <?php echo $bc[$var]; ?> >
<td align="center"><?php echo $langs->trans("SupplierProposal"); ?></td>
<td><a href="<?php echo DOL_URL_ROOT.'/supplier_proposal/card.php?id='.$objectlink->id ?>"><?php echo img_object($langs->trans("ShowSupplierProposal"),"supplier_proposal").' '.$objectlink->ref; ?></a></td>
<td></td>
<td align="center"><?php echo dol_print_date($objectlink->datec,'day'); ?></td>
<td align="right"><?php
@ -61,17 +49,6 @@ foreach($linkedObjectBlock as $key => $objectlink)
</tr>
<?php
}
?>
<tr class="liste_total">
<td align="left" colspan="3"><?php echo $langs->trans('TotalHT'); ?></td>
<td align="right"><?php
if ($user->rights->supplier_proposal->lire) {
echo price($total);
} ?></td>
<td></td>
<td></td>
</tr>
</table>
<!-- END PHP TEMPLATE -->