diff --git a/htdocs/langs/en_US/commercial.lang b/htdocs/langs/en_US/commercial.lang index f2af1209f2d..896af3ba834 100644 --- a/htdocs/langs/en_US/commercial.lang +++ b/htdocs/langs/en_US/commercial.lang @@ -16,4 +16,8 @@ TaskRDV=Rendez-vous TaskRDVWith=Rendez-vous with %s SalesRepresentative=Sales representative ErrorWrongCode=Wrong code -NoSalesRepresentativeAffected=No particular sales representative affected \ No newline at end of file +NoSalesRepresentativeAffected=No particular sales representative affected +ShowCustomer=Show customer +ShowProspect=Show prospect +ListOfProspects=Prospects list +ListOfCustomers=Customers list diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index 15be3f324d8..d8d7c217381 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -47,4 +47,8 @@ SupplierCode=Supplier code CustomerAccount=Customer account SupplierAccount=Supplier account LastProspect=Last -CompanyDeleted=Company "%s" deleted from database. \ No newline at end of file +CompanyDeleted=Company "%s" deleted from database. +ListOfContacts=List of contacts +ListOfCompanies=List of companies +ShowCompany=Show company +ShowContact=Show contact \ No newline at end of file diff --git a/htdocs/langs/en_US/suppliers.lang b/htdocs/langs/en_US/suppliers.lang index 65ab924c0d0..4a628711e44 100644 --- a/htdocs/langs/en_US/suppliers.lang +++ b/htdocs/langs/en_US/suppliers.lang @@ -1,7 +1,10 @@ # Dolibarr language file - en_US - suppliers Suppliers=Suppliers +Supplier=Supplier AddSupplier=Add a supplier SupplierRemoved=Supplier removed -NewSupplier=Nes supplier +NewSupplier=New supplier History=History -OrderCard=Order card \ No newline at end of file +OrderCard=Order card +ListOfSuppliers=List of suppliers +ShowSupplier=Show supplier \ No newline at end of file diff --git a/htdocs/langs/fr_FR/commercial.lang b/htdocs/langs/fr_FR/commercial.lang index d264caaff28..39411fab1cb 100644 --- a/htdocs/langs/fr_FR/commercial.lang +++ b/htdocs/langs/fr_FR/commercial.lang @@ -17,3 +17,7 @@ TaskRDVWith=Rendez-vous avec %s SalesRepresentative=Commercial ErrorWrongCode=Code incorrect NoSalesRepresentativeAffected=Aucun commercial particulier affecté +ShowCustomer=Show customer +ShowProspect=Show prospect +ListOfProspects=Liste des prospects +ListOfCustomers=Liste des clients diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang index 02dcf795be9..c71c055ceaa 100644 --- a/htdocs/langs/fr_FR/companies.lang +++ b/htdocs/langs/fr_FR/companies.lang @@ -47,4 +47,8 @@ SupplierCode=Code fournisseur CustomerAccount=Compte client SupplierAccount=Compte fournisseur LastProspect=Derniers -CompanyDeleted=La société "%s" a été supprimée de la base. \ No newline at end of file +CompanyDeleted=La société "%s" a été supprimée de la base. +ListOfContacts=Liste des contacts +ListOfCompanies=Liste des sociétés +ShowCompany=Afficher société +ShowContact=Afficher contact \ No newline at end of file diff --git a/htdocs/langs/fr_FR/suppliers.lang b/htdocs/langs/fr_FR/suppliers.lang index 3162f0d8563..2373f9c3167 100644 --- a/htdocs/langs/fr_FR/suppliers.lang +++ b/htdocs/langs/fr_FR/suppliers.lang @@ -1,7 +1,10 @@ # Dolibarr language file - fr_FR - suppliers Suppliers=Fournisseurs +Supplier=Fournisseur AddSupplier=Ajouter un fournisseur SupplierRemoved=Fournisseur supprimé NewSupplier=Nouveau fournisseur History=Historique -OrderCard=Fiche commande \ No newline at end of file +OrderCard=Fiche commande +ListOfSuppliers=Liste des fournisseurs +ShowSupplier=Afficher fournisseur \ No newline at end of file diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php index 10fc65babd8..1a2fdbedea4 100644 --- a/htdocs/lib/functions.inc.php +++ b/htdocs/lib/functions.inc.php @@ -291,49 +291,50 @@ function dolibarr_print_object_info($object) /** \brief Formatage du telephone - \param phone numéro de telephone à formater - \return phone numéro de téléphone formaté - \remarks ne tient pas en compte le format belge 02/211 34 83 - \remarks formattage automatique des numero non formates - \remarks ajouté la prise en charge les numéros de 7, 9, 11 et 12 chiffres + \param phone Numéro de telephone à formater + \return phone Numéro de téléphone formaté + \remarks Ne tient pas en compte le format belge 02/211 34 83 + \remarks Formattage automatique des numero non formates */ -function dolibarr_print_phone($phone) +function dolibarr_print_phone($phone,$country="FR") { + $phone=trim($phone); if (strstr($phone, ' ')) { return $phone; } - if (strlen(trim($phone)) == 10) { - return substr($phone,0,2)." ".substr($phone,2,2)." ".substr($phone,4,2)." ".substr($phone,6,2)." ".substr($phone,8,2); + if (strtoupper($country) == "FR") { + // France + if (strlen($phone) == 10) { + return substr($phone,0,2)." ".substr($phone,2,2)." ".substr($phone,4,2)." ".substr($phone,6,2)." ".substr($phone,8,2); + } + elseif (strlen($phone) == 7) + { + return substr($phone,0,3)." ".substr($phone,3,2)." ".substr($phone,5,2); + } + elseif (strlen($phone) == 9) + { + return substr($phone,0,2)." ".substr($phone,2,3)." ".substr($phone,5,2)." ".substr($phone,7,2); + } + elseif (strlen($phone) == 11) + { + return substr($phone,0,3)." ".substr($phone,3,2)." ".substr($phone,5,2)." ".substr($phone,7,2)." ".substr($phone,9,2); + } + elseif (strlen($phone) == 12) + { + return substr($phone,0,4)." ".substr($phone,4,2)." ".substr($phone,6,2)." ".substr($phone,8,2)." ".substr($phone,10,2); + } } - elseif (strlen(trim($phone)) == 7) - { - return substr($phone,0,3)." ".substr($phone,3,2)." ".substr($phone,5,2); - } - elseif (strlen(trim($phone)) == 9) - { - return substr($phone,0,2)." ".substr($phone,2,3)." ".substr($phone,5,2)." ".substr($phone,7,2); - } - elseif (strlen(trim($phone)) == 11) - { - return substr($phone,0,3)." ".substr($phone,3,2)." ".substr($phone,5,2)." ".substr($phone,7,2)." ".substr($phone,9,2); - } - elseif (strlen(trim($phone)) == 12) - { - return substr($phone,0,4)." ".substr($phone,4,2)." ".substr($phone,6,2)." ".substr($phone,8,2)." ".substr($phone,10,2); - } - else - { return $phone; - } } /** - \brief Affiche logo dédié aux actions + \brief Affiche logo propre à une notion (fonction générique) + \param alt Texte sur le alt de l'image + \param object Objet pour lequel il faut afficher le logo (exemple: user, group, action, bill, contract, propal, product, ...) */ -function img_actions($alt = "default") +function img_object($alt, $object) { global $conf,$langs; - if ($alt=="default") $alt=$langs->trans("Rendez-vous"); - return ''.$alt.''; + return ''.$alt.''; } /** diff --git a/htdocs/theme/dev/img/object_company.png b/htdocs/theme/dev/img/object_company.png new file mode 100644 index 00000000000..2a582b8bd4c Binary files /dev/null and b/htdocs/theme/dev/img/object_company.png differ diff --git a/htdocs/theme/dev/img/object_contact.png b/htdocs/theme/dev/img/object_contact.png new file mode 100644 index 00000000000..7210d3944f4 Binary files /dev/null and b/htdocs/theme/dev/img/object_contact.png differ diff --git a/htdocs/theme/dev/img/object_group.png b/htdocs/theme/dev/img/object_group.png new file mode 100644 index 00000000000..291007906c5 Binary files /dev/null and b/htdocs/theme/dev/img/object_group.png differ diff --git a/htdocs/theme/dev/img/object_user.png b/htdocs/theme/dev/img/object_user.png new file mode 100644 index 00000000000..3899473afd2 Binary files /dev/null and b/htdocs/theme/dev/img/object_user.png differ diff --git a/htdocs/theme/dev/img/refresh.png b/htdocs/theme/dev/img/refresh.png new file mode 100644 index 00000000000..eb0388df4c3 Binary files /dev/null and b/htdocs/theme/dev/img/refresh.png differ diff --git a/htdocs/theme/freelug/img/object_action.png b/htdocs/theme/freelug/img/object_action.png new file mode 100644 index 00000000000..85815b7b01d Binary files /dev/null and b/htdocs/theme/freelug/img/object_action.png differ diff --git a/htdocs/theme/freelug/img/object_group.png b/htdocs/theme/freelug/img/object_group.png new file mode 100644 index 00000000000..291007906c5 Binary files /dev/null and b/htdocs/theme/freelug/img/object_group.png differ diff --git a/htdocs/theme/freelug/img/object_user.png b/htdocs/theme/freelug/img/object_user.png new file mode 100644 index 00000000000..3899473afd2 Binary files /dev/null and b/htdocs/theme/freelug/img/object_user.png differ diff --git a/htdocs/theme/freelug/img/refresh.png b/htdocs/theme/freelug/img/refresh.png new file mode 100644 index 00000000000..eb0388df4c3 Binary files /dev/null and b/htdocs/theme/freelug/img/refresh.png differ diff --git a/htdocs/theme/yellow/img/object_action.png b/htdocs/theme/yellow/img/object_action.png new file mode 100644 index 00000000000..85815b7b01d Binary files /dev/null and b/htdocs/theme/yellow/img/object_action.png differ diff --git a/htdocs/theme/yellow/img/object_company.png b/htdocs/theme/yellow/img/object_company.png new file mode 100644 index 00000000000..2a582b8bd4c Binary files /dev/null and b/htdocs/theme/yellow/img/object_company.png differ diff --git a/htdocs/theme/yellow/img/object_contact.png b/htdocs/theme/yellow/img/object_contact.png new file mode 100644 index 00000000000..7210d3944f4 Binary files /dev/null and b/htdocs/theme/yellow/img/object_contact.png differ diff --git a/htdocs/theme/yellow/img/object_group.png b/htdocs/theme/yellow/img/object_group.png new file mode 100644 index 00000000000..291007906c5 Binary files /dev/null and b/htdocs/theme/yellow/img/object_group.png differ diff --git a/htdocs/theme/yellow/img/object_user.png b/htdocs/theme/yellow/img/object_user.png new file mode 100644 index 00000000000..3899473afd2 Binary files /dev/null and b/htdocs/theme/yellow/img/object_user.png differ diff --git a/htdocs/theme/yellow/img/refresh.png b/htdocs/theme/yellow/img/refresh.png new file mode 100644 index 00000000000..eb0388df4c3 Binary files /dev/null and b/htdocs/theme/yellow/img/refresh.png differ