Work on reconciliation of accouting account

htdocs/accountancy/admin/account.php

@@ -70,9 +70,12 @@ $arrayfields = array(
 	'aa.labelshort'=>array('label'=>$langs->trans("LabelToShow"), 'checked'=>1),
 	'aa.account_parent'=>array('label'=>$langs->trans("Accountparent"), 'checked'=>1),
     'aa.pcg_type'=>array('label'=>$langs->trans("Pcgtype"), 'checked'=>1, 'help'=>'PcgtypeDesc'),
+    'aa.reconciliable'=>array('label'=>$langs->trans("Reconciliable"), 'checked'=>1),
 	'aa.active'=>array('label'=>$langs->trans("Activated"), 'checked'=>1)
 );
 
+if ($conf->global->MAIN_FEATURES_LEVEL < 2) unset($arrayfields['aa.reconciliable']);
+
 $accounting = new AccountingAccount($db);
 
 
@@ -157,7 +160,8 @@ if (empty($reshook))
 
     if ($action == 'disable') {
     	if ($accounting->fetch($id)) {
-    		$result = $accounting->account_desactivate($id);
+            $mode = GETPOST('mode', 'int');
+    		$result = $accounting->account_desactivate($id, $mode);
     	}
 
     	$action = 'update';
@@ -166,7 +170,8 @@ if (empty($reshook))
     	}
     } elseif ($action == 'enable') {
     	if ($accounting->fetch($id)) {
-    		$result = $accounting->account_activate($id);
+            $mode = GETPOST('mode', 'int');
+    		$result = $accounting->account_activate($id, $mode);
     	}
     	$action = 'update';
     	if ($result < 0) {
@@ -192,7 +197,7 @@ if ($action == 'delete') {
 
 $pcgver = $conf->global->CHARTOFACCOUNTS;
 
-$sql = "SELECT aa.rowid, aa.fk_pcg_version, aa.pcg_type, aa.account_number, aa.account_parent , aa.label, aa.labelshort, aa.active, ";
+$sql = "SELECT aa.rowid, aa.fk_pcg_version, aa.pcg_type, aa.account_number, aa.account_parent , aa.label, aa.labelshort, aa.reconciliable, aa.active, ";
 $sql .= " a2.rowid as rowid2, a2.label as label2, a2.account_number as account_number2";
 $sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as aa";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version AND aa.entity = ".$conf->entity;
@@ -352,6 +357,7 @@ if ($resql)
 		print '</td>';
 	}
 	if (!empty($arrayfields['aa.pcg_type']['checked']))		    print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_pcgtype" value="'.$search_pcgtype.'"></td>';
+	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { if (! empty($arrayfields['aa.reconciliable']['checked']))   print '<td class="liste_titre">&nbsp;</td>'; }
 	if (!empty($arrayfields['aa.active']['checked']))			print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre maxwidthsearch">';
 	$searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);
@@ -365,6 +371,7 @@ if ($resql)
 	if (!empty($arrayfields['aa.labelshort']['checked']))		print_liste_field_titre($arrayfields['aa.labelshort']['label'], $_SERVER["PHP_SELF"], "aa.labelshort", "", $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['aa.account_parent']['checked']))	print_liste_field_titre($arrayfields['aa.account_parent']['label'], $_SERVER["PHP_SELF"], "aa.account_parent", "", $param, '', $sortfield, $sortorder, 'left ');
 	if (!empty($arrayfields['aa.pcg_type']['checked']))			print_liste_field_titre($arrayfields['aa.pcg_type']['label'], $_SERVER["PHP_SELF"], 'aa.pcg_type', '', $param, '', $sortfield, $sortorder, '', $arrayfields['aa.pcg_type']['help']);
+	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { if (! empty($arrayfields['aa.reconciliable']['checked']))	print_liste_field_titre($arrayfields['aa.reconciliable']['label'], $_SERVER["PHP_SELF"], 'aa.reconciliable', '', $param, '', $sortfield, $sortorder); }
 	if (!empty($arrayfields['aa.active']['checked']))			print_liste_field_titre($arrayfields['aa.active']['label'], $_SERVER["PHP_SELF"], 'aa.active', '', $param, '', $sortfield, $sortorder);
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 	print "</tr>\n";
@@ -441,16 +448,36 @@ if ($resql)
 			if (!$i) $totalarray['nbfield']++;
 		}
 
-		// Activated or not
+		if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
-		if (!empty($arrayfields['aa.active']['checked']))
+			// Activated or not reconciliation on accounting account
-		{
+			if (!empty($arrayfields['aa.reconciliable']['checked'])) {
-			print '<td>';
+				print '<td class="center">';
-			if (empty($obj->active)) {
+				if (empty($obj->reconciliable)) {
-				print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$obj->rowid.'&action=enable">';
+					print '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?id=' . $obj->rowid . '&action=enable&mode=1">';
 					print img_picto($langs->trans("Disabled"), 'switch_off');
 					print '</a>';
 				} else {
-				print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$obj->rowid.'&action=disable">';
+					print '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?id=' . $obj->rowid . '&action=disable&mode=1">';
+					print img_picto($langs->trans("Activated"), 'switch_on');
+					print '</a>';
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+		}
+
+		// Activated or not
+		if (!empty($arrayfields['aa.active']['checked']))
+		{
+			print '<td class="center">';
+			if (empty($obj->active)) {
+				print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$obj->rowid.'&action=enable&mode=0">';
+				print img_picto($langs->trans("Disabled"), 'switch_off');
+				print '</a>';
+			} else {
+				print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$obj->rowid.'&action=disable&mode=0">';
 				print img_picto($langs->trans("Activated"), 'switch_on');
 				print '</a>';
 			}

htdocs/accountancy/class/accountingaccount.class.php

@@ -135,6 +135,11 @@ class AccountingAccount extends CommonObject
 	 */
     public $active;
 
+	/**
+	 * @var int reconciliable
+	 */
+	public $reconciliable;
+
 	/**
 	 * Constructor
 	 *
@@ -162,7 +167,7 @@ class AccountingAccount extends CommonObject
 		global $conf;
 
 		if ($rowid || $account_number) {
-			$sql  = "SELECT a.rowid as rowid, a.datec, a.tms, a.fk_pcg_version, a.pcg_type, a.account_number, a.account_parent, a.label, a.labelshort, a.fk_accounting_category, a.fk_user_author, a.fk_user_modif, a.active";
+			$sql  = "SELECT a.rowid as rowid, a.datec, a.tms, a.fk_pcg_version, a.pcg_type, a.account_number, a.account_parent, a.label, a.labelshort, a.fk_accounting_category, a.fk_user_author, a.fk_user_modif, a.active, a.reconciliable";
 			$sql .= ", ca.label as category_label";
 			$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as a";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_accounting_category as ca ON a.fk_accounting_category = ca.rowid";
@@ -203,6 +208,7 @@ class AccountingAccount extends CommonObject
 					$this->fk_user_modif = $obj->fk_user_modif;
 					$this->active = $obj->active;
 					$this->status = $obj->active;
+					$this->reconciliable = $obj->reconciliable;
 
 					return $this->id;
 				} else {
@@ -261,6 +267,7 @@ class AccountingAccount extends CommonObject
 		$sql .= ", fk_accounting_category";
 		$sql .= ", fk_user_author";
 		$sql .= ", active";
+		$sql .= ", reconciliable";
 		$sql .= ") VALUES (";
 		$sql .= " '" . $this->db->idate($now) . "'";
 		$sql .= ", " . $conf->entity;
@@ -273,6 +280,7 @@ class AccountingAccount extends CommonObject
 		$sql .= ", " . (empty($this->account_category) ? 0 : (int) $this->account_category);
 		$sql .= ", " . $user->id;
 		$sql .= ", " . (int) $this->active;
+		$sql .= ", " . (int) $this->reconciliable;
 		$sql .= ")";
 
 		$this->db->begin();
@@ -340,6 +348,7 @@ class AccountingAccount extends CommonObject
 		$sql .= " , fk_accounting_category = " . (empty($this->account_category) ? 0 : (int) $this->account_category);
 		$sql .= " , fk_user_modif = " . $user->id;
 		$sql .= " , active = " . (int) $this->active;
+		$sql .= " , reconciliable = " . (int) $this->reconciliable;
 		$sql .= " WHERE rowid = " . $this->id;
 
 		dol_syslog(get_class($this) . "::update sql=" . $sql, LOG_DEBUG);
@@ -565,21 +574,31 @@ class AccountingAccount extends CommonObject
 	 * Account deactivated
 	 *
 	 * @param  int  $id         Id
+     * @param  int  $mode       0=field active, 1=field active_customer_list, 2=field_active_supplier_list
 	 * @return int              <0 if KO, >0 if OK
 	 */
-    public function account_desactivate($id)
+    public function account_desactivate($id, $mode = 0)
     {
         // phpcs:enable
 		$result = $this->checkUsage();
 
+        if ($mode == 0)
+        {
+            $fieldtouse = 'active';
+        }
+        else if ($mode == 1)
+        {
+			$fieldtouse = 'reconciliable';
+        }
+
 		if ($result > 0) {
 			$this->db->begin();
 
 			$sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_account ";
-			$sql .= "SET active = '0'";
+			$sql .= "SET " . $fieldtouse . " = '0'";
 			$sql .= " WHERE rowid = " . $this->db->escape($id);
 
-			dol_syslog(get_class($this) . "::desactivate sql=" . $sql, LOG_DEBUG);
+			dol_syslog(get_class($this) . "::" . $fieldtouse . " sql=" . $sql, LOG_DEBUG);
 			$result = $this->db->query($sql);
 
 			if ($result) {
@@ -600,18 +619,28 @@ class AccountingAccount extends CommonObject
 	 * Account activated
 	 *
 	 * @param  int  $id         Id
+     * @param  int  $mode       0=field active, 1=field reconciliable, 2=field active_customer_list, 3=field_active_supplier_list
 	 * @return int              <0 if KO, >0 if OK
 	 */
-    public function account_activate($id)
+    public function account_activate($id, $mode = 0)
     {
         // phpcs:enable
 		$this->db->begin();
 
+        if ($mode == 0)
+        {
+            $fieldtouse = 'active';
+        }
+        else if ($mode == 1)
+        {
+            $fieldtouse = 'reconciliable';
+        }
+
 		$sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_account ";
-		$sql .= "SET active = '1'";
+		$sql .= "SET " . $fieldtouse . " = '1'";
 		$sql .= " WHERE rowid = " . $this->db->escape($id);
 
-		dol_syslog(get_class($this) . "::activate sql=" . $sql, LOG_DEBUG);
+		dol_syslog(get_class($this) . "::" . $fieldtouse . " sql=" . $sql, LOG_DEBUG);
 		$result = $this->db->query($sql);
         if ($result) {
 			$this->db->commit();

htdocs/install/mysql/migration/11.0.0-12.0.0.sql

@@ -192,3 +192,5 @@ ALTER TABLE llx_accounting_account DROP COLUMN pcg_subtype;
 
 ALTER TABLE llx_product ADD COLUMN accountancy_code_buy_intra varchar(32) AFTER accountancy_code_buy;
 ALTER TABLE llx_product ADD COLUMN accountancy_code_buy_export varchar(32) AFTER accountancy_code_buy_intra;
+
+ALTER TABLE llx_accounting_account ADD COLUMN reconciliable tinyint DEFAULT 0 NOT NULL after active;

htdocs/install/mysql/tables/llx_accounting_account.sql

@@ -35,6 +35,7 @@ create table llx_accounting_account
   fk_user_author            integer      DEFAULT NULL,
   fk_user_modif             integer      DEFAULT NULL,
   active                    tinyint      DEFAULT 1  NOT NULL,
+  reconciliable				tinyint      DEFAULT 0  NOT NULL,
   import_key                varchar(14),
   extraparams               varchar(255)                      -- for other parameters with json format
 )ENGINE=innodb;