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

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

Browse Source 
Conflicts:
	htdocs/core/tpl/extrafields_list_search_title.tpl.php
This commit is contained in:
Laurent Destailleur 2019-11-14 12:49:42 +01:00
commit 4fc7b8c3b1
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/card.php
View File

@ -476,7 +476,7 @@ if ($object->id > 0)
print '</td><td>'; print '</td><td>';
if ($action == 'editshipping') 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 else
{ {

1
htdocs/langs/en_US/admin.lang
View File

@ -904,6 +904,7 @@ Permission20003=Delete leave requests
Permission20004=Read all leave requests (even of user not subordinates) Permission20004=Read all leave requests (even of user not subordinates)
Permission20005=Create/modify leave requests for everybody (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) Permission20006=Admin leave requests (setup and update balance)
Permission20007=Approve leave requests
Permission23001=Read Scheduled job Permission23001=Read Scheduled job
Permission23002=Create/update Scheduled job Permission23002=Create/update Scheduled job
Permission23003=Delete Scheduled job Permission23003=Delete Scheduled job

3
htdocs/langs/en_US/holiday.lang
View File

@ -127,4 +127,5 @@ HolidaysNumberingModules=Leave requests numbering models
TemplatePDFHolidays=Template for leave requests PDF TemplatePDFHolidays=Template for leave requests PDF
FreeLegalTextOnHolidays=Free text on PDF FreeLegalTextOnHolidays=Free text on PDF
WatermarkOnDraftHolidayCards=Watermarks on draft leave requests WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
HolidaysToApprove=Holidays to approve HolidaysToApprove=Holidays to approve
NobodyHasPermissionToValidateHolidays=Nobody has permission to validate holidays