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

Place le lien "Recap historique" sous rsum compta

Browse Source
This commit is contained in:
Laurent Destailleur 2005-06-25 15:52:01 +00:00
parent e5f0dc9efb
commit 554df26680
4 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
htdocs/compta/fiche.php
View File

@ -187,11 +187,6 @@ if ($socid > 0)
$head[$h][0] = DOL_URL_ROOT.'/compta/fiche.php?socid='.$societe->id;
$head[$h][1] = $langs->trans("Accountancy");
$h++;
$head[$h][0] = DOL_URL_ROOT.'/compta/recap-client.php?socid='.$societe->id;
$head[$h][1] = $langs->trans("Recap");
$h++;
}
$head[$h][0] = DOL_URL_ROOT.'/socnote.php?socid='.$societe->id;
@ -215,6 +210,7 @@ if ($socid > 0)
$head[$h][1] = '<img border="0" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/bookmark.png" alt="Bookmark" title="Bookmark">';
$head[$h][2] = 'image';
}
dolibarr_fiche_head($head, $hselected, $societe->nom);
/*
@ -244,7 +240,7 @@ if ($socid > 0)
print "</td></tr>";
print '<tr><td>'.$langs->trans("AccountancyCode").'</td><td>'.$societe->code_compta.'</td>';
print '<tr><td nowrap>'.$langs->trans("AccountancyCode").'</td><td>'.$societe->code_compta.'</td>';
print '<td>'.$langs->trans("CustomerCode").'/' . $langs->trans("SupplierCode") . '</td><td>';
print $societe->code_client;
print "</td></tr>";
@ -358,6 +354,14 @@ if ($socid > 0)
print "</table>";
}
// Lien recap
print '<br>';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td colspan="4"><table width="100%" class="noborder"><tr><td>'.$langs->trans("Summary").'</td><td align="right"><a href="'.DOL_URL_ROOT.'/compta/recap-client.php?socid='.$societe->id.'">'.$langs->trans("ShowLog").'</td></tr></table></td>';
print '</tr>';
print '</table>';
print "</td></tr>";
print "</table></div>\n";
@ -382,6 +386,8 @@ if ($socid > 0)
}
}
print "<a class=\"tabAction\" href=\"".DOL_URL_ROOT.'/contact/fiche.php?socid='.$socid."&amp;action=create\">".$langs->trans("AddContact")."</a>";
print '</div>';
print "<br>\n";
@ -416,7 +422,7 @@ if ($socid > 0)
print '<tr class="liste_titre"><td>'.$langs->trans("Firstname").' '.$langs->trans("Lastname").'</td>';
print '<td>'.$langs->trans("Poste").'</td><td>'.$langs->trans("Tel").'</td>';
print '<td>'.$langs->trans("Fax").'</td><td>'.$langs->trans("EMail").'</td>';
print "<td align=\"center\"><a href=\"".DOL_URL_ROOT.'/contact/fiche.php?socid='.$socid."&amp;action=create\">".$langs->trans("AddContact")."</a></td>";
print "<td align=\"center\">&nbsp;</td>";
print '<td>&nbsp;</td>';
print "</tr>";

20
htdocs/compta/recap-client.php
View File

@ -48,6 +48,7 @@ $user->getrights('facture');
llxHeader();
/*
*
* Mode fiche
@ -58,6 +59,9 @@ if ($socid > 0)
$societe = new Societe($db);
$societe->fetch($socid, $to); // si $to='next' ajouter " AND s.idp > $socid ORDER BY idp ASC LIMIT 1";
/*
* Affichage onglets
*/
/*
* Affichage onglets
*/
@ -86,17 +90,12 @@ if ($socid > 0)
$h++;
}
if ($conf->compta->enabled)
{
if ($conf->compta->enabled) {
$langs->load("compta");
$hselected=$h;
$head[$h][0] = DOL_URL_ROOT.'/compta/fiche.php?socid='.$societe->id;
$head[$h][1] = $langs->trans("Accountancy");
$h++;
$head[$h][0] = DOL_URL_ROOT.'/compta/recap-client.php?socid='.$societe->id;
$head[$h][1] = $langs->trans("Recap");
$hselected=$h;
$h++;
}
$head[$h][0] = DOL_URL_ROOT.'/socnote.php?socid='.$societe->id;
@ -110,12 +109,17 @@ if ($socid > 0)
$h++;
}
$head[$h][0] = DOL_URL_ROOT.'/societe/notify/fiche.php?socid='.$societe->id;
$head[$h][1] = $langs->trans("Notifications");
$h++;
if ($user->societe_id == 0)
{
$head[$h][0] = DOL_URL_ROOT."/index.php?socidp=$societe->id&action=add_bookmark";
$head[$h][1] = '<img border="0" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/bookmark.png" alt="Bookmark" title="Bookmark">';
$head[$h][2] = 'image';
}
dolibarr_fiche_head($head, $hselected, $societe->nom);
/*
@ -131,6 +135,8 @@ if ($socid > 0)
print '<tr><td>'.$langs->trans('Zip').'</td><td>'.$societe->cp.'</td>';
print '<td>'.$langs->trans('Town').'</td><td>'.$societe->ville.'</td></tr>';
print '<tr><td>'.$langs->trans('Country').'</td><td colspan="3">'.$soc->pays.'</td>';
print '<tr><td>'.$langs->trans("Phone").'</td><td>'.$societe->tel.'&nbsp;</td><td>Fax</td><td>'.$societe->fax.'&nbsp;</td></tr>';
print '<tr><td nowrap>'.$langs->transcountry("ProfId1",$societe->pays_code).'</td><td><a href="http://www.societe.com/cgi-bin/recherche?rncs='.$societe->siren.'">'.$societe->siren.'</a>&nbsp;</td>';

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

@ -229,4 +229,5 @@ ReportDescription=Description
Report=Report
Keyword=Mot clé
Legend=Legend
FillTownFromZip=Fill town from zip
FillTownFromZip=Fill town from zip
ShowLog=Show log

3
htdocs/langs/fr_FR/main.lang
View File

@ -229,4 +229,5 @@ ReportDescription=Description
Report=Rapport
Keyword=Mot clé
Legend=Légende
FillTownFromZip=Renseigner ville
FillTownFromZip=Renseigner ville
ShowLog=Afficher historique