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
/* 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>
*
* This program is free software; you can redistribute it and/or modify
@ -170,7 +170,7 @@ else
// 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;
$tmparray=calcul_price_total(1,$qty*price2num($s,'MU'),0,$vat,0,'HT',0);

4
htdocs/comm/fiche.php
View File

@ -208,9 +208,9 @@ if ($socid > 0)
print yn($objsoc->tva_assuj);
print '</td>';
print '</tr>';
// 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 '<td nowrap="nowrap">'.$langs->trans('LocalTax1IsUsedES').'</td><td colspan="3">';

4
htdocs/compta/fiche.php
View File

@ -242,9 +242,9 @@ if ($socid > 0)
print yn($societe->tva_assuj);
print '</td>';
print '</tr>';
// 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 '<td nowrap="nowrap">'.$langs->trans('LocalTax1IsUsedES').'</td><td colspan="3">';

6
htdocs/fourn/fiche.php
View File

@ -111,9 +111,9 @@ if ( $societe->fetch($socid) )
print yn($societe->tva_assuj);
print '</td>';
print '</tr>';
// 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 '<tr>';
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...).
MinLength=Minimum length
LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
ExamplesWithCurrentSetup=Examples with current running setup
# Modules
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...).
MinLength=Longueur minimale
LanguageFilesCachedIntoShmopSharedMemory=Fichiers .lang en mémoire partagée
ExamplesWithCurrentSetup=Exemples avec le paramétrage actif courant
# Modules = undefined
Module0Name = Utilisateurs & groupes

37
htdocs/soc.php
View File

@ -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 '</td>';
print '</tr>';
// Code TVA
if ($conf->use_javascript_ajax)
{
@ -625,9 +625,9 @@ $_GET["action"] == 'create' || $_POST["action"] == 'create')
print '</script>';
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 '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td>';
print '<td>';
@ -639,7 +639,7 @@ $_GET["action"] == 'create' || $_POST["action"] == 'create')
print '</td>';
print '</tr>';
}
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 '</td>';
print '</tr>';
// 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 '<td>';
print '<td>';
print $form->selectyesno('localtax1assuj_value',$soc->localtax1_assuj,1);
print '</td>';
print '<td>'.$langs->trans("LocalTax2IsUsedES").'</td>';
print '<td>';
print '<td>';
print $form->selectyesno('localtax2assuj_value',$soc->localtax2_assuj,1);
print '</td>';
print '</tr>';
}
print '<tr><td>'.$langs->trans("Capital").'</td><td colspan="3"><input type="text" name="capital" size="10" value="'.$soc->capital.'"> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
print '<tr><td>'.$langs->trans('JuridicalStatus').'</td><td colspan="3">';
@ -1200,23 +1200,24 @@ else
print '</td>';
print '</tr>';
// 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 $langs->trans('LocalTax1IsUsedES');
print '</td><td>';
print yn($soc->localtax1_assuj);
print '</td>';
print '<td>';
print $langs->trans('LocalTax2IsUsedES');
print '</td><td>';
print yn($soc->localtax2_assuj);
print '</td>';
print '</tr>';
}
// Capital
print '<tr><td>'.$langs->trans('Capital').'</td><td colspan="3">';