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

Ajout nbre de commande et propal un contact est li

Browse Source
This commit is contained in:
Laurent Destailleur 2006-06-11 03:12:32 +00:00
parent 3d0ea3ce28
commit eafcb26711
5 changed files with 54 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/contact/exportimport.php
View File

@ -125,7 +125,7 @@ print '<tr><td>'.$langs->trans("UserTitle").'</td><td colspan="3">';
print $form->civilite_name($contact->civilite_id); print $form->civilite_name($contact->civilite_id);
print '</td></tr>'; print '</td></tr>';
print '<tr><td width="15%">'.$langs->trans("Lastname").'</td><td>'.$contact->name.'</td>'; print '<tr><td width="20%">'.$langs->trans("Lastname").'</td><td>'.$contact->name.'</td>';
print '<td width="20%">'.$langs->trans("Firstname").'</td><td width="25%">'.$contact->firstname.'</td></tr>'; print '<td width="20%">'.$langs->trans("Firstname").'</td><td width="25%">'.$contact->firstname.'</td></tr>';
print '</table>'; print '</table>';

42
htdocs/contact/fiche.php
View File

@ -409,10 +409,17 @@ if ($user->rights->societe->contact->creer)
$contact->load_ref_elements(); $contact->load_ref_elements();
if ($conf->facture->enabled) if ($conf->commande->enabled)
{ {
print '<tr><td>'.$langs->trans("ContactForInvoices").'</td><td colspan="3">'; print '<tr><td>'.$langs->trans("ContactForOrders").'</td><td colspan="3">';
print $contact->ref_facturation?$contact->ref_facturation:$langs->trans("NoContactForAnyInvoice"); print $contact->ref_commande?$contact->ref_commande:$langs->trans("NoContactForAnyOrder");
print '</td></tr>';
}
if ($conf->propal->enabled)
{
print '<tr><td>'.$langs->trans("ContactForProposals").'</td><td colspan="3">';
print $contact->ref_propal?$contact->ref_propal:$langs->trans("NoContactForAnyProposal");
print '</td></tr>'; print '</td></tr>';
} }
@ -423,6 +430,13 @@ if ($user->rights->societe->contact->creer)
print '</td></tr>'; print '</td></tr>';
} }
if ($conf->facture->enabled)
{
print '<tr><td>'.$langs->trans("ContactForInvoices").'</td><td colspan="3">';
print $contact->ref_facturation?$contact->ref_facturation:$langs->trans("NoContactForAnyInvoice");
print '</td></tr>';
}
print '<tr><td>'.$langs->trans("DolibarrLogin").'</td><td colspan="3">'; print '<tr><td>'.$langs->trans("DolibarrLogin").'</td><td colspan="3">';
if ($contact->user_id) print '<a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$contact->user_id.'">'.$contact->user_login.'</a>'; if ($contact->user_id) print '<a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$contact->user_id.'">'.$contact->user_login.'</a>';
else print $langs->trans("NoDolibarrAccess"); else print $langs->trans("NoDolibarrAccess");
@ -462,7 +476,7 @@ if ($_GET["id"] && $_GET["action"] != 'edit')
print $form->civilite_name($contact->civilite_id); print $form->civilite_name($contact->civilite_id);
print '</td></tr>'; print '</td></tr>';
print '<tr><td width="15%">'.$langs->trans("Lastname").'</td><td>'.$contact->name.'</td>'; print '<tr><td width="20%">'.$langs->trans("Lastname").'</td><td>'.$contact->name.'</td>';
print '<td width="20%">'.$langs->trans("Firstname").'</td><td width="25%">'.$contact->firstname.'</td></tr>'; print '<td width="20%">'.$langs->trans("Firstname").'</td><td width="25%">'.$contact->firstname.'</td></tr>';
print '<tr><td>Poste/Fonction</td><td colspan="3">'.$contact->poste.'</td>'; print '<tr><td>Poste/Fonction</td><td colspan="3">'.$contact->poste.'</td>';
@ -512,10 +526,17 @@ if ($_GET["id"] && $_GET["action"] != 'edit')
$contact->load_ref_elements(); $contact->load_ref_elements();
if ($conf->facture->enabled) if ($conf->commande->enabled)
{ {
print '<tr><td>'.$langs->trans("ContactForInvoices").'</td><td colspan="3">'; print '<tr><td>'.$langs->trans("ContactForOrders").'</td><td colspan="3">';
print $contact->ref_facturation?$contact->ref_facturation:$langs->trans("NoContactForAnyInvoice"); print $contact->ref_commande?$contact->ref_commande:$langs->trans("NoContactForAnyOrder");
print '</td></tr>';
}
if ($conf->propal->enabled)
{
print '<tr><td>'.$langs->trans("ContactForProposals").'</td><td colspan="3">';
print $contact->ref_propal?$contact->ref_propal:$langs->trans("NoContactForAnyProposal");
print '</td></tr>'; print '</td></tr>';
} }
@ -526,6 +547,13 @@ if ($_GET["id"] && $_GET["action"] != 'edit')
print '</td></tr>'; print '</td></tr>';
} }
if ($conf->facture->enabled)
{
print '<tr><td>'.$langs->trans("ContactForInvoices").'</td><td colspan="3">';
print $contact->ref_facturation?$contact->ref_facturation:$langs->trans("NoContactForAnyInvoice");
print '</td></tr>';
}
print '<tr><td>'.$langs->trans("DolibarrLogin").'</td><td colspan="3">'; print '<tr><td>'.$langs->trans("DolibarrLogin").'</td><td colspan="3">';
if ($contact->user_id) print '<a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$contact->user_id.'">'.$contact->user_login.'</a>'; if ($contact->user_id) print '<a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$contact->user_id.'">'.$contact->user_login.'</a>';
else print $langs->trans("NoDolibarrAccess"); else print $langs->trans("NoDolibarrAccess");

12
htdocs/contact/perso.php
View File

@ -143,11 +143,11 @@ if ($_GET["action"] == 'edit')
$objsoc = new Societe($db); $objsoc = new Societe($db);
$objsoc->fetch($contact->socid); $objsoc->fetch($contact->socid);
print '<tr><td width="15%">'.$langs->trans("Company").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td>'; print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td>';
} }
else else
{ {
print '<tr><td width="15%">'.$langs->trans("Company").'</td><td colspan="3">'; print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">';
print $langs->trans("ContactNotLinkedToCompany"); print $langs->trans("ContactNotLinkedToCompany");
print '</td></tr>'; print '</td></tr>';
} }
@ -156,7 +156,7 @@ if ($_GET["action"] == 'edit')
print $form->civilite_name($contact->civilite_id); print $form->civilite_name($contact->civilite_id);
print '</td></tr>'; print '</td></tr>';
print '<tr><td width="15%">'.$langs->trans("Lastname").'</td><td>'.$contact->nom.'</td>'; print '<tr><td width="20%">'.$langs->trans("Lastname").'</td><td>'.$contact->nom.'</td>';
print '<td width="20%">'.$langs->trans("Firstname").'</td><td width="25%">'.$contact->prenom.'</td>'; print '<td width="20%">'.$langs->trans("Firstname").'</td><td width="25%">'.$contact->prenom.'</td>';
@ -198,12 +198,12 @@ else
$objsoc = new Societe($db); $objsoc = new Societe($db);
$objsoc->fetch($contact->socid); $objsoc->fetch($contact->socid);
print '<tr><td width="15%">'.$langs->trans("Company").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td></tr>'; print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td></tr>';
} }
else else
{ {
print '<tr><td width="15%">'.$langs->trans("Company").'</td><td colspan="3">'; print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">';
print $langs->trans("ContactNotLinkedToCompany"); print $langs->trans("ContactNotLinkedToCompany");
print '</td></tr>'; print '</td></tr>';
} }
@ -212,7 +212,7 @@ else
print $form->civilite_name($contact->civilite_id); print $form->civilite_name($contact->civilite_id);
print '</td></tr>'; print '</td></tr>';
print '<tr><td width="15%">'.$langs->trans("Lastname").'</td><td>'.$contact->name.'</td>'; print '<tr><td width="20%">'.$langs->trans("Lastname").'</td><td>'.$contact->name.'</td>';
print '<td width="20%">'.$langs->trans("Firstname").'</td><td width="25%">'.$contact->firstname.'</td></tr>'; print '<td width="20%">'.$langs->trans("Firstname").'</td><td width="25%">'.$contact->firstname.'</td></tr>';
if ($contact->birthday && $contact->birthday > 0) { if ($contact->birthday && $contact->birthday > 0) {

8
htdocs/langs/en_US/companies.lang
View File

@ -108,10 +108,14 @@ ShowCompany=Show company
ShowContact=Show contact ShowContact=Show contact
ContactsAllShort=All ContactsAllShort=All
ContactType=Contact type ContactType=Contact type
ContactForInvoices=Invoices' contact ContactForOrders=Orders' contact
ContactForProposals=Proposals' contact
ContactForContracts=Contracts' contact ContactForContracts=Contracts' contact
NoContactForAnyInvoice=This contact is not contact for any invoice ContactForInvoices=Invoices' contact
NoContactForAnyOrder=This contact is not contact for any order
NoContactForAnyProposal=This contact is not contact for any commercial proposal
NoContactForAnyContract=This contact is not contact for any contract NoContactForAnyContract=This contact is not contact for any contract
NoContactForAnyInvoice=This contact is not contact for any invoice
NewContact=New contact NewContact=New contact
LastContacts=Last contacts LastContacts=Last contacts
MyContacts=My contacts MyContacts=My contacts

8
htdocs/langs/fr_FR/companies.lang
View File

@ -108,10 +108,14 @@ ShowCompany=Afficher soci
ShowContact=Afficher contact ShowContact=Afficher contact
ContactsAllShort=Tous ContactsAllShort=Tous
ContactType=Type de contact ContactType=Type de contact
ContactForInvoices=Contact de factures ContactForOrders=Contact de commandes
ContactForProposals=Contact de propositions
ContactForContracts=Contact de contrats ContactForContracts=Contact de contrats
NoContactForAnyInvoice=Ce contact n'est contact d'aucune facture ContactForInvoices=Contact de factures
NoContactForAnyOrder=Ce contact n'est contact d'aucune commande
NoContactForAnyProposal=Ce contact n'est contact d'aucune proposition commerciale
NoContactForAnyContract=Ce contact n'est contact d'aucun contrat NoContactForAnyContract=Ce contact n'est contact d'aucun contrat
NoContactForAnyInvoice=Ce contact n'est contact d'aucune facture
NewContact=Nouveau contact NewContact=Nouveau contact
LastContacts=Derniers contacts LastContacts=Derniers contacts
MyContacts=Mes contacts MyContacts=Mes contacts