';
if ($show_empty)
{
- $out.=' '."\n"; // Do not use here. It will show it when list is not ajaxed
+ $textforempty=' ';
+ if (! empty($conf->use_javascript_ajax)) $textforempty=' '; // If we use ajaxcombo, we need here to avoid to have an empty element that is too small.
+ $out.=''.$textforempty.' '."\n";
}
if (is_array($array))
diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index 762ebf4e605..2fae2b68952 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -525,14 +525,14 @@ function dol_get_first_day_week($day,$month,$year,$gm=false)
$tmpmonth = $prev_month;
$tmpyear = $prev_year;
- //Get first day of next week
+ //Get first day of next week
$tmptime=dol_mktime(12,0,0,$month,$tmpday,$year,1,0);
$tmptime-=24*60*60*7;
$tmparray=dol_getdate($tmptime,true);
$prev_day = $tmparray['mday'];
//Check prev day of week is in same month than first day or not
- if ($prev_day>$tmpday)
+ if ($prev_day > $tmpday)
{
$prev_month = $month-1;
$prev_year = $year;
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 0f6aec27eda..2e2bf34a75d 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -390,38 +390,43 @@ function dol_string_unaccent($str)
{
if (utf8_check($str))
{
+ // See http://www.utf8-chartable.de/
$string = rawurlencode($str);
$replacements = array(
- '%C3%80' => 'A','%C3%81' => 'A',
- '%C3%88' => 'E','%C3%89' => 'E',
- '%C3%8C' => 'I','%C3%8D' => 'I',
- '%C3%92' => 'O','%C3%93' => 'O',
- '%C3%99' => 'U','%C3%9A' => 'U',
- '%C3%A0' => 'a','%C3%A1' => 'a','%C3%A2' => 'a',
+ '%C3%80' => 'A','%C3%81' => 'A','%C3%82' => 'A','%C3%83' => 'A','%C3%84' => 'A','%C3%85' => 'A',
+ '%C3%88' => 'E','%C3%89' => 'E','%C3%8A' => 'E','%C3%8B' => 'E',
+ '%C3%8C' => 'I','%C3%8D' => 'I','%C3%8E' => 'I','%C3%8F' => 'I',
+ '%C3%92' => 'O','%C3%93' => 'O','%C3%94' => 'O','%C3%95' => 'O','%C3%96' => 'O',
+ '%C3%99' => 'U','%C3%9A' => 'U','%C3%9B' => 'U','%C3%9C' => 'U',
+ '%C3%A0' => 'a','%C3%A1' => 'a','%C3%A2' => 'a','%C3%A3' => 'a','%C3%A4' => 'a','%C3%A5' => 'a',
+ '%C3%A7' => 'c',
'%C3%A8' => 'e','%C3%A9' => 'e','%C3%AA' => 'e','%C3%AB' => 'e',
- '%C3%AC' => 'i','%C3%AD' => 'i','%C3%AE' => 'i',
- '%C3%B2' => 'o','%C3%B3' => 'o',
- '%C3%B9' => 'u','%C3%BA' => 'u'
+ '%C3%AC' => 'i','%C3%AD' => 'i','%C3%AE' => 'i','%C3%AF' => 'i',
+ '%C3%B1' => 'n',
+ '%C3%B2' => 'o','%C3%B3' => 'o','%C3%B4' => 'o','%C3%B5' => 'o','%C3%B6' => 'o',
+ '%C3%B9' => 'u','%C3%BA' => 'u','%C3%BB' => 'u','%C3%BC' => 'u',
+ '%C3%BF' => 'y'
);
$string=strtr($string, $replacements);
return rawurldecode($string);
}
else
{
+ // See http://www.ascii-code.com/
$string = strtr(
$str,
- "\xC0\xC1\xC2\xC3\xC5\xC7
+ "\xC0\xC1\xC2\xC3\xC4\xC5\xC7
\xC8\xC9\xCA\xCB\xCC\xCD\xCE\xCF\xD0\xD1
\xD2\xD3\xD4\xD5\xD8\xD9\xDA\xDB\xDD
- \xE0\xE1\xE2\xE3\xE5\xE7\xE8\xE9\xEA\xEB
+ \xE0\xE1\xE2\xE3\xE4\xE5\xE7\xE8\xE9\xEA\xEB
\xEC\xED\xEE\xEF\xF0\xF1\xF2\xF3\xF4\xF5\xF8
- \xF9\xFA\xFB\xFD\xFF",
- "AAAAAC
+ \xF9\xFA\xFB\xFC\xFD\xFF",
+ "AAAAAAC
EEEEIIIIDN
OOOOOUUUY
- aaaaaceeee
+ aaaaaaceeee
iiiidnooooo
- uuuyy"
+ uuuuyy"
);
$string = strtr($string, array("\xC4"=>"Ae", "\xC6"=>"AE", "\xD6"=>"Oe", "\xDC"=>"Ue", "\xDE"=>"TH", "\xDF"=>"ss", "\xE4"=>"ae", "\xE6"=>"ae", "\xF6"=>"oe", "\xFC"=>"ue", "\xFE"=>"th"));
return $string;
diff --git a/htdocs/core/modules/export/export_excel.modules.php b/htdocs/core/modules/export/export_excel.modules.php
index 46ab465f42e..bab287ff3b6 100644
--- a/htdocs/core/modules/export/export_excel.modules.php
+++ b/htdocs/core/modules/export/export_excel.modules.php
@@ -66,7 +66,7 @@ class ExportExcel extends ModeleExports
// If driver use an external library, put its name here
$this->label_lib='PhpExcel';
- $this->version_lib='1.7.2';
+ $this->version_lib='1.7.8';
$this->disabled = (in_array(constant('PHPEXCEL_PATH'),array('disabled','disabled/'))?1:0); // A condition to disable module (used for native debian packages)
diff --git a/htdocs/core/modules/export/export_excel2007.modules.php b/htdocs/core/modules/export/export_excel2007.modules.php
index 9d704ce8fbe..bf70c30ab1c 100644
--- a/htdocs/core/modules/export/export_excel2007.modules.php
+++ b/htdocs/core/modules/export/export_excel2007.modules.php
@@ -66,7 +66,7 @@ class ExportExcel2007 extends ExportExcel
// If driver use an external library, put its name here
$this->label_lib='PhpExcel';
- $this->version_lib='1.7.2';
+ $this->version_lib='1.7.8';
$this->disabled = (in_array(constant('PHPEXCEL_PATH'),array('disabled','disabled/'))?1:0); // A condition to disable module (used for native debian packages)
diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index d0dbc36e803..9d20c2b9722 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -1328,14 +1328,24 @@ if ($action == 'create')
// Payment term
print ''.$langs->trans('PaymentConditionsShort').' ';
- $form->select_conditions_paiements(isset($_POST['cond_reglement_id'])?$_POST['cond_reglement_id']:$cond_reglement_id,'cond_reglement_id');
+ $form->select_conditions_paiements(isset($_POST['cond_reglement_id'])?$_POST['cond_reglement_id']:$cond_reglement_id, 'cond_reglement_id');
print ' '.$langs->trans('PaymentMode').' ';
- $form->select_types_paiements(isset($_POST['mode_reglement_id'])?$_POST['mode_reglement_id']:$mode_reglement_id,'mode_reglement_id');
+ $form->select_types_paiements(isset($_POST['mode_reglement_id'])?$_POST['mode_reglement_id']:$mode_reglement_id, 'mode_reglement_id', 'DBIT');
print ' ' . $langs->trans('Project') . ' ';
+ $formproject->select_projects($soc->id, $projectid, 'projectid');
+ print ' '.$langs->trans('BankAccount').' ';
$form->select_comptes($fk_account, 'fk_account', 0, '', 1);
@@ -1784,11 +1794,11 @@ else
print ' ';
if ($action == 'editmode')
{
- $form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'mode_reglement_id');
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'DBIT');
}
else
{
- $form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'none');
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'none', 'DBIT');
}
print ' '.$cellID.' Formula SHARED FORMULA SETTING NEW SHARED FORMULA GETTING SHARED FORMULA Cell annotation ',$note,' DOM ELEMENT: ' , strtoupper($child->nodeName) , 'ATTRIBUTE: ' , $attribute->name , ' => ' , $attribute->value , ''.$columnID.$rowID.'
-Download current version:
-
-
-
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/docs/example.php b/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/docs/example.php
deleted file mode 100644
index d76c0f5f43a..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/docs/example.php
+++ /dev/null
@@ -1,166 +0,0 @@
-
-Magic Square Example
-
-The Jama distribution comes with a magic square example that is used to
-test and benchmark the LU, QR, SVD and symmetric Eig decompositions.
-The example outputs a multi-column table with these column headings:
-
-
-
-
- n Order of magic square.
-
-
- trace Diagonal sum, should be the magic sum, (n^3 + n)/2.
-
-
- max_eig Maximum eigenvalue of (A + A')/2, should equal trace.
-
-
- rank Linear algebraic rank, should equal n if n is odd, be less than n if n is even.
-
-
- cond L_2 condition number, ratio of singular values.
-
-
- lu_res test of LU factorization, norm1(L*U-A(p,:))/(n*eps).
-
-
- qr_res test of QR factorization, norm1(Q*R-A)/(n*eps).
-
-
-
-Running the Java-based version of the matix square example produces these results:
-
-
-
-
- n
- trace
- max_eig
- rank
- cond
- lu_res
- qr_res
-
-
- 3 15 15.000 3 4.330 0.000 11.333
-
-
- 4 34 34.000 3 Inf 0.000 13.500
-
- 5 65 65.000 5 5.462 0.000 14.400
-
-
- 6 111 111.000 5 Inf 5.333 16.000
-
-
- 7 175 175.000 7 7.111 2.286 37.714
-
-
- 8 260 260.000 3 Inf 0.000 59.000
-
-
- 9 369 369.000 9 9.102 7.111 53.333
-
-
- 10 505 505.000 7 Inf 3.200 159.200
-
-
- 11 671 671.000 11 11.102 2.909 215.273
-
-
- 12 870 870.000 3 Inf 0.000 185.333
-
-
- 13 1105 1105.000 13 13.060 4.923 313.846
-
-
- 14 1379 1379.000 9 Inf 4.571 540.571
-
-
- 15 1695 1695.000 15 15.062 4.267 242.133
-
-
- 16 2056 2056.000 3 Inf 0.000 488.500
-
-
- 17 2465 2465.000 17 17.042 7.529 267.294
-
-
- 18 2925 2925.000 11 Inf 7.111 520.889
-
-
- 19 3439 3439.000 19 19.048 16.842 387.368
-
-
- 20 4010 4010.000 3 Inf 14.400 584.800
-
-
- 21 4641 4641.000 21 21.035 6.095 1158.095
-
-
- 22 5335 5335.000 13 Inf 6.545 1132.364
-
-
- 23 6095 6095.000 23 23.037 11.130 1268.870
-
-
- 24 6924 6924.000 3 Inf 10.667 827.500
-
-
- 25 7825 7825.000 25 25.029 35.840 1190.400
-
-
- 26 8801 8801.000 15 Inf 4.923 1859.077
-
-
- 27 9855 9855.000 27 27.032 37.926 1365.333
-
-
- 28 10990 10990.000 3 Inf 34.286 1365.714
-
-
- 29 12209 12209.000 29 29.025 30.897 1647.448
-
-
- 30 13515 13515.000 17 Inf 8.533 2571.733
-
-
- 31 14911 14911.000 31 31.027 33.032 1426.581
-
-
- 32 16400 16400.000 3 Inf 0.000 1600.125
-
-
-Elapsed Time = 0.710 seconds
-
-
-The magic square example does not fare well when run as a PHP script . For a 32x32 matrix array
-it takes around a second to complete just the last row of computations in the above table.
-Hopefully this result will spur PHP developers to find optimizations and better attuned algorithms
-to speed things up. Matrix algebra is a great testing ground for ideas about time and memory
-performance optimation. Keep in perspective that PHP JAMA scripts are still plenty fast for use as
-a tool for learning about matrix algebra and quickly extending your knowledge with new scripts
-to apply knowledge.
-
-
-
-To learn more about the subject of magic squares you can visit the Drexel Math Forum on Magic Squares .
-You can also learn more by carefully examining the MagicSquareExample.php source code below.
-
-
-
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/docs/includes/credits.php b/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/docs/includes/credits.php
deleted file mode 100644
index efc91c228c2..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/docs/includes/credits.php
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- Brought to you by:
-
-
-