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

Use a better value for constant FACTURE_LOCAL_TAX1_OPTION and FACTURE_LOCAL_TAX2_OPTION

Browse Source
This commit is contained in:
Laurent Destailleur 2010-02-02 08:22:50 +00:00
parent f1bc983c71
commit 0943a28445
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/admin/company.php
View File

@ -475,14 +475,6 @@ if ((isset($_GET["action"]) && $_GET["action"] == 'edit')
print "</table>"; print "</table>";
print "</td></tr>\n"; print "</td></tr>\n";
/* Je desactive cette option "facturation" car ce statut fiscal n'existe pas. Seul le reel et franchise existe.
Cette option ne doit donc pas etre en "exclusif" avec l'option fiscale de gestion de tva. Peut etre faut-il
une option a part qui n'entre pas en conflit avec les choix "assujeti TVA" ou "non".
$var=!$var;
print "<tr ".$bc[$var]."><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" value=\"facturation\"".($conf->global->FACTURE_TVAOPTION == "facturation"?" checked":"")."> Option facturation</label></td>";
print "<td colspan=\"2\">L'option 'facturation' est utilisee par les entreprises qui payent la TVA a facturation (vente de materiel).</td></tr>\n";
*/
$var=!$var; $var=!$var;
print "<tr ".$bc[$var]."><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" value=\"franchise\"".($conf->global->FACTURE_TVAOPTION == "franchise"?" checked":"")."> ".$langs->trans("VATIsNotUsed")."</label></td>"; print "<tr ".$bc[$var]."><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" value=\"franchise\"".($conf->global->FACTURE_TVAOPTION == "franchise"?" checked":"")."> ".$langs->trans("VATIsNotUsed")."</label></td>";
print '<td colspan="2">'; print '<td colspan="2">';

8
htdocs/master.inc.php
View File

@ -380,11 +380,11 @@ if (! defined('NOREQUIREDB') && ! defined('NOREQUIRESOC'))
$mysoc->logo_mini=$conf->global->MAIN_INFO_SOCIETE_LOGO_MINI; $mysoc->logo_mini=$conf->global->MAIN_INFO_SOCIETE_LOGO_MINI;
// Define if company use vat or not (Do not use conf->global->FACTURE_TVAOPTION anymore) // Define if company use vat or not (Do not use conf->global->FACTURE_TVAOPTION anymore)
$mysoc->tva_assuj=($conf->global->FACTURE_TVAOPTION=='franchise'?0:1); $mysoc->tva_assuj=((isset($conf->global->FACTURE_TVAOPTION) && $conf->global->FACTURE_TVAOPTION=='franchise')?0:1);
// Define if company use local taxes // Define if company use local taxes
$mysoc->localtax1_assuj=($conf->global->FACTURE_LOCAL_TAX1_OPTION=='franchise'?0:1); $mysoc->localtax1_assuj=($conf->global->FACTURE_LOCAL_TAX1_OPTION?1:0);
$mysoc->localtax2_assuj=($conf->global->FACTURE_LOCAL_TAX2_OPTION=='franchise'?0:1); $mysoc->localtax2_assuj=($conf->global->FACTURE_LOCAL_TAX2_OPTION?1:0);
} }