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

Merge remote-tracking branch 'origin/develop' into 3.8

Browse Source
This commit is contained in:
Laurent Destailleur 2015-07-28 18:57:42 +02:00
commit a73541194c
5 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
View File

@ -164,6 +164,8 @@ UPDATE llx_const SET entity = __ENCRYPT('1')__ WHERE __DECRYPT('entity')__ = 0 A
UPDATE llx_const SET entity = __ENCRYPT('1')__ WHERE __DECRYPT('entity')__ = 0 AND __DECRYPT('name')__ = "MAIN_MAIL_SMTPS_PW";
UPDATE llx_const SET entity = __ENCRYPT('1')__ WHERE __DECRYPT('entity')__ = 0 AND __DECRYPT('name')__ = "MAIN_MAIL_EMAIL_TLS";
-- This option with this value is not compatible with 3.8. Value must be set to 'mutiselect', 'select2'...
DELETE from llx_const where name = 'MAIN_USE_JQUERY_MULTISELECT' and value = '1';
create table llx_bank_account_extrafields
(

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

@ -130,7 +130,6 @@ nbJours=Number days
TitleAdminCP=Configuration of Leaves
NoticePeriod=Notice period
#Messages
Hello=Hello
HolidaysToValidate=Validate leave requests
HolidaysToValidateBody=Below is a leave request to validate
HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.

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

@ -712,6 +712,8 @@ Genderman=Man
Genderwoman=Woman
ViewList=List view
Mandatory=Mandatory
Hello=Hello
Sincerely=Sincerely
# Week day
Monday=Monday
Tuesday=Tuesday

17
htdocs/margin/tabs/productMargins.php
View File

@ -259,14 +259,15 @@ if ($id > 0 || ! empty($ref))
dol_print_error();
}
print '
<script type="text/javascript">
$(document).ready(function() {
$("#totalMargin").html("'. price($totalMargin, null, null, null, null, $rounding).'");
$("#marginRate").html("'.(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%").'");
$("#markRate").html("'.(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%").'");
});
</script>
';
llxFooter();
$db->close();
?>
<script type="text/javascript">
$(document).ready(function() {
$("#totalMargin").html("<?php echo price($totalMargin, null, null, null, null, $rounding); ?>");
$("#marginRate").html("<?php echo (($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%"); ?>");
$("#markRate").html("<?php echo (($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%"); ?>");
});
</script>

18
htdocs/margin/tabs/thirdpartyMargins.php
View File

@ -250,13 +250,15 @@ else
}
print '
<script type="text/javascript">
$(document).ready(function() {
$("#totalMargin").html("'. price($totalMargin, null, null, null, null, $rounding).'");
$("#marginRate").html("'.(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%").'");
$("#markRate").html("'.(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%").'");
});
</script>
';
llxFooter();
$db->close();
?>
<script type="text/javascript">
$(document).ready(function() {
$("#totalMargin").html("<?php echo price($totalMargin, null, null, null, null, $rounding); ?>");
$("#marginRate").html("<?php echo (($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%"); ?>");
$("#markRate").html("<?php echo (($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%"); ?>");
});
</script>