';
+
// field
print "| ".$row[0]." | ";
+
// type
- print "".$row[1]." | ";
+ print "";
+ $proptype = $row[1];
+ $pictoType = '';
+ $matches = array();
+ if (preg_match('/^varchar/', $proptype, $matches)) {
+ $pictoType = 'varchar';
+ } elseif (strpos($proptype, 'int') === 0 || strpos($proptype, 'tinyint') === 0 || strpos($proptype, 'bigint') === 0) {
+ $pictoType = 'int';
+ } elseif (strpos($proptype, 'timestamp') === 0) {
+ $pictoType = 'datetime';
+ } elseif (strpos($proptype, 'real') === 0) {
+ $pictoType = 'double';
+ }
+ print(!empty($pictoType) ? getPictoForType($pictoType) : getPictoForType($proptype)).''.dol_escape_htmltag($proptype).'';
+ print " | ";
+
// collation
- print "".$row[2]." | ";
+ print "".(empty($row[2]) ? ' ' : $row[2]);
+
+ // Link to convert collation
+ if (isset($row[2])) {
+ print '
'.$langs->trans("ConvertInto");
+ if (!in_array($row[2], array("utf8_unicode_ci"))) {
+ print ' utf8';
+ }
+ if (!in_array($row[2], array("utf8mb4_unicode_ci"))) {
+ print ' utf8mb4';
+ }
+ print '';
+ } else {
+ print '
';
+ }
+
+ print " | ";
+
// null
print "".$row[3]." | ";
// key
diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php
index 648f7706ad9..d68b7c054ef 100644
--- a/htdocs/admin/workflow.php
+++ b/htdocs/admin/workflow.php
@@ -158,7 +158,7 @@ $workflowcodes = array(
'WORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE' => array(
'family' => 'classify_shipping',
'position' => 90,
- 'enabled' => isModEnabled("expedition") && isModEnabled("facture"),
+ 'enabled' => isModEnabled("shipping") && isModEnabled("invoice"),
'picto' => 'shipment',
'deprecated' => 1
),
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index d0efa85599e..9c512bfc047 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -1491,6 +1491,7 @@ if ($action == 'create') {
print '';
// List of files
$listofpaths = dol_dir_list($upload_dir, 'all', 0, '', '', 'name', SORT_ASC, 0);
+ $out = '';
// TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript
$out .= ''."\n";
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 7296c3dd820..86898548291 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -1573,6 +1573,7 @@ if (empty($reshook)) {
$TTotalByTva[$line->tva_tx] += $line->total_ttc;
}
+ $amount_ttc_diff = 0.;
foreach ($TTotalByTva as $tva => &$total) {
$coef = $total / $srcobject->total_ttc; // Calc coef
$am = $amount * $coef;
diff --git a/htdocs/compta/paiement_vat.php b/htdocs/compta/paiement_vat.php
index af4e1463ae3..ecb946e6686 100644
--- a/htdocs/compta/paiement_vat.php
+++ b/htdocs/compta/paiement_vat.php
@@ -253,6 +253,7 @@ if ($action == 'create') {
$total = 0;
$totalrecu = 0;
+ $total_ttc = 0.;
while ($i < $num) {
$objp = $tva;
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 2cc21fb215d..e3a3eb07439 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -83,6 +83,9 @@ class BonPrelevement extends CommonObject
public $factures = array();
+ /**
+ * @var array
+ */
public $methodes_trans = array();
public $invoice_in_error = array();
@@ -171,6 +174,9 @@ class BonPrelevement extends CommonObject
public $credite;
public $note;
public $date_trans;
+ /**
+ * @var int Current transport method, index to $methodes_trans
+ */
public $method_trans;
public $fk_user_trans;
public $date_credit;
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index 1fe40efa05e..1dc1fd3d76d 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -274,10 +274,10 @@ if ($resql) {
$num = $db->num_rows($resql);
$i = 0;
+ $param = "&id=".((int) $id);
if ($limit > 0 && $limit != $conf->liste_limit) {
$param .= '&limit='.((int) $limit);
}
- $param = "&id=".urlencode((string) ($id));
// Lines of title fields
print ' |