From 18d187877508d20e1b6b9356dbd324c8599ac8ae Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 6 Nov 2016 13:07:49 +0100
Subject: [PATCH] Debug accountancy module
---
htdocs/accountancy/admin/importaccounts.php | 26 ++++++++++++++-------
htdocs/core/modules/modAccounting.class.php | 5 ----
2 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/htdocs/accountancy/admin/importaccounts.php b/htdocs/accountancy/admin/importaccounts.php
index 720f3a4f012..99b491688cb 100644
--- a/htdocs/accountancy/admin/importaccounts.php
+++ b/htdocs/accountancy/admin/importaccounts.php
@@ -40,6 +40,22 @@ $langs->load("accountancy");
if (! $user->admin)
accessforbidden();
+$limit = GETPOST("limit")?GETPOST("limit","int"):(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if ($page == -1) { $page = 0; }
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+
+
+
+
+/*
+ * View
+ */
+
llxHeader('', $langs->trans("ImportAccount"));
$to_import = GETPOST("mesCasesCochees");
@@ -90,15 +106,7 @@ if ($_POST["action"] == 'import') {
print '<div><font color="red">' . $langs->trans("EndProcessing") . '</font></div>';
}
-/*
- * list accounting account from product
- *
- */
-$page = GETPOST("page");
-if ($page < 0)
- $page = 0;
-$limit = $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION;
-$offset = $limit * $page;
+// list accounting account from product
$sql = "(SELECT p.rowid as product_id, p.accountancy_code_sell as accounting ";
$sql .= " FROM " . MAIN_DB_PREFIX . "product as p ";
diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index 4316bf6c13e..0e3dedb0109 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -143,11 +143,6 @@ class modAccounting extends DolibarrModules
"chaine",
""
);
- $this->const[12] = array(
- "ACCOUNTING_LIMIT_LIST_VENTILATION",
- "chaine",
- "50"
- );
$this->const[13] = array(
"ACCOUNTING_LIST_SORT_VENTILATION_TODO",
"yesno",
--
GitLab