diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php index 3df909e2196..363d4ac1df9 100644 --- a/htdocs/admin/limits.php +++ b/htdocs/admin/limits.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2007-2010 Laurent Destailleur * Copyright (C) 2009 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -170,7 +170,7 @@ else // Show examples -print ''.$langs->trans("Examples").":
\n"; +print ''.$langs->trans("ExamplesWithCurrentSetup").":
\n"; $s=2/7;$qty=1;$vat=0; $tmparray=calcul_price_total(1,$qty*price2num($s,'MU'),0,$vat,0,'HT',0); diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index 7bc7a7b4aaf..bf0150c32e3 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -208,9 +208,9 @@ if ($socid > 0) print yn($objsoc->tva_assuj); print ''; print ''; - + // Local Taxes - if ($obj->code='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) + if ($obj->code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) { print ''; print ''.$langs->trans('LocalTax1IsUsedES').''; diff --git a/htdocs/compta/fiche.php b/htdocs/compta/fiche.php index d4797f87af3..fcfa221b113 100644 --- a/htdocs/compta/fiche.php +++ b/htdocs/compta/fiche.php @@ -242,9 +242,9 @@ if ($socid > 0) print yn($societe->tva_assuj); print ''; print ''; - + // Local Taxes - if ($obj->code='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) + if ($obj->code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) { print ''; print ''.$langs->trans('LocalTax1IsUsedES').''; diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/fiche.php index 7051d9b6cbe..43ef9962126 100644 --- a/htdocs/fourn/fiche.php +++ b/htdocs/fourn/fiche.php @@ -111,9 +111,9 @@ if ( $societe->fetch($socid) ) print yn($societe->tva_assuj); print ''; print ''; - -// Local Taxes - if ($obj->code='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) + + // Local Taxes + if ($obj->code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) { print ''; print ''.$langs->trans('LocalTax1IsUsedES').''; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 88632d282be..602bd800f86 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -264,6 +264,7 @@ ModuleDisabledSoNoEvent=Module disabled so event never created ConfirmPurge=Are you sure you want to execute this purge ?
This will delete definitely all your data files with no way to restore them (ECM files, attached files...). MinLength=Minimum length LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory +ExamplesWithCurrentSetup=Examples with current running setup # Modules Module0Name=Users & groups diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 0c8b03d0604..871a63b0a54 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -264,6 +264,7 @@ ModuleDisabledSoNoEvent=Module désactivé donc évênement jamais créé ConfirmPurge=Etes vous sur de vouloir réaliser cette purge ?
Ceci effacera définitivement toutes vos données fichier (espace GED, pièces jointes, etc...). MinLength=Longueur minimale LanguageFilesCachedIntoShmopSharedMemory=Fichiers .lang en mémoire partagée +ExamplesWithCurrentSetup=Exemples avec le paramétrage actif courant # Modules = undefined Module0Name = Utilisateurs & groupes diff --git a/htdocs/soc.php b/htdocs/soc.php index 88ea56abf1c..d388e85b94f 100644 --- a/htdocs/soc.php +++ b/htdocs/soc.php @@ -112,11 +112,11 @@ if ((! $_POST["getcustomercode"] && ! $_POST["getsuppliercode"]) $soc->gencod = $_POST["gencod"]; $soc->tva_assuj = $_POST["assujtva_value"]; - + // Local Taxes $soc->localtax1_assuj = $_POST["localtax1assuj_value"]; $soc->localtax2_assuj = $_POST["localtax2assuj_value"]; - + $soc->tva_intra = $_POST["tva_intra"]; $soc->forme_juridique_code = $_POST["forme_juridique_code"]; @@ -362,7 +362,7 @@ $_GET["action"] == 'create' || $_POST["action"] == 'create') $soc->effectif_id=($_POST["effectif_id"]&&!$_POST["cleartype"])?$_POST["effectif_id_id"]:($_REQUEST["private"]?'EF1-5':''); $soc->tva_assuj = $_POST["assujtva_value"]; - + //Local Taxes $soc->localtax1_assuj = $_POST["localtax1assuj_value"]; $soc->localtax2_assuj = $_POST["localtax2assuj_value"]; @@ -613,7 +613,7 @@ $_GET["action"] == 'create' || $_POST["action"] == 'create') print ''; print ''; - + // Code TVA if ($conf->use_javascript_ajax) { @@ -625,9 +625,9 @@ $_GET["action"] == 'create' || $_POST["action"] == 'create') print ''; print "\n"; } - + // Local Taxes - if($obj->code='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) + if($obj->code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) { print ''.$langs->trans("LocalTax1IsUsedES").''; print ''; @@ -639,7 +639,7 @@ $_GET["action"] == 'create' || $_POST["action"] == 'create') print ''; print ''; } - + if ($user->rights->societe->client->voir) { //Affecter un commercial @@ -734,7 +734,7 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit') $soc->tva_assuj = $_POST["assujtva_value"]; $soc->tva_intra=$_POST["tva_intra"]; - + //Local Taxes $soc->localtax1_assuj = $_POST["localtax1assuj_value"]; $soc->localtax2_assuj = $_POST["localtax2assuj_value"]; @@ -964,22 +964,22 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit') } print ''; print ''; - + // Local Taxes - if($obj->code='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) + if($obj->code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) { print ''.$langs->trans("LocalTax1IsUsedES").''; - print ''; + print ''; print $form->selectyesno('localtax1assuj_value',$soc->localtax1_assuj,1); print ''; - + print ''.$langs->trans("LocalTax2IsUsedES").''; - print ''; + print ''; print $form->selectyesno('localtax2assuj_value',$soc->localtax2_assuj,1); print ''; print ''; } - + print ''.$langs->trans("Capital").' '.$langs->trans("Currency".$conf->monnaie).''; print ''.$langs->trans('JuridicalStatus').''; @@ -1200,23 +1200,24 @@ else print ''; print ''; - + // Local Taxes - if($obj->code='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) + if($obj->code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) { print ''; print $langs->trans('LocalTax1IsUsedES'); print ''; print yn($soc->localtax1_assuj); print ''; - + print ''; print $langs->trans('LocalTax2IsUsedES'); print ''; print yn($soc->localtax2_assuj); print ''; + print ''; } - + // Capital print ''.$langs->trans('Capital').'';