diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php index 86931ed31c0bcef31696f6799756f70ebf267b8f..10467294052f11bb6fe9ed9ce299e2b9c72bef68 100644 --- a/htdocs/accountancy/journal/bankjournal.php +++ b/htdocs/accountancy/journal/bankjournal.php @@ -752,7 +752,7 @@ if (empty($action) || $action == 'view') { print '<div class="tabsAction tabsActionNoBottom">'; print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />'; - print '<input type="button" class="butAction" value="' . $langs->trans("Export") . '" onclick="launch_export();" />'; + print '<input type="button" class="butAction" value="' . $langs->trans("ExportDraftJournal") . '" onclick="launch_export();" />'; print '</div>'; // TODO Avoid using js. We can use a direct link with $param diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php index 06e681285b2a64b4853d41c8fd9df0c6bda6fb83..c3ed681308cb934684b7a49ecb93359c5f5a8dcf 100644 --- a/htdocs/accountancy/journal/purchasesjournal.php +++ b/htdocs/accountancy/journal/purchasesjournal.php @@ -109,7 +109,7 @@ if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) { } if ($date_start && $date_end) $sql .= " AND f.datef >= '" . $db->idate($date_start) . "' AND f.datef <= '" . $db->idate($date_end) . "'"; -if ($in_bookkeeping == 'yes') +if ($in_bookkeeping == 'yes') $sql .= " AND (f.rowid NOT IN (SELECT fk_doc FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab WHERE ab.doc_type='supplier_invoice') )"; $sql .= " ORDER BY f.datef"; @@ -467,7 +467,7 @@ if ($action == 'export_csv') { print '"' . $journal_label . '"' ; print "\n"; } - + } } @@ -513,7 +513,7 @@ if (empty($action) || $action == 'view') { else { print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />'; } - print '<input type="button" class="butAction" value="' . $langs->trans("Export") . '" onclick="launch_export();" />'; + print '<input type="button" class="butAction" value="' . $langs->trans("ExportDraftJournal") . '" onclick="launch_export();" />'; print '</div>'; print ' diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php index 720e020f7c80eb82f77a903bd271c3d59d6b58c3..c77d9305d127635d96357b2bdfa600c2d428ab67 100644 --- a/htdocs/accountancy/journal/sellsjournal.php +++ b/htdocs/accountancy/journal/sellsjournal.php @@ -114,7 +114,7 @@ if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) { $sql .= " AND fd.product_type IN (0,1)"; if ($date_start && $date_end) $sql .= " AND f.datef >= '" . $db->idate($date_start) . "' AND f.datef <= '" . $db->idate($date_end) . "'"; -if ($in_bookkeeping == 'yes') +if ($in_bookkeeping == 'yes') $sql .= " AND (f.rowid NOT IN (SELECT fk_doc FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab WHERE ab.doc_type='customer_invoice') )"; $sql .= " ORDER BY f.datef"; @@ -408,7 +408,7 @@ if ($action == 'export_csv') { $sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV; $sell_journal = $conf->global->ACCOUNTING_SELL_JOURNAL; - + include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php'; @@ -424,7 +424,7 @@ if ($action == 'export_csv') { $invoicestatic->ref = $val["ref"]; $date = dol_print_date($val["date"], 'day'); - + foreach ( $tabttc[$key] as $k => $mt ) { print '"' . $key . '"' . $sep; print '"' . $date . '"' . $sep; @@ -445,7 +445,7 @@ if ($action == 'export_csv') { foreach ( $tabht[$key] as $k => $mt ) { $accountingaccount = new AccountingAccount($db); $accountingaccount->fetch(null, $k, true); - + if ($mt) { print '"' . $key . '"' . $sep; @@ -466,9 +466,9 @@ if ($action == 'export_csv') { // VAT foreach ( $tabtva[$key] as $k => $mt ) { - - - + + + if ($mt) { print '"' . $key . '"' . $sep; print '"' . $date . '"' . $sep; @@ -523,7 +523,7 @@ if (empty($action) || $action == 'view') { else { print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />'; } - print '<input type="button" class="butAction" value="' . $langs->trans("Export") . '" onclick="launch_export();" />'; + print '<input type="button" class="butAction" value="' . $langs->trans("ExportDraftJournal") . '" onclick="launch_export();" />'; print '</div>'; print ' diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang index f9ec68a16896704dc2b97a26018167e5670de0d9..bcbac85c17d1d5a7057137f0ca38bdbcaf8bd9d5 100644 --- a/htdocs/langs/en_US/accountancy.lang +++ b/htdocs/langs/en_US/accountancy.lang @@ -221,6 +221,7 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use ## Export Exports=Exports Export=Export +ExportDraftJournal=Export draft journal Modelcsv=Model of export OptionsDeactivatedForThisExportModel=For this export model, options are deactivated Selectmodelcsv=Select a model of export