\n";
if (!$i) {
$totalarray['nbfield']++;
@@ -515,7 +534,7 @@ if ($resql) {
// Account label to show (label short)
if (!empty($arrayfields['aa.labelshort']['checked'])) {
print "
\n";
if (!$i) {
$totalarray['nbfield']++;
@@ -549,10 +568,30 @@ if ($resql) {
}
}
- // Chart of accounts type
+ // Predefined group (deprecated)
if (!empty($arrayfields['aa.pcg_type']['checked'])) {
print "
\n";
if (!$i) {
$totalarray['nbfield']++;
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index eca5a1beadc..43c5cf4996e 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -1554,6 +1554,16 @@ while ($i < min($num, $limit)) {
// Show total line
include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+// If no record found
+if ($num == 0) {
+ $colspan = 1;
+ foreach ($arrayfields as $key => $val) {
+ if (!empty($val['checked'])) {
+ $colspan++;
+ }
+ }
+ print '
'.$langs->trans("NoRecordFound").'
';
+}
$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 2e434550c25..78aea811a5d 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -1269,6 +1269,16 @@ if (!empty($totalarray['val']['totalcredit'])) {
// Show total line
include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+// If no record found
+if ($num == 0) {
+ $colspan = 1;
+ foreach ($arrayfields as $key => $val) {
+ if (!empty($val['checked'])) {
+ $colspan++;
+ }
+ }
+ print '
'.$langs->trans("NoRecordFound").'
';
+}
$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 6083209a32e..2ba281b9cb5 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1301,6 +1301,7 @@ class Commande extends CommonOrder
{
global $conf, $hookmanager;
+ dol_include_once('/multicurrency/class/multicurrency.class.php');
dol_include_once('/core/class/extrafields.class.php');
$error = 0;
@@ -1376,6 +1377,29 @@ class Commande extends CommonOrder
$this->origin = $object->element;
$this->origin_id = $object->id;
+ // Multicurrency (test on $this->multicurrency_tx because we should take the default rate only if not using origin rate)
+ if (!empty($conf->multicurrency->enabled)) {
+ if (!empty($object->multicurrency_code)) {
+ $this->multicurrency_code = $object->multicurrency_code;
+ }
+ if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($object->multicurrency_tx)) {
+ $this->multicurrency_tx = $object->multicurrency_tx;
+ }
+
+ if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) {
+ $tmparray = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $this->date_commande);
+ $this->fk_multicurrency = $tmparray[0];
+ $this->multicurrency_tx = $tmparray[1];
+ } else {
+ $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+ }
+ if (empty($this->fk_multicurrency)) {
+ $this->multicurrency_code = $conf->currency;
+ $this->fk_multicurrency = 0;
+ $this->multicurrency_tx = 1;
+ }
+ }
+
// get extrafields from original line
$object->fetch_optionals();
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 5e388862409..cc6b92f72cb 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3067,8 +3067,8 @@ if ($action == 'create') {
$remise_absolue = (!empty($expesrc->remise_absolue) ? $expesrc->remise_absolue : (!empty($soc->remise_absolue) ? $soc->remise_absolue : 0));
if (isModEnabled('multicurrency')) {
- $currency_code = (!empty($expesrc->currency_code) ? $expesrc->currency_code : (!empty($soc->currency_code) ? $soc->currency_code : $objectsrc->multicurrency_code));
- $currency_tx = (!empty($expesrc->currency_tx) ? $expesrc->currency_tx : (!empty($soc->currency_tx) ? $soc->currency_tx : $objectsrc->currency_tx));
+ $currency_code = (!empty($expesrc->multicurrency_code) ? $expesrc->multicurrency_code : (!empty($soc->multicurrency_code) ? $soc->multicurrency_code : $objectsrc->multicurrency_code));
+ $currency_tx = (!empty($expesrc->multicurrency_tx) ? $expesrc->multicurrency_tx : (!empty($soc->multicurrency_tx) ? $soc->multicurrency_tx : $objectsrc->multicurrency_tx));
}
//Replicate extrafields
@@ -4678,16 +4678,16 @@ if ($action == 'create') {
if ($displayWarranty) {
// Retained Warranty
print '