diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 00ad6c9aa00..6e42b1068c1 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -476,7 +476,7 @@ if ($object->id > 0)
print '
';
if ($action == 'editshipping')
{
- $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->shipping_method_id, 'shipping_method_id');
+ $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->shipping_method_id, 'shipping_method_id', 1);
}
else
{
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index b7be9d385fc..e7685ef25b9 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -904,6 +904,7 @@ Permission20003=Delete leave requests
Permission20004=Read all leave requests (even of user not subordinates)
Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
Permission20006=Admin leave requests (setup and update balance)
+Permission20007=Approve leave requests
Permission23001=Read Scheduled job
Permission23002=Create/update Scheduled job
Permission23003=Delete Scheduled job
diff --git a/htdocs/langs/en_US/holiday.lang b/htdocs/langs/en_US/holiday.lang
index 9e31180f3ea..69b6a698e1a 100644
--- a/htdocs/langs/en_US/holiday.lang
+++ b/htdocs/langs/en_US/holiday.lang
@@ -127,4 +127,5 @@ HolidaysNumberingModules=Leave requests numbering models
TemplatePDFHolidays=Template for leave requests PDF
FreeLegalTextOnHolidays=Free text on PDF
WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
-HolidaysToApprove=Holidays to approve
\ No newline at end of file
+HolidaysToApprove=Holidays to approve
+NobodyHasPermissionToValidateHolidays=Nobody has permission to validate holidays
|