fix: Dolibarr#32056

FHenry · Nov 22, 2024 · c8dfacd · c8dfacd
1 parent dbba584
commit c8dfacd
Show file tree

Hide file tree

Showing 48 changed files with 52 additions and 50 deletions.
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
@@ -690,7 +690,7 @@
 				$default = '';
 			}
 
-			$tooltip = $langs->trans("Cache").' '.round($DELAYFORCACHE / 60).'mn';
+			$tooltip = $langs->trans("Cache").' '.round($DELAYFORCACHE / 60).'min';
 
 			$s .= '<div class="nowrap inline-block minheight30"><input type="checkbox" id="check_ext'.$htmlname.'" name="check_ext'.$htmlname.'" value="1" '.$default.'><label for="check_ext'.$htmlname.'" title="'.dol_escape_htmltag($tooltip).'" class="labelcalendar">'.dol_escape_htmltag($val['name']).'</label> &nbsp; </div>';
 		}

diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
@@ -130,7 +130,7 @@ function dol_time_plus_duree($time, $duration_value, $duration_unit, $ruleforend
 	if ($duration_unit == 's') {
 		return $time + (int) ($duration_value);
 	}
-	if ($duration_unit == 'i' || $duration_unit == 'mn' || $duration_unit == 'min') {
+	if ($duration_unit == 'i' || $duration_unit == 'min') {
 		return $time + (int) (60 * $duration_value);
 	}
 	if ($duration_unit == 'h') {
@@ -342,7 +342,7 @@ function convertDurationtoHour($duration_value, $duration_unit)
 	if ($duration_unit == 's') {
 		$result = $duration_value / 3600;
 	}
-	if ($duration_unit == 'i' || $duration_unit == 'mn' || $duration_unit == 'min') {
+	if ($duration_unit == 'i' || $duration_unit == 'min') {
 		$result = $duration_value / 60;
 	}
 	if ($duration_unit == 'h') {

diff --git a/htdocs/install/mysql/data/llx_c_units.sql b/htdocs/install/mysql/data/llx_c_units.sql
@@ -55,7 +55,7 @@ INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type,
 INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('SET','510', '0','Set','set', 'qty', 1);
 
 INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('S', '600',       '1','second','s', 'time', 1);
-INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('MI','610',      '60','minute','mn', 'time', 1);
+INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('MI','610',      '60','minute','min', 'time', 1);
 INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('H', '620',    '3600','hour','h', 'time', 1);
 INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('D', '630',   '86400','day','d', 'time', 1);
 INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('W', '640',  '604800','week','w', 'time', 1);

diff --git a/htdocs/install/mysql/migration/20.0.0-21.0.0.sql b/htdocs/install/mysql/migration/20.0.0-21.0.0.sql
@@ -382,3 +382,5 @@ INSERT INTO llx_c_type_contact (element, source, code, libelle, active ) values
 ALTER TABLE llx_facture_rec ADD COLUMN fk_societe_rib integer DEFAULT NULL;
 
 ALTER TABLE llx_facture ADD COLUMN is_also_delivery_note tinyint DEFAULT 0 NOT NULL;
+
+UPDATE llx_c_units SET short_label='min',code='MIN' WHERE code='MI' AND short_label='mi' AND unit_type='time' AND scale=60;
diff --git a/htdocs/langs/am_ET/main.lang b/htdocs/langs/am_ET/main.lang
@@ -350,7 +350,7 @@ Quadri=ኳድሪ
 MonthOfDay=የቀኑ ወር
 DaysOfWeek=የሳምንቱ ቀናት
 HourShort=ኤች
-MinuteShort=mn
+MinuteShort=min
 SecondShort=ሰከንድ
 DayShort=d
 MonthShort=m

diff --git a/htdocs/langs/ar_DZ/main.lang b/htdocs/langs/ar_DZ/main.lang
@@ -335,7 +335,7 @@ Quadri=Quadri
 MonthOfDay=Month of the day
 DaysOfWeek=Days of week
 HourShort=H
-MinuteShort=mn
+MinuteShort=min
 Rate=Rate
 CurrencyRate=Currency conversion rate
 UseLocalTax=Include tax

diff --git a/htdocs/langs/ar_JO/main.lang b/htdocs/langs/ar_JO/main.lang
@@ -335,7 +335,7 @@ Quadri=Quadri
 MonthOfDay=Month of the day
 DaysOfWeek=Days of week
 HourShort=H
-MinuteShort=mn
+MinuteShort=min
 Rate=Rate
 CurrencyRate=Currency conversion rate
 UseLocalTax=Include tax

diff --git a/htdocs/langs/ar_SY/main.lang b/htdocs/langs/ar_SY/main.lang
@@ -336,7 +336,7 @@ Quadri=Quadri
 MonthOfDay=Month of the day
 DaysOfWeek=Days of week
 HourShort=H
-MinuteShort=mn
+MinuteShort=min
 Rate=Rate
 CurrencyRate=Currency conversion rate
 UseLocalTax=Include tax

diff --git a/htdocs/langs/az_AZ/main.lang b/htdocs/langs/az_AZ/main.lang
@@ -350,7 +350,7 @@ Quadri=Quadri
 MonthOfDay=Günün ayı
 DaysOfWeek=Həftənin günləri
 HourShort=H
-MinuteShort=mn
+MinuteShort=min
 SecondShort=san
 DayShort=d
 MonthShort=m

diff --git a/htdocs/langs/bn_BD/main.lang b/htdocs/langs/bn_BD/main.lang
@@ -350,7 +350,7 @@ Quadri=কাদরি
 MonthOfDay=দিনের মাস
 DaysOfWeek=সপ্তাহের দিনগুলি
 HourShort=এইচ
-MinuteShort=mn
+MinuteShort=min
 SecondShort=সেকেন্ড
 DayShort=d
 MonthShort=m

diff --git a/htdocs/langs/bn_IN/main.lang b/htdocs/langs/bn_IN/main.lang
@@ -350,7 +350,7 @@ Quadri=কাদরি
 MonthOfDay=দিনের মাস
 DaysOfWeek=সপ্তাহের দিনগুলি
 HourShort=এইচ
-MinuteShort=mn
+MinuteShort=min
 SecondShort=সেকেন্ড
 DayShort=d
 MonthShort=m

diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang
@@ -350,7 +350,7 @@ Quadri=Quadri
 MonthOfDay=Měsíce ode dne
 DaysOfWeek=Days of week
 HourShort=H
-MinuteShort=mn
+MinuteShort=min
 SecondShort=sec
 DayShort=d
 MonthShort=m

diff --git a/htdocs/langs/cy_GB/main.lang b/htdocs/langs/cy_GB/main.lang
@@ -350,7 +350,7 @@ Quadri=Quadri
 MonthOfDay=Mis o'r dydd
 DaysOfWeek=Dyddiau'r wythnos
 HourShort=H
-MinuteShort=mn
+MinuteShort=min
 SecondShort=eiliad
 DayShort=d
 MonthShort=m

diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang
@@ -350,7 +350,7 @@ Quadri=vierfach
 MonthOfDay=Tag des Monats
 DaysOfWeek=Wochentage
 HourShort=H
-MinuteShort=mn
+MinuteShort=min
 SecondShort=Sek
 DayShort=d
 MonthShort=m

diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
@@ -353,7 +353,7 @@ Quadri=Quadri
 MonthOfDay=Month of the day
 DaysOfWeek=Days of week
 HourShort=H
-MinuteShort=mn
+MinuteShort=min
 SecondShort=sec
 DayShort=d
 MonthShort=m

diff --git a/htdocs/langs/et_EE/main.lang b/htdocs/langs/et_EE/main.lang
@@ -350,7 +350,7 @@ Quadri=Kvartal
 MonthOfDay=Kuu päev
 DaysOfWeek=Päevi nädalas
 HourShort=H
-MinuteShort=mn
+MinuteShort=min
 SecondShort=sec
 DayShort=d
 MonthShort=m

diff --git a/htdocs/langs/eu_ES/main.lang b/htdocs/langs/eu_ES/main.lang
@@ -350,7 +350,7 @@ Quadri=Quadri
 MonthOfDay=Month of the day
 DaysOfWeek=Days of week
 HourShort=H
-MinuteShort=mn
+MinuteShort=min
 SecondShort=sec
 DayShort=d
 MonthShort=m

diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang
@@ -350,7 +350,7 @@ Quadri=چهارتایی
 MonthOfDay=ماه از روز
 DaysOfWeek=Days of week
 HourShort=H
-MinuteShort=mn
+MinuteShort=min
 SecondShort=sec
 DayShort=ر
 MonthShort=m

diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
@@ -351,7 +351,7 @@ Quadri=Trimestre
 MonthOfDay=Mois du jour
 DaysOfWeek=Jours de la semaine
 HourShort=H
-MinuteShort=mn
+MinuteShort=min
 SecondShort=sec
 DayShort=j
 MonthShort=m

diff --git a/htdocs/langs/hi_IN/main.lang b/htdocs/langs/hi_IN/main.lang
@@ -335,7 +335,7 @@ Quadri=Quadri
 MonthOfDay=Month of the day
 DaysOfWeek=Days of week
 HourShort=H
-MinuteShort=mn
+MinuteShort=min
 Rate=Rate
 CurrencyRate=Currency conversion rate
 UseLocalTax=Include tax

diff --git a/htdocs/langs/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang
@@ -350,7 +350,7 @@ Quadri=Četvrtgodišnje
 MonthOfDay=Jedan mjesec od dana
 DaysOfWeek=Dani u tjednu
 HourShort=H
-MinuteShort=mn
+MinuteShort=min
 SecondShort=sek
 DayShort=d
 MonthShort=m

diff --git a/htdocs/langs/is_IS/main.lang b/htdocs/langs/is_IS/main.lang
@@ -350,7 +350,7 @@ Quadri=Quadri
 MonthOfDay=Mánuður dagsins
 DaysOfWeek=Days of week
 HourShort=H
-MinuteShort=mn
+MinuteShort=min
 SecondShort=sec
 DayShort=d
 MonthShort=m

diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang
@@ -351,7 +351,7 @@ Quadri=までに4
 MonthOfDay=その日の月
 DaysOfWeek=曜日
 HourShort=H
-MinuteShort=mn
+MinuteShort=min
 SecondShort=秒
 DayShort=日
 MonthShort=m

diff --git a/htdocs/langs/ka_GE/main.lang b/htdocs/langs/ka_GE/main.lang
@@ -350,7 +350,7 @@ Quadri=Quadri
 MonthOfDay=Month of the day
 DaysOfWeek=Days of week
 HourShort=H
-MinuteShort=mn
+MinuteShort=min
 SecondShort=sec
 DayShort=d
 MonthShort=m

diff --git a/htdocs/langs/km_KH/main.lang b/htdocs/langs/km_KH/main.lang
@@ -350,7 +350,7 @@ Quadri=ការ៉េ
 MonthOfDay=ខែនៃថ្ងៃ
 DaysOfWeek=ថ្ងៃនៃសប្តាហ៍
 HourShort=ហ
-MinuteShort=mn
+MinuteShort=min
 SecondShort=វិ
 DayShort=ឃ
 MonthShort=ម

diff --git a/htdocs/langs/kn_IN/main.lang b/htdocs/langs/kn_IN/main.lang
@@ -349,7 +349,7 @@ Quadri=Quadri
 MonthOfDay=Month of the day
 DaysOfWeek=Days of week
 HourShort=H
-MinuteShort=mn
+MinuteShort=min
 SecondShort=sec
 Rate=Rate
 CurrencyRate=Currency conversion rate

diff --git a/htdocs/langs/ko_KR/main.lang b/htdocs/langs/ko_KR/main.lang
@@ -350,7 +350,7 @@ Quadri=쿼드리
 MonthOfDay=현재 월
 DaysOfWeek=Days of week
 HourShort=H
-MinuteShort=mn
+MinuteShort=min
 SecondShort=sec
 DayShort=d
 MonthShort=m

diff --git a/htdocs/langs/ku_IQ/main.lang b/htdocs/langs/ku_IQ/main.lang
@@ -350,7 +350,7 @@ Quadri=Quadri
 MonthOfDay=Month of the day
 DaysOfWeek=Days of week
 HourShort=H
-MinuteShort=mn
+MinuteShort=min
 SecondShort=sec
 DayShort=d
 MonthShort=m

diff --git a/htdocs/langs/lo_LA/main.lang b/htdocs/langs/lo_LA/main.lang
@@ -350,7 +350,7 @@ Quadri=Quadri
 MonthOfDay=ເດືອນຂອງມື້
 DaysOfWeek=ມື້ຂອງອາທິດ
 HourShort=ຮ
-MinuteShort=mn
+MinuteShort=min
 SecondShort=ວິ
 DayShort=d
 MonthShort=m

diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang
@@ -350,7 +350,7 @@ Quadri=Kvadrāt-
 MonthOfDay=Mēneša laikā no dienas
 DaysOfWeek=Nedēļas dienas
 HourShort=H
-MinuteShort=mn
+MinuteShort=min
 SecondShort=sek
 DayShort=d
 MonthShort=m

diff --git a/htdocs/langs/mn_MN/main.lang b/htdocs/langs/mn_MN/main.lang
@@ -335,7 +335,7 @@ Quadri=Quadri
 MonthOfDay=Month of the day
 DaysOfWeek=Days of week
 HourShort=H
-MinuteShort=mn
+MinuteShort=min
 Rate=Rate
 CurrencyRate=Currency conversion rate
 UseLocalTax=Include tax

diff --git a/htdocs/langs/ms_MY/main.lang b/htdocs/langs/ms_MY/main.lang
@@ -336,7 +336,7 @@ Quadri=Quadri
 MonthOfDay=Month of the day
 DaysOfWeek=Days of week
 HourShort=H
-MinuteShort=mn
+MinuteShort=min
 Rate=Rate
 CurrencyRate=Currency conversion rate
 UseLocalTax=Include tax

diff --git a/htdocs/langs/my_MM/main.lang b/htdocs/langs/my_MM/main.lang
@@ -335,7 +335,7 @@ Quadri=Quadri
 MonthOfDay=Month of the day
 DaysOfWeek=Days of week
 HourShort=H
-MinuteShort=mn
+MinuteShort=min
 Rate=Rate
 CurrencyRate=Currency conversion rate
 UseLocalTax=Include tax

diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang
@@ -350,7 +350,7 @@ Quadri=Kvartal
 MonthOfDay=Dag i måneden
 DaysOfWeek=Dager i uken
 HourShort=T
-MinuteShort=mn
+MinuteShort=min
 SecondShort=sek
 DayShort=d
 MonthShort=m

diff --git a/htdocs/langs/ne_NP/main.lang b/htdocs/langs/ne_NP/main.lang
@@ -335,7 +335,7 @@ Quadri=Quadri
 MonthOfDay=Month of the day
 DaysOfWeek=Days of week
 HourShort=H
-MinuteShort=mn
+MinuteShort=min
 Rate=Rate
 CurrencyRate=Currency conversion rate
 UseLocalTax=Include tax

diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
@@ -350,7 +350,7 @@ Quadri=Trimester
 MonthOfDay=Maand van de dag
 DaysOfWeek=Dagen van de week
 HourShort=U
-MinuteShort=mn
+MinuteShort=min
 SecondShort=sec
 DayShort=d
 MonthShort=m

diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
@@ -350,7 +350,7 @@ Quadri=Kwadrans
 MonthOfDay=Dzień miesiąca
 DaysOfWeek=Dni tygodnia
 HourShort=H
-MinuteShort=mn
+MinuteShort=min
 SecondShort=sek
 DayShort=dz
 MonthShort=m

diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
@@ -350,7 +350,7 @@ Quadri=Trimestre
 MonthOfDay=Dia do mês
 DaysOfWeek=Dias da semana
 HourShort=H
-MinuteShort=mn
+MinuteShort=min
 SecondShort=segundo
 DayShort=d
 MonthShort=m

diff --git a/htdocs/langs/sk_SK/main.lang b/htdocs/langs/sk_SK/main.lang
@@ -350,7 +350,7 @@ Quadri=Quadri
 MonthOfDay=Mesiaca odo dňa
 DaysOfWeek=Dni v týždni
 HourShort=H
-MinuteShort=mn
+MinuteShort=min
 SecondShort=sek
 DayShort=d
 MonthShort=m

diff --git a/htdocs/langs/sq_AL/main.lang b/htdocs/langs/sq_AL/main.lang
@@ -350,7 +350,7 @@ Quadri=Quadri
 MonthOfDay=Muaji i ditës
 DaysOfWeek=Ditët e javës
 HourShort=H
-MinuteShort=mn
+MinuteShort=min
 SecondShort=sek
 DayShort=d
 MonthShort=m

diff --git a/htdocs/langs/sr_RS/main.lang b/htdocs/langs/sr_RS/main.lang
@@ -350,7 +350,7 @@ Quadri=Quadri
 MonthOfDay=Mesec dana
 DaysOfWeek=Days of week
 HourShort=H
-MinuteShort=mn
+MinuteShort=min
 SecondShort=sec
 DayShort=d
 MonthShort=m

diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang
@@ -350,7 +350,7 @@ Quadri=Quadri
 MonthOfDay=Dagens månad
 DaysOfWeek=Veckodagar
 HourShort=H
-MinuteShort=mn
+MinuteShort=min
 SecondShort=sek
 DayShort=d
 MonthShort=m