From 2ce4ba99fe4893c535c41d72c98aad9128fc2b0c Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Wed, 1 Feb 2017 06:54:01 +0100
Subject: [PATCH] Fix : [FP17] Correct some fix on category accounting account
 page

---
 htdocs/accountancy/admin/categories.php       | 82 +++++++++----------
 .../class/accountancycategory.class.php       |  9 +-
 htdocs/langs/en_US/accountancy.lang           |  2 +
 3 files changed, 47 insertions(+), 46 deletions(-)

diff --git a/htdocs/accountancy/admin/categories.php b/htdocs/accountancy/admin/categories.php
index 12d9a707cbd..d052b4312a7 100644
--- a/htdocs/accountancy/admin/categories.php
+++ b/htdocs/accountancy/admin/categories.php
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2016	   Jamal Elbaz		<jamelbaz@gmail.pro>
+/* Copyright (C) 2016		Jamal Elbaz			<jamelbaz@gmail.pro>
+ * Copyright (C) 2017		Alexandre Spangaro	<aspangaro@zendsi.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,24 +17,24 @@
  */
 
 /**
- * \file htdocs/accountancy/admin/categories.php
+ * \file	htdocs/accountancy/admin/categories.php
  * \ingroup Advanced accountancy
- * \brief Page to assign mass categories to accounts
+ * \brief	Page to assign mass categories to accounts
  */
 require '../../main.inc.php';
-
-// Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountancycategory.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
 $error = 0;
 
-// Langs
 $langs->load("bills");
 $langs->load("accountancy");
 
 $mesg = '';
+$id = GETPOST('id', 'int');
+$rowid = GETPOST('rowid', 'int');
+$cancel = GETPOST('cancel');
 $action = GETPOST('action');
 $cat_id = GETPOST('account_category');
 $selectcpt = GETPOST('cpt_bk', 'array');
@@ -43,36 +44,31 @@ if ($cat_id == 0) {
 	$cat_id = null;
 }
 
-$id = GETPOST('id', 'int');
-$rowid = GETPOST('rowid', 'int');
-$cancel = GETPOST('cancel');
-
 // Security check
-if (! $user->admin)
-	accessforbidden();
+if (! $user->admin) accessforbidden();
 
-$AccCat = new AccountancyCategory($db);
+$accountingcategory = new AccountancyCategory($db);
 
 // si ajout de comptes
 if (! empty($selectcpt)) {
 	$cpts = array ();
-	foreach ( $selectcpt as $selectedOption ) {
-		if (! array_key_exists($selectedOption, $cpts))
-			$cpts[$selectedOption] = "'" . $selectedOption . "'";
+	foreach ( $selectcpt as $selectedoption ) {
+		if (! array_key_exists($selectedoption, $cpts))
+			$cpts[$selectedoption] = "'" . $selectedoption . "'";
 	}
 
-	$return= $AccCat->updateAccAcc($cat_id, $cpts);
+	$return= $accountingcategory->updateAccAcc($cat_id, $cpts);
 
 	if ($return<0) {
-		setEventMessages($langs->trans('errors'), $AccCat->errors, 'errors');
+		setEventMessages($langs->trans('errors'), $accountingcategory->errors, 'errors');
 	} else {
 		setEventMessages($langs->trans('Saved'), null, 'mesgs');
 	}
 }
 if ($action == 'delete') {
 	if ($cpt_id) {
-		if ($AccCat->deleteCptCat($cpt_id)) {
-			setEventMessages($langs->trans('Deleted'), null, 'mesgs');
+		if ($accountingcategory->deleteCptCat($cpt_id)) {
+			setEventMessages($langs->trans('CategoryDeleted'), null, 'mesgs');
 		} else {
 			setEventMessages($langs->trans('errors'), null, 'errors');
 		}
@@ -83,12 +79,11 @@ if ($action == 'delete') {
 /*
  * View
  */
+$form = new Form($db);
+$formaccounting = new FormAccounting($db);
 
 llxheader('', $langs->trans('AccountAccounting'));
 
-$formaccounting = new FormAccounting($db);
-$form = new Form($db);
-
 print load_fiche_titre($langs->trans('Categories'));
 
 print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
@@ -102,22 +97,23 @@ print '<table class="border" width="100%">';
 print '<tr><td>' . $langs->trans("AccountingCategory") . '</td>';
 print '<td>';
 $formaccounting->select_accounting_category($cat_id, 'account_category', 1);
-print '<input class="button" type="submit" value="' . $langs->trans("Display") . '">';
+print '<input class="button" type="submit" value="' . $langs->trans("Show") . '">';
 print '</td></tr>';
 
 if (! empty($cat_id)) {
-	$return = $AccCat->getCptBK($cat_id);
+	$return = $accountingcategory->getCptBK($cat_id);
 	if ($return < 0) {
-		setEventMessages(null, $AccCat->errors, 'errors');
+		setEventMessages(null, $accountingcategory->errors, 'errors');
 	}
-	print '<tr><td>' . $langs->trans("AddCompteFromBK") . '</td>';
+	print '<tr><td>' . $langs->trans("AddAccountFromBookKeepingWithNoCategories") . '</td>';
 	print '<td>';
-	if (is_array($AccCat->lines_cptbk) && count($AccCat->lines_cptbk) > 0) {
+	if (is_array($accountingcategory->lines_cptbk) && count($accountingcategory->lines_cptbk) > 0) {
 		print '<select size="' . count($obj) . '" name="cpt_bk[]" multiple>';
-		foreach ( $AccCat->lines_cptbk as $cpt ) {
+		foreach ( $accountingcategory->lines_cptbk as $cpt ) {
 			print '<option value="' . length_accountg($cpt->numero_compte) . '">' . length_accountg($cpt->numero_compte) . ' (' . $cpt->label_compte . ' ' . $cpt->doc_ref . ')</option>';
 		}
-		print '</select> - <input class="button" type="submit" id="" class="action-delete" value="' . $langs->trans("add") . '"> ';
+		print '</select>';
+		print '<input class="button" type="submit" id="" class="action-delete" value="' . $langs->trans("Add") . '"> ';
 	}
 	print '</td></tr>';
 }
@@ -131,26 +127,30 @@ print '</form>';
 
 if ($action == 'display' || $action == 'delete') {
 
-	print '<table class="noborder" width="100%">';
-
-	print '<tr class="liste_titre"><th class="liste_titre">' . $langs->trans("Numerocompte") . '</th><th class="liste_titre">' . $langs->trans("Description") . '</th><th class="liste_titre" width="60" align="center">Action</th></tr>';
+    print "<table class='noborder' width='100%'>\n";
+    print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("AccountAccounting")."</td>";
+	print '<td colspan="2">'.$langs->trans("Label")."</td>";
+	print "</tr>\n";
 
 	if (! empty($cat_id)) {
-		$return = $AccCat->display($cat_id);
+		$return = $accountingcategory->display($cat_id);
 		if ($return < 0) {
-			setEventMessages(null, $AccCat->errors, 'errors');
+			setEventMessages(null, $accountingcategory->errors, 'errors');
 		}
-		$j = 1;
-		if (is_array($AccCat->lines_display) && count($AccCat->lines_display) > 0) {
-			foreach ( $AccCat->lines_display as $cpt ) {
+
+		if (is_array($accountingcategory->lines_display) && count($accountingcategory->lines_display) > 0) {
+			foreach ( $accountingcategory->lines_display as $cpt ) {
 				$var = ! $var;
 				print '<tr' . $bc[$var] . '>';
 				print '<td>' . length_accountg($cpt->account_number) . '</td>';
 				print '<td>' . $cpt->label . '</td>';
-				print $form->formconfirm($_SERVER["PHP_SELF"] . "?account_category=$cat_id&cptid=" . $cpt->rowid, $langs->trans("DeleteCptCategory"), $langs->trans("ConfirmDeleteCptCategory"), "delete", '', 0, "action-delete" . $j);
-				print '<td><input class="button" type="button" id="action-delete' . $j . '" value="' . $langs->trans("Delete") . '"></td>';
+				print '<td align="right">';
+				print "<a href= '".$_SERVER['PHP_SELF']."?action=delete&account_category=" . $cat_id . "&cptid=" . $cpt->rowid."'>";
+				print img_delete($langs->trans("DeleteFromCat")).' ';
+				print $langs->trans("DeleteFromCat")."</a>";
+				print "</td>";
 				print "</tr>\n";
-				$j ++;
 			}
 		}
 	}
diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
index 40290bd845b..b2564c342e5 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2016		Jamal Elbaz			<jamelbaz@gmail.pro>
- * Copyright (C) 2016 		Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2016-2017	Alexandre Spangaro	<aspangaro@zendsi.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,9 +17,9 @@
  */
 
 /**
- * \file htdocs/accountancy/class/accountancycategory.class.php
+ * \file	htdocs/accountancy/class/accountancycategory.class.php
  * \ingroup Advanced accountancy
- * \brief File of class to manage categories of an accounting category_type
+ * \brief	File of class to manage categories of an accounting category_type
  */
 
 // Class
@@ -72,7 +72,6 @@ class AccountancyCategory
 					$this->lines_display[] = $obj;
 				}
 			}
-
 			return $num;
 		} else {
 			$this->error = "Error " . $this->db->lasterror();
@@ -84,7 +83,7 @@ class AccountancyCategory
 	}
 
 	/**
-	 * Function to select accountiing category of an accounting account present in chart of accounts
+	 * Function to select accounting category of an accounting account present in chart of accounts
 	 *
 	 * @param int $id Id category
 	 *
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index dcefae7aecb..5ee68e605cd 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Exports