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

Merge remote-tracking branch 'origin/3.3' into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2013-03-07 11:08:15 +01:00
commit 3defd294cb
4 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/contrat/fiche.php
View File

@ -306,7 +306,7 @@ else if ($action == 'addline' && $user->rights->contrat->creer)
{ {
$pu_ht=GETPOST('price_ht'); $pu_ht=GETPOST('price_ht');
$price_base_type = 'HT'; $price_base_type = 'HT';
$tva_tx=str_replace('*','',GETPOST('tva_tx')); $tva_tx=GETPOST('tva_tx')?str_replace('*','',GETPOST('tva_tx')):0; // tva_tx field may be disabled, so we use vat rate 0
$tva_npr=preg_match('/\*/',GETPOST('tva_tx'))?1:0; $tva_npr=preg_match('/\*/',GETPOST('tva_tx'))?1:0;
$desc=GETPOST('dp_desc'); $desc=GETPOST('dp_desc');
} }
@ -424,7 +424,7 @@ else if ($action == 'updateligne' && $user->rights->contrat->creer && ! GETPOST(
$objectline->subprice=GETPOST('elprice'); $objectline->subprice=GETPOST('elprice');
$objectline->qty=GETPOST('elqty'); $objectline->qty=GETPOST('elqty');
$objectline->remise_percent=GETPOST('elremise_percent'); $objectline->remise_percent=GETPOST('elremise_percent');
$objectline->tva_tx=GETPOST('eltva_tx'); $objectline->tva_tx=GETPOST('eltva_tx')?GETPOST('eltva_tx'):0; // Field may be disabled, so we use vat rate 0
$objectline->localtax1_tx=$localtax1_tx; $objectline->localtax1_tx=$localtax1_tx;
$objectline->localtax2_tx=$localtax2_tx; $objectline->localtax2_tx=$localtax2_tx;
$objectline->date_ouverture_prevue=$date_start_update; $objectline->date_ouverture_prevue=$date_start_update;

2
htdocs/core/lib/admin.lib.php
View File

@ -1147,6 +1147,7 @@ function showModulesExludedForExternal($modules)
$text=$langs->trans("OnlyFollowingModulesAreOpenedToExternalUsers"); $text=$langs->trans("OnlyFollowingModulesAreOpenedToExternalUsers");
$listofmodules=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL); $listofmodules=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL);
$i=0; $i=0;
if (!empty($modules)) {
foreach($modules as $module) foreach($modules as $module)
{ {
$moduleconst=$module->const_name; $moduleconst=$module->const_name;
@ -1161,6 +1162,7 @@ function showModulesExludedForExternal($modules)
$i++; $i++;
$text .= $langs->trans('Module'.$module->numero.'Name'); $text .= $langs->trans('Module'.$module->numero.'Name');
} }
}
return img_picto($langs->trans('InfoAdmin'), 'star').' '.$text; return img_picto($langs->trans('InfoAdmin'), 'star').' '.$text;
} }

2
htdocs/langs/en_US/main.lang
View File

@ -282,6 +282,8 @@ AmountTTCShort=Amount (inc. tax)
AmountHT=Amount (net of tax) AmountHT=Amount (net of tax)
AmountTTC=Amount (inc. tax) AmountTTC=Amount (inc. tax)
AmountVAT=Amount tax AmountVAT=Amount tax
AmountLT1=Amount tax 2
AmountLT2=Amount tax 3
AmountLT1ES=Amount RE AmountLT1ES=Amount RE
AmountLT2ES=Amount IRPF AmountLT2ES=Amount IRPF
AmountTotal=Total amount AmountTotal=Total amount

2
htdocs/langs/fr_FR/main.lang
View File

@ -284,6 +284,8 @@ AmountTTCShort=Montant TTC
AmountHT=Montant HT AmountHT=Montant HT
AmountTTC=Montant TTC AmountTTC=Montant TTC
AmountVAT=Montant TVA AmountVAT=Montant TVA
AmountLT1=Montant Tax 2
AmountLT2=Montant Tax 3
AmountLT1ES=Montant RE AmountLT1ES=Montant RE
AmountLT2ES=Montant IRPF AmountLT2ES=Montant IRPF
AmountTotal=Montant total AmountTotal=Montant total