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

Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4

Browse Source
This commit is contained in:
Laurent Destailleur 2013-05-14 01:08:58 +02:00
commit 95fac9aace
6 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/holiday/fiche.php
View File

@ -854,8 +854,8 @@ else
// Si refus de la demande
if ($action == 'refuse' && $cp->statut == 2 && $user->id == $cp->fk_validator)
{
$array_input = array(array('type'=>"text",'label'=>"Entrez ci-dessous un motif de refus :",'name'=>"detail_refuse",'size'=>"50",'value'=>""));
$ret=$form->form_confirm("fiche.php?id=".$id."&action=confirm_refuse", $langs->trans("TitleRefuseCP"), "", "confirm_refuse", $array_input, 1, 0);
$array_input = array(array('type'=>"text",'label'=> $langs->trans('DetailRefusCP'),'name'=>"detail_refuse",'size'=>"50",'value'=>""));
$ret=$form->form_confirm("fiche.php?id=".$id."&action=confirm_refuse", $langs->trans("TitleRefuseCP"), $langs->trans('ConfirmRefuseCP'), "confirm_refuse", $array_input, 1, 0);
if ($ret == 'html') print '<br />';
}

2
htdocs/langs/ca_ES/margins.lang
View File

@ -1,8 +1,6 @@
# Dolibarr language file - ca_ES - margins
CHARSET=UTF-8
Module59000Name=Marges
Module59000Desc=Gestió de marges comercials
Margin=Marge
Margins=Marges
TotalMargin=Marge total

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

@ -1,8 +1,6 @@
# Dolibarr language file - en_US - marges
CHARSET=UTF-8
Module59000Name=Margins
Module59000Desc=Profit margins management
Margin=Margin
Margins=Margins
TotalMargin=Total Margin

2
htdocs/langs/es_ES/margins.lang
View File

@ -1,8 +1,6 @@
# Dolibarr language file - es_ES - margins
CHARSET=UTF-8
Module59000Name=Márgenes
Module59000Desc=Gestión de márgenes comerciales
Margin=Margen
Margins=Márgenes
TotalMargin=Margen total

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

@ -1,8 +1,6 @@
# Dolibarr language file - fr_FR - margins
CHARSET=UTF-8
Module59000Name=Marges
Module59000Desc=Gestion des marges commerciales
Margin=Marge
Margins=Marges
TotalMargin=Marge totale

2
htdocs/langs/tr_TR/margins.lang
View File

@ -1,8 +1,6 @@
# Dolibarr language file - en_US - marges
CHARSET=UTF-8
Module59000Name=Oranlar
Module59000Desc=Kar oranı yönetimi
Margin=Oran
Margins=Oranlar
TotalMargin=Toplam Oran