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

Some fix

Browse Source
This commit is contained in:
Laurent Destailleur 2010-02-08 03:38:05 +00:00
parent 2b9bf95ad6
commit ce92d372d4
7 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/admin/limits.php
View File

@ -1,5 +1,5 @@
<?php <?php
/* Copyright (C) 2007-2009 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2007-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2009 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2009 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -170,7 +170,7 @@ else
// Show examples // Show examples
print '<b>'.$langs->trans("Examples").":</b><br>\n"; print '<b>'.$langs->trans("ExamplesWithCurrentSetup").":</b><br>\n";
$s=2/7;$qty=1;$vat=0; $s=2/7;$qty=1;$vat=0;
$tmparray=calcul_price_total(1,$qty*price2num($s,'MU'),0,$vat,0,'HT',0); $tmparray=calcul_price_total(1,$qty*price2num($s,'MU'),0,$vat,0,'HT',0);

2
htdocs/comm/fiche.php
View File

@ -210,7 +210,7 @@ if ($socid > 0)
print '</tr>'; print '</tr>';
// Local Taxes // Local Taxes
if ($obj->code='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) if ($obj->code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1)
{ {
print '<tr>'; print '<tr>';
print '<td nowrap="nowrap">'.$langs->trans('LocalTax1IsUsedES').'</td><td colspan="3">'; print '<td nowrap="nowrap">'.$langs->trans('LocalTax1IsUsedES').'</td><td colspan="3">';

2
htdocs/compta/fiche.php
View File

@ -244,7 +244,7 @@ if ($socid > 0)
print '</tr>'; print '</tr>';
// Local Taxes // Local Taxes
if ($obj->code='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) if ($obj->code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1)
{ {
print '<tr>'; print '<tr>';
print '<td nowrap="nowrap">'.$langs->trans('LocalTax1IsUsedES').'</td><td colspan="3">'; print '<td nowrap="nowrap">'.$langs->trans('LocalTax1IsUsedES').'</td><td colspan="3">';

4
htdocs/fourn/fiche.php
View File

@ -112,8 +112,8 @@ if ( $societe->fetch($socid) )
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
// Local Taxes // Local Taxes
if ($obj->code='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) if ($obj->code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1)
{ {
print '<tr>'; print '<tr>';
print '<td nowrap="nowrap">'.$langs->trans('LocalTax1IsUsedES').'</td><td colspan="3">'; print '<td nowrap="nowrap">'.$langs->trans('LocalTax1IsUsedES').'</td><td colspan="3">';

1
htdocs/langs/en_US/admin.lang
View File

@ -264,6 +264,7 @@ ModuleDisabledSoNoEvent=Module disabled so event never created
ConfirmPurge=Are you sure you want to execute this purge ?<br>This will delete definitely all your data files with no way to restore them (ECM files, attached files...). ConfirmPurge=Are you sure you want to execute this purge ?<br>This will delete definitely all your data files with no way to restore them (ECM files, attached files...).
MinLength=Minimum length MinLength=Minimum length
LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
ExamplesWithCurrentSetup=Examples with current running setup
# Modules # Modules
Module0Name=Users & groups Module0Name=Users & groups

1
htdocs/langs/fr_FR/admin.lang
View File

@ -264,6 +264,7 @@ ModuleDisabledSoNoEvent=Module désactivé donc évênement jamais créé
ConfirmPurge=Etes vous sur de vouloir réaliser cette purge ?<br>Ceci effacera définitivement toutes vos données fichier (espace GED, pièces jointes, etc...). ConfirmPurge=Etes vous sur de vouloir réaliser cette purge ?<br>Ceci effacera définitivement toutes vos données fichier (espace GED, pièces jointes, etc...).
MinLength=Longueur minimale MinLength=Longueur minimale
LanguageFilesCachedIntoShmopSharedMemory=Fichiers .lang en mémoire partagée LanguageFilesCachedIntoShmopSharedMemory=Fichiers .lang en mémoire partagée
ExamplesWithCurrentSetup=Exemples avec le paramétrage actif courant
# Modules = undefined # Modules = undefined
Module0Name = Utilisateurs & groupes Module0Name = Utilisateurs & groupes

7
htdocs/soc.php
View File

@ -627,7 +627,7 @@ $_GET["action"] == 'create' || $_POST["action"] == 'create')
} }
// Local Taxes // Local Taxes
if($obj->code='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) if($obj->code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1)
{ {
print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td>'; print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td>';
print '<td>'; print '<td>';
@ -966,7 +966,7 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit')
print '</tr>'; print '</tr>';
// Local Taxes // Local Taxes
if($obj->code='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) if($obj->code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1)
{ {
print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td>'; print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td>';
print '<td>'; print '<td>';
@ -1202,7 +1202,7 @@ else
print '</tr>'; print '</tr>';
// Local Taxes // Local Taxes
if($obj->code='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1) if($obj->code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1)
{ {
print '<tr><td>'; print '<tr><td>';
print $langs->trans('LocalTax1IsUsedES'); print $langs->trans('LocalTax1IsUsedES');
@ -1215,6 +1215,7 @@ else
print '</td><td>'; print '</td><td>';
print yn($soc->localtax2_assuj); print yn($soc->localtax2_assuj);
print '</td>'; print '</td>';
print '</tr>';
} }