From 83898f945463a3964adf096fcd0721ef0b289864 Mon Sep 17 00:00:00 2001 From: William Mead Date: Thu, 28 Aug 2025 17:29:04 +0200 Subject: [PATCH 1/2] Fixed intervention line duration add (#35117) --- htdocs/fichinter/class/api_interventions.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/fichinter/class/api_interventions.class.php b/htdocs/fichinter/class/api_interventions.class.php index 023c1604c95..da50b537266 100644 --- a/htdocs/fichinter/class/api_interventions.class.php +++ b/htdocs/fichinter/class/api_interventions.class.php @@ -52,7 +52,7 @@ class Interventions extends DolibarrApi public static $FIELDSLINE = array( 'description', 'date', - 'duree', + 'duration', ); /** From 5abb379f63911f3301b7aaefee9c7696f18e8e55 Mon Sep 17 00:00:00 2001 From: ldestailleur Date: Thu, 28 Aug 2025 23:03:39 +0200 Subject: [PATCH 2/2] Fix message --- dev/build/makepack-dolibarr.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/build/makepack-dolibarr.pl b/dev/build/makepack-dolibarr.pl index 970039375cf..58fc2fee5aa 100755 --- a/dev/build/makepack-dolibarr.pl +++ b/dev/build/makepack-dolibarr.pl @@ -477,14 +477,14 @@ if ($nboftargetok) { { print 'Run git tag -a -f -m "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'" "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'"'."\n"; $ret=`git tag -a -f -m "$MAJOR.$MINOR.$BUILD" "$MAJOR.$MINOR.$BUILD"`; - print 'Run git push $GITREMOTENAME -f "$MAJOR.$MINOR.$BUILD"'."\n"; + print 'Run git push '.$GITREMOTENAME.' -f "$MAJOR.$MINOR.$BUILD"'."\n"; $ret=`git push $GITREMOTENAME -f -"$MAJOR.$MINOR.$BUILD"`; #$ret=`git push -f origin "$MAJOR.$MINOR.$BUILD"`; } } else { - print 'Run git push $GITREMOTENAME --tags'."\n"; + print "Run git push $GITREMOTENAME --tags\n"; $ret=`git push $GITREMOTENAME --tags`; #$ret=`git push origin "$MAJOR.$MINOR.$BUILD"`; }