diff --git a/htdocs/blockedlog/admin/blockedlog_archives.php b/htdocs/blockedlog/admin/blockedlog_archives.php index 0ad8db08e92..b9287a34f8d 100644 --- a/htdocs/blockedlog/admin/blockedlog_archives.php +++ b/htdocs/blockedlog/admin/blockedlog_archives.php @@ -270,6 +270,7 @@ if (GETPOST('action') == 'export' && $user->hasRight('blockedlog', 'read')) { / .';'.$langs->transnoentities('Id') .';'.$langs->transnoentities('DateCreation') .';'.$langs->transnoentities('Action') + .';'.$langs->transnoentities('Origin') .';'.$langs->transnoentities('AmountHT') .';'.$langs->transnoentities('AmountTTC') .';'.$langs->transnoentities('Ref') @@ -288,6 +289,7 @@ if (GETPOST('action') == 'export' && $user->hasRight('blockedlog', 'read')) { / $loweridinerror = 0; $i = 0; + $refinvoicefound = array(); $totalhtamount = array(); $totalvatamount = array(); $totalamount = array(); @@ -300,6 +302,8 @@ if (GETPOST('action') == 'export' && $user->hasRight('blockedlog', 'read')) { / $block_static->date_creation = $db->jdate($obj->date_creation); // jdate(date_creation) is UTC + $block_static->module_source = $obj->module_source; + $block_static->amounts_excl = (float) $obj->amounts_excl; // Database store value with 8 digits, we cut ending 0 them with (flow) $block_static->amounts = (float) $obj->amounts; // Database store value with 8 digits, we cut ending 0 them with (flow) @@ -359,13 +363,14 @@ if (GETPOST('action') == 'export' && $user->hasRight('blockedlog', 'read')) { / // Define $totalhtamount, $totalvatamount, $totalamount for $block->action event code $total_ht = $total_vat = $total_ttc = 0; - sumAmountsForUnalterableEvent($block_static, $totalhtamount, $totalvatamount, $totalamount, $total_ht, $total_vat, $total_ttc); + sumAmountsForUnalterableEvent($block_static, $refinvoicefound, $totalhtamount, $totalvatamount, $totalamount, $total_ht, $total_vat, $total_ttc); fwrite($fh, ";" .csvClean($block_static->id).';' .csvClean($block_static->date_creation).';' .csvClean($block_static->action).';' + .csvClean($block_static->module_source).';' .csvClean($block_static->amounts_taxexcl).';' // Can be 1.20000000 with 8 digits. TODO Clean to have 8 digits in V1 .csvClean($block_static->amounts).';' // Can be 1.20000000 with 8 digits. TODO Clean to have 8 digits in V1 .csvClean($block_static->ref_object).';' @@ -373,7 +378,7 @@ if (GETPOST('action') == 'export' && $user->hasRight('blockedlog', 'read')) { / .csvClean($block_static->user_fullname).';' .csvClean($block_static->linktoref).';' .csvClean($block_static->linktype).';' - .csvClean($obj->object_data).';' // We must the string to decode into object with dolDecodeBlockedData + .csvClean($obj->object_data).';' // We must use the string (so $obj->object_data) and not the array decoded with dolDecodeBlockedData .csvClean($block_static->object_version).';' .csvClean($block_static->object_format).';' .csvClean($block_static->signature).';' @@ -392,7 +397,7 @@ if (GETPOST('action') == 'export' && $user->hasRight('blockedlog', 'read')) { / // Now calculate cumulative total of all invoices validated if (array_key_exists('BILL_VALIDATE', $totalhtamount)) { - foreach ($totalhtamount['BILL_VALIDATE'] as $key => $val) { + foreach ($totalhtamount['BILL_VALIDATE'] as $key => $val) { // Loop on each module $totalhtamountalllines['BILL_VALIDATE'] += $val; } foreach ($totalvatamount['BILL_VALIDATE'] as $key => $val) { @@ -419,6 +424,7 @@ if (GETPOST('action') == 'export' && $user->hasRight('blockedlog', 'read')) { / $block_static->id = ''; $block_static->date_creation = ''; $block_static->action = 'BILL_VALIDATE'; + $block_static->module_source = '*'; $block_static->amounts_taxexcl = $totalhtamountalllines['BILL_VALIDATE']; $block_static->amounts = $totalamountalllines['BILL_VALIDATE']; $block_static->ref_object = $langs->transnoentitiesnoconv("VAT").': '.$totalvatamountalllines['BILL_VALIDATE']; @@ -426,19 +432,19 @@ if (GETPOST('action') == 'export' && $user->hasRight('blockedlog', 'read')) { / $block_static->user_fullname = ''; $block_static->linktoref = ''; $block_static->linktype = ''; - $block_static->object_data = ''; $block_static->object_version = ''; + $block_static->object_format = ''; $block_static->signature = ''; $statusofrecord = ''; $signatureexport = ''; - $block_static->object_format = ''; - fwrite($fh, 'Cumulative total - Invoice validations;' + fwrite($fh, 'Cumulative total - Invoice validations (all invoices);' .csvClean($block_static->id).';' .csvClean($block_static->date_creation).';' .csvClean($block_static->action).';' + .csvClean($block_static->module_source).';' .csvClean($block_static->amounts_taxexcl).';' // Can be 1.20000000 with 8 digits. TODO Clean to have 8 digits in V1 .csvClean($block_static->amounts).';' // Can be 1.20000000 with 8 digits. TODO Clean to have 8 digits in V1 .csvClean($block_static->ref_object).';' @@ -446,7 +452,7 @@ if (GETPOST('action') == 'export' && $user->hasRight('blockedlog', 'read')) { / .csvClean($block_static->user_fullname).';' .csvClean($block_static->linktoref).';' .csvClean($block_static->linktype).';' - .csvClean($obj->object_data).';' // We must the string to decode into object with dolDecodeBlockedData + .csvClean($obj->object_data).';' // We must use the string (so $obj->object_data) and not the array decoded with dolDecodeBlockedData .csvClean($block_static->object_version).';' .csvClean($block_static->object_format).';' .csvClean($block_static->signature).';' @@ -458,6 +464,7 @@ if (GETPOST('action') == 'export' && $user->hasRight('blockedlog', 'read')) { / $block_static->id = ''; $block_static->date_creation = ''; $block_static->action = 'PAYMENT_CUSTOMER_CREATE'; + $block_static->module_source = '*'; $block_static->amounts_taxexcl = ''; $block_static->amounts = $totalamountalllines['PAYMENT_CUSTOMER_CREATE']; $block_static->ref_object = ''; @@ -465,19 +472,17 @@ if (GETPOST('action') == 'export' && $user->hasRight('blockedlog', 'read')) { / $block_static->user_fullname = ''; $block_static->linktoref = ''; $block_static->linktype = ''; - $block_static->object_data = ''; $block_static->object_version = ''; + $block_static->object_format = ''; $block_static->signature = ''; - $statusofrecord = ''; $signatureexport = ''; - $block_static->object_format = ''; - - fwrite($fh, 'Cumulative total - Invoice payments;' + fwrite($fh, 'Cumulative total - Invoice payments (all payments);' .csvClean($block_static->id).';' .csvClean($block_static->date_creation).';' .csvClean($block_static->action).';' + .csvClean($block_static->module_source).';' .csvClean($block_static->amounts_taxexcl).';' // Can be 1.20000000 with 8 digits. TODO Clean to have 8 digits in V1 .csvClean($block_static->amounts).';' // Can be 1.20000000 with 8 digits. TODO Clean to have 8 digits in V1 .csvClean($block_static->ref_object).';' @@ -485,7 +490,7 @@ if (GETPOST('action') == 'export' && $user->hasRight('blockedlog', 'read')) { / .csvClean($block_static->user_fullname).';' .csvClean($block_static->linktoref).';' .csvClean($block_static->linktype).';' - .csvClean($obj->object_data).';' // We must the string to decode into object with dolDecodeBlockedData + .csvClean($obj->object_data).';' // We must use the string (so $obj->object_data) and not the array decoded with dolDecodeBlockedData .csvClean($block_static->object_version).';' .csvClean($block_static->object_format).';' .csvClean($block_static->signature).';' @@ -493,24 +498,34 @@ if (GETPOST('action') == 'export' && $user->hasRight('blockedlog', 'read')) { / .csvClean($signatureexport).';'."\n"); - // Calculate perpetual totals - $sql = "SELECT action, object_format, MIN(date_creation) as datemin, SUM(amounts_taxexcl) as sumamounts_taxexcl, SUM(amounts) as sumamounts"; + // Calculate lifetime totals (with date of first record) + $sql = "SELECT action, module_source, object_format, MIN(date_creation) as datemin, SUM(amounts_taxexcl) as sumamounts_taxexcl, SUM(amounts) as sumamounts"; $sql .= " FROM ".MAIN_DB_PREFIX."blockedlog"; $sql .= " WHERE entity = ".((int) $conf->entity); $sql .= " AND action IN ('BILL_VALIDATE', 'PAYMENT_CUSTOMER_CREATE')"; - $sql .= " GROUP BY action, object_format"; + $sql .= " GROUP BY action, module_source, object_format"; $foundoldformat = 0; - $firstrecorddate = array(); + $firstrecorddatearray = array(); + $firstrecorddate = 0; $resql = $db->query($sql); if ($resql) { while ($obj = $db->fetch_object($resql)) { - if (!empty($firstrecorddate[$obj->action])) { - $firstrecorddate[$obj->action] = min($firstrecorddate[$obj->action], $db->jdate($obj->datemin)); + // First record date per action code and module + if (!empty($firstrecorddatearray[$obj->action][$obj->module_source])) { + $firstrecorddatearray[$obj->action][$obj->module_source] = min($firstrecorddatearray[$obj->action][$obj->module_source], $db->jdate($obj->datemin)); } else { - $firstrecorddate[$obj->action] = $db->jdate($obj->datemin); + $firstrecorddatearray[$obj->action] = array(); + $firstrecorddatearray[$obj->action][$obj->module_source] = $db->jdate($obj->datemin); } - $totalamountlifetime[$obj->action] += $obj->sumamounts; + // First record for all actions code + if (!empty($firstrecorddate)) { + $firstrecorddate = min($firstrecorddate, $db->jdate($obj->datemin)); + } else { + $firstrecorddate = $obj->datemin; + } + // Total per action code and module + $totalamountlifetime[$obj->action][$obj->module_source] += $obj->sumamounts; // If format of line is old, the sumamounts_taxexcl was not recorded. So we flag this case. if (empty($obj->object_format) || $obj->object_format == 'V1') { $foundoldformat = 1; @@ -528,7 +543,9 @@ if (GETPOST('action') == 'export' && $user->hasRight('blockedlog', 'read')) { / $block_static->id = ''; $block_static->date_creation = ''; $block_static->action = 'BILL_VALIDATE'; + $block_static->module_source = '*'; // if an old format was found, we do not have reliable amount excluding tax for lifetime value, we do not show it + $block_static->amounts_taxexcl = ($foundoldformat ? '' : $totalhtamountlifetime['BILL_VALIDATE']); $block_static->amounts = $totalamountlifetime['BILL_VALIDATE']; // if an old format was found, we do not have reliable VAT amount for lifetime value, we do not show it @@ -537,19 +554,18 @@ if (GETPOST('action') == 'export' && $user->hasRight('blockedlog', 'read')) { / $block_static->user_fullname = ''; $block_static->linktoref = ''; $block_static->linktype = ''; - $block_static->object_data = ''; $block_static->object_version = ''; + $block_static->object_format = ''; $block_static->signature = ''; $statusofrecord = ''; $signatureexport = ''; - $block_static->object_format = ''; - - fwrite($fh, 'Lifetime total (>= '.dol_print_date($firstrecorddate['BILL_VALIDATE'], 'standard').') - Invoice validations;' + fwrite($fh, 'Lifetime total (>= '.dol_print_date($firstrecorddate, 'standard').') - Invoice validations (all invoices);' .csvClean($block_static->id).';' .csvClean($block_static->date_creation).';' .csvClean($block_static->action).';' + .csvClean($block_static->module_source).';' .csvClean($block_static->amounts_taxexcl).';' // Can be 1.20000000 with 8 digits. TODO Clean to have 8 digits in V1 .csvClean($block_static->amounts).';' // Can be 1.20000000 with 8 digits. TODO Clean to have 8 digits in V1 .csvClean($block_static->ref_object).';' @@ -557,17 +573,19 @@ if (GETPOST('action') == 'export' && $user->hasRight('blockedlog', 'read')) { / .csvClean($block_static->user_fullname).';' .csvClean($block_static->linktoref).';' .csvClean($block_static->linktype).';' - .csvClean($obj->object_data).';' // We must the string to decode into object with dolDecodeBlockedData + .csvClean($obj->object_data).';' // We must use the string (so $obj->object_data) and not the array decoded with dolDecodeBlockedData .csvClean($block_static->object_version).';' .csvClean($block_static->object_format).';' .csvClean($block_static->signature).';' .csvClean($statusofrecord).';' .csvClean($signatureexport).';'."\n"); + // Add a final line with perpetual total for customer payments $block_static->id = ''; $block_static->date_creation = ''; $block_static->action = 'PAYMENT_CUSTOMER_CREATE'; + $block_static->module_source = '*'; $block_static->amounts_taxtecl = ''; $block_static->amounts = $totalamountlifetime['PAYMENT_CUSTOMER_CREATE']; $block_static->ref_object = ''; @@ -575,19 +593,18 @@ if (GETPOST('action') == 'export' && $user->hasRight('blockedlog', 'read')) { / $block_static->user_fullname = ''; $block_static->linktoref = ''; $block_static->linktype = ''; - $block_static->object_data = ''; $block_static->object_version = ''; + $block_static->object_format = ''; $block_static->signature = ''; $statusofrecord = ''; $signatureexport = ''; - $block_static->object_format = ''; - - fwrite($fh, 'Lifetime total (>= '.dol_print_date($firstrecorddate['PAYMENT_CUSTOMER_CREATE'], 'standard').') - Invoice payments;' + fwrite($fh, 'Lifetime total (>= '.dol_print_date($firstrecorddate, 'standard').') - Invoice payments (all payments);' .csvClean($block_static->id).';' .csvClean($block_static->date_creation).';' .csvClean($block_static->action).';' + .csvClean($block_static->module_source).';' .csvClean($block_static->amounts_taxexcl).';' // Can be 1.20000000 with 8 digits. TODO Clean to have 8 digits in V1 .csvClean($block_static->amounts).';' // Can be 1.20000000 with 8 digits. TODO Clean to have 8 digits in V1 .csvClean($block_static->ref_object).';' @@ -595,7 +612,7 @@ if (GETPOST('action') == 'export' && $user->hasRight('blockedlog', 'read')) { / .csvClean($block_static->user_fullname).';' .csvClean($block_static->linktoref).';' .csvClean($block_static->linktype).';' - .csvClean($obj->object_data).';' // We must the string to decode into object with dolDecodeBlockedData + .csvClean($obj->object_data).';' // We must use the string (so $obj->object_data) and not the array decoded with dolDecodeBlockedData .csvClean($block_static->object_version).';' .csvClean($block_static->object_format).';' .csvClean($block_static->signature).';' @@ -604,7 +621,7 @@ if (GETPOST('action') == 'export' && $user->hasRight('blockedlog', 'read')) { / fclose($fh); - // Calculate the md5 of the file (the last line has a return line) + // Calculate the signature of the file (the last line has a return line) $algo = 'sha256'; $sha256 = hash_file($algo, $tmpfile); $hmacsha256 = hash_hmac_file($algo, $tmpfile, $secretkey); diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php index 468c50e14d8..05d4f4c1a4f 100644 --- a/htdocs/blockedlog/admin/blockedlog_list.php +++ b/htdocs/blockedlog/admin/blockedlog_list.php @@ -636,6 +636,7 @@ if (getDolGlobalString('BLOCKEDLOG_SCAN_ALL_FOR_LOWERIDINERROR')) { } } +$refinvoicefound = array(); $totalhtamount = array(); $totalvatamount = array(); $totalamount = array(); @@ -703,9 +704,9 @@ if (is_array($blocks)) { //$tmpobj = json_decode($block->object_data); - // Define $totalhtamount, $totalvatamount, $totalamount for $block->action event code + // Define $totalhtamount, $totalvatamount, $totalamount for $block action code and module $total_ht = $total_vat = $total_ttc = 0; - sumAmountsForUnalterableEvent($block, $totalhtamount, $totalvatamount, $totalamount, $total_ht, $total_vat, $total_ttc); + sumAmountsForUnalterableEvent($block, $refinvoicefound, $totalhtamount, $totalvatamount, $totalamount, $total_ht, $total_vat, $total_ttc); // Amount print '