diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index c466d0acf9b..15be3f324d8 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -2,6 +2,7 @@ ErrorBadEMail=EMail %s is wrong ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one. ErrorPrefixAlreadyExists=Prefix %s already exists. Choose another one. +ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited informations ? MenuNewCompany=New company MenuNewCustomer=New customer MenuNewProspect=New prospect @@ -38,9 +39,12 @@ CustomerDiscount=Customer Discount Supplier=Supplier CompanyList=Companies' list AddContact=Add new contact +AddCompany=Add company +DeleteACompany=Delete a company PersonalInformations=Personal data CustomerCode=Customer code SupplierCode=Supplier code CustomerAccount=Customer account SupplierAccount=Supplier account -LastProspect=Last \ No newline at end of file +LastProspect=Last +CompanyDeleted=Company "%s" deleted from database. \ No newline at end of file diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang index 752b9bbec02..02dcf795be9 100644 --- a/htdocs/langs/fr_FR/companies.lang +++ b/htdocs/langs/fr_FR/companies.lang @@ -2,6 +2,7 @@ ErrorBadEMail=EMail %s invalide ErrorCompanyNameAlreadyExists=Le nom de société %s existe déjà. Choisissez-en une autre. ErrorPrefixAlreadyExists=Le prefix %s existe déjà. Choisissez-en un autre. +ConfirmDeleteCompany=Etes-vous sûr de vouloir supprimer cette société et toutes les informations qui en dépendent ? MenuNewCompany=Nouvelle société MenuNewCustomer=Nouveau client MenuNewProspect=Nouveau prospect @@ -38,9 +39,12 @@ CustomerDiscount=Remise client Supplier=Fournisseur CompanyList=Liste des sociétés AddContact=Ajouter contact +AddCompany=Ajouter sociétés +DeleteACompany=Supprimer une société PersonalInformations=Informations personnelles CustomerCode=Code client SupplierCode=Code fournisseur CustomerAccount=Compte client SupplierAccount=Compte fournisseur -LastProspect=Derniers \ No newline at end of file +LastProspect=Derniers +CompanyDeleted=La société "%s" a été supprimée de la base. \ No newline at end of file diff --git a/htdocs/soc.php b/htdocs/soc.php index d0c70d91b5f..de89d5b908f 100644 --- a/htdocs/soc.php +++ b/htdocs/soc.php @@ -112,7 +112,7 @@ if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == 'yes' && $user- if ($result == 0) { llxHeader(); - print "Société $soc->nom supprimée de la base"; + print '
'.$langs->trans("CompanyDeleted",$soc->nom).'
'; llxFooter(); exit ; } @@ -151,7 +151,7 @@ if ($_GET["action"] == 'create') if ($soc->error) { - print '
'; + print '
'; print nl2br($soc->error); print '
'; } @@ -386,21 +386,19 @@ else /* * Fiche société en mode visu */ - $html = new Form($db); - /* - * Confirmation de la suppression de la facture - * - */ + + // Confirmation de la suppression de la facture if ($_GET["action"] == 'delete') { - $html->form_confirm("soc.php?socid=".$soc->id,"Supprimer la société","Etes-vous sûr de vouloir supprimer cette société et tous ses contacts associés ?","confirm_delete"); + $html = new Form($db); + $html->form_confirm("soc.php?socid=".$soc->id,$langs->trans("DeleteACompany"),$langs->trans("ConfirmDeleteCompany"),"confirm_delete"); print "
\n"; } if ($soc->error) { - print '
'; + print '
'; print $soc->error; print '
'; } diff --git a/htdocs/theme/dev/dev.css b/htdocs/theme/dev/dev.css index ba4be5ea713..07ae6b62bdd 100644 --- a/htdocs/theme/dev/dev.css +++ b/htdocs/theme/dev/dev.css @@ -101,15 +101,29 @@ div.FicheSubmit { text-align: center; } -div.message { - background: #dee7ec; - padding: 0em 1.5em; - margin: 0em 0em 0em 0em; - border-top: 1px solid #8CACBB; - border-left: 1px solid #8CACBB; - border-right: 1px solid #8CACBB; +/* + * Ok, Warning, Error + */ +.ok { color: #114466; } +.warning { color: #777711; } +.error { color: #550000; font-weight: bold; } + +div.ok { + color: #114466; } +div.warning { + color: #777711; +} + +div.error { + color: #550000; font-weight: bold; + padding: 0.2em 0.2em 0.2em 0.2em; + margin: 0.5em 0em 0.5em 0em; + border: 1px solid #6C7C8B; +} + + a.tabAction { background: white; border: 1px outset #8CACBB; diff --git a/htdocs/theme/eldy/eldy.css b/htdocs/theme/eldy/eldy.css index 7c679d02921..2f2d73e3d78 100644 --- a/htdocs/theme/eldy/eldy.css +++ b/htdocs/theme/eldy/eldy.css @@ -561,26 +561,25 @@ font: helvetica, verdana, arial, sans-serif; /* - * Normal, warning, erreurs + * Ok, Warning, Error */ .ok { color: #114466; } .warning { color: #777711; } .error { color: #550000; font-weight: bold; } -div.message { - background: #dee7ec; - padding: 0em 1.5em; - margin: 0em 0em 0em 0em; - border-top: 1px solid #8CACBB; - border-left: 1px solid #8CACBB; - border-right: 1px solid #8CACBB; +div.ok { + color: #114466; } -div.errormessage { +div.warning { + color: #777711; +} + +div.error { color: #550000; font-weight: bold; padding: 0.2em 0.2em 0.2em 0.2em; margin: 0.5em 0em 0.5em 0em; - border: 1px solid #000000; + border: 1px solid #6C7C8B; } diff --git a/htdocs/theme/freelug/freelug.css b/htdocs/theme/freelug/freelug.css index 1cefc4ddaa3..15857fdc591 100644 --- a/htdocs/theme/freelug/freelug.css +++ b/htdocs/theme/freelug/freelug.css @@ -332,15 +332,6 @@ div.FicheSubmit { text-align: center; } -div.message { - background: #dee7ec; - padding: 0em 1.5em; - margin: 0em 0em 0em 0em; - border-top: 1px solid #9999BB; - border-left: 1px solid #9999BB; - border-right: 1px solid #9999BB; -} - a.tab { background: white; border: 1px solid #9999BB; @@ -508,16 +499,15 @@ div.leftmenu { .warning { color: #777711; } .error { color: #550000; } -div.message { - background: #dee7ec; - padding: 0em 1.5em; - margin: 0em 0em 0em 0em; - border-top: 1px solid #8CACBB; - border-left: 1px solid #8CACBB; - border-right: 1px solid #8CACBB; +div.ok { + color: #114466; } -div.errormessage { +div.warning { + color: #777711; +} + +div.error { color: #550000; font-weight: bold; padding: 0.2em 0.2em 0.2em 0.2em; margin: 0.5em 0em 0.5em 0em; diff --git a/htdocs/theme/yellow/yellow.css b/htdocs/theme/yellow/yellow.css index c6e41d6f352..f26bb1e8636 100644 --- a/htdocs/theme/yellow/yellow.css +++ b/htdocs/theme/yellow/yellow.css @@ -336,15 +336,6 @@ div.FicheSubmit { text-align: center; } -div.message { - background: #dee7ec; - padding: 0em 1.5em; - margin: 0em 0em 0em 0em; - border-top: 1px solid #8CACBB; - border-left: 1px solid #8CACBB; - border-right: 1px solid #8CACBB; -} - a.tab { background: white; border: 1px solid #999999; @@ -510,16 +501,15 @@ div.leftmenu { .warning { color: #777711; } .error { color: #550000; } -div.message { - background: #dee7ec; - padding: 0em 1.5em; - margin: 0em 0em 0em 0em; - border-top: 1px solid #8CACBB; - border-left: 1px solid #8CACBB; - border-right: 1px solid #8CACBB; +div.ok { + color: #114466; } -div.errormessage { +div.warning { + color: #777711; +} + +div.error { color: #550000; font-weight: bold; padding: 0.2em 0.2em 0.2em 0.2em; margin: 0.5em 0em 0.5em 0em;