Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into d…

…evelop

htdocs/admin/loan.php

@@ -77,7 +77,7 @@
 llxHeader();
 
 $form = new Form($db);
-if (! empty($conf->accounting->enabled)) $formaccounting = New FormAccounting($db);
+if (! empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans('ConfigLoan'),$linkback,'title_setup');

htdocs/admin/taxes.php

@@ -113,7 +113,7 @@
 
 llxHeader();
 $form=new Form($db);
-if (! empty($conf->accounting->enabled)) $formaccounting = New FormAccounting($db);
+if (! empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans('TaxSetup'),$linkback,'title_setup');

htdocs/compta/bank/class/account.class.php

@@ -854,10 +854,12 @@ function fetch($id, $ref='')
 		$sql.= " ba.datec as date_creation, ba.tms as date_update,";
 		$sql.= ' c.code as country_code, c.label as country,';
 		$sql.= ' d.code_departement as state_code, d.nom as state';
+        $sql.= ' , aj.code as accountancy_journal';
 		$sql.= " FROM ".MAIN_DB_PREFIX."bank_account as ba";
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON ba.fk_pays = c.rowid';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON ba.state_id = d.rowid';
-		$sql.= " WHERE entity IN (".getEntity($this->element).")";
+        $sql.= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'accounting_journal as aj ON aj.rowid=ba.fk_accountancy_journal';
+		$sql.= " WHERE ba.entity IN (".getEntity($this->element).")";
 		if ($id)  $sql.= " AND ba.rowid  = ".$id;
 		if ($ref) $sql.= " AND ba.ref = '".$this->db->escape($ref)."'";
 
@@ -900,6 +902,7 @@ function fetch($id, $ref='')
 
 				$this->account_number = $obj->account_number;
 				$this->fk_accountancy_journal = $obj->fk_accountancy_journal;
+				$this->accountancy_journal = $obj->accountancy_journal;
 
 				$this->currency_code  = $obj->currency_code;
 				$this->account_currency_code  = $obj->currency_code;

htdocs/compta/bank/list.php

@@ -143,7 +143,7 @@
 // Load array of financial accounts (opened by default)
 $accounts = array();
 
-$sql  = "SELECT b.rowid, b.label, b.courant, b.rappro, b.account_number, b.fk_accountancy_journal, b.currency_code, b.datec as date_creation, b.tms as date_update";
+$sql = "SELECT b.rowid, b.label, b.courant, b.rappro, b.account_number, b.fk_accountancy_journal, b.currency_code, b.datec as date_creation, b.tms as date_update";
 // Add fields from extrafields
 foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
 // Add fields from hooks
@@ -152,7 +152,7 @@
 $sql.=$hookmanager->resPrint;
 $sql.= " FROM ".MAIN_DB_PREFIX."bank_account as b";
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account_extrafields as ef on (b.rowid = ef.fk_object)";
-$sql.= " WHERE entity IN (".getEntity('bank_account').")";
+$sql.= " WHERE b.entity IN (".getEntity('bank_account').")";
 if ($search_status == 'opened')  $sql.= " AND clos = 0";
 if ($search_status == 'closed')  $sql.= " AND clos = 1";
 if ($search_ref != '')    $sql.=natural_search('b.ref', $search_ref);
@@ -509,7 +509,7 @@
     	if (! empty($conf->accounting->enabled))
     	{
     		$accountingaccount = new AccountingAccount($db);
-    		$accountingaccount->fetch('',$obj->account_number);
+    		$accountingaccount->fetch('',$obj->account_number, 1);
     		print $accountingaccount->getNomUrl(0,1,1,'',1);
     	}
     	else

htdocs/core/boxes/box_comptes.php

@@ -80,13 +80,16 @@ function loadBox($max=5)
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleCurrentAccounts"));
 
         if ($user->rights->banque->lire) {
-			$sql = "SELECT rowid, ref, label, bank, number, courant, clos, rappro, url,";
-			$sql.= " code_banque, code_guichet, cle_rib, bic, iban_prefix as iban,";
-			$sql.= " domiciliation, proprio, owner_address,";
-			$sql.= " account_number, currency_code,";
-			$sql.= " min_allowed, min_desired, comment";
-			$sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
-			$sql.= " WHERE entity = ".$conf->entity;
+			$sql = "SELECT b.rowid, b.ref, b.label, b.bank,b.number, b.courant, b.clos, b.rappro, b.url";
+			$sql.= ", b.code_banque, b.code_guichet, b.cle_rib, b.bic, b.iban_prefix as iban";
+			$sql.= ", b.domiciliation, b.proprio, b.owner_address";
+			$sql.= ", b.account_number, b.currency_code";
+			$sql.= ", b.min_allowed, b.min_desired, comment";
+            $sql.= ', b.fk_accountancy_journal';
+            $sql.= ', aj.code as accountancy_journal';
+            $sql.= " FROM ".MAIN_DB_PREFIX."bank_account as b";
+            $sql.= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'accounting_journal as aj ON aj.rowid=b.fk_accountancy_journal';
+            $sql.= " WHERE b.entity = ".$conf->entity;
 			$sql.= " AND clos = 0";
 			//$sql.= " AND courant = 1";
 			$sql.= " ORDER BY label";
@@ -108,6 +111,9 @@ function loadBox($max=5)
 					$account_static->ref = $objp->ref;
                     $account_static->label = $objp->label;
                     $account_static->number = $objp->number;
+                    $account_static->account_number = $objp->account_number;
+                    $account_static->currency_code = $objp->currency_code;
+                    $account_static->accountancy_journal = $objp->accountancy_journal;
                     $solde=$account_static->solde(0);
 
                     $solde_total[$objp->currency_code] += $solde;

htdocs/core/lib/admin.lib.php

@@ -133,7 +133,7 @@ function run_sql($sqlfile,$silent=1,$entity='',$usesavepoint=1,$handler='',$oker
     $error=0;
     $i=0;
     $buffer = '';
-    $arraysql = Array();
+    $arraysql = array();
 
     // Get version of database
     $versionarray=$db->getVersionArray();

htdocs/core/lib/barcode.lib.php

@@ -27,9 +27,9 @@
 /* ******************************************************************** */
 /*                          COLORS                                      */
 /* ******************************************************************** */
-$bar_color=Array(0,0,0);
-$bg_color=Array(255,255,255);
-$text_color=Array(0,0,0);
+$bar_color=array(0,0,0);
+$bg_color=array(255,255,255);
+$text_color=array(0,0,0);
 
 
 /* ******************************************************************** */

htdocs/core/lib/json.lib.php

@@ -356,20 +356,20 @@ function utf82utf16($utf8)
 	}
 
 	switch(strlen($utf8)) {
-	case 1:
-	        // this case should never be reached, because we are in ASCII range
-	// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-	return $utf8;
-
-	case 2:
-	// return a UTF-16 character from a 2-byte UTF-8 char
-	// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-	return chr(0x07 & (ord($utf8{0}) >> 2)) . chr((0xC0 & (ord($utf8{0}) << 6)) | (0x3F & ord($utf8{1})));
-
-	case 3:
-	// return a UTF-16 character from a 3-byte UTF-8 char
-	// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-	return chr((0xF0 & (ord($utf8{0}) << 4)) | (0x0F & (ord($utf8{1}) >> 2))) . chr((0xC0 & (ord($utf8{1}) << 6)) | (0x7F & ord($utf8{2})));
+		case 1:
+	        	// this case should never be reached, because we are in ASCII range
+		// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+		return $utf8;
+
+		case 2:
+		// return a UTF-16 character from a 2-byte UTF-8 char
+		// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+		return chr(0x07 & (ord($utf8{0}) >> 2)) . chr((0xC0 & (ord($utf8{0}) << 6)) | (0x3F & ord($utf8{1})));
+
+		case 3:
+		// return a UTF-16 character from a 3-byte UTF-8 char
+		// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+		return chr((0xF0 & (ord($utf8{0}) << 4)) | (0x0F & (ord($utf8{1}) >> 2))) . chr((0xC0 & (ord($utf8{1}) << 6)) | (0x7F & ord($utf8{2})));
 	}
 
 	// ignoring UTF-32 for now, sorry

htdocs/don/admin/donation.php

@@ -201,7 +201,7 @@
 
 $dir = "../../core/modules/dons/";
 $form=new Form($db);
-if (! empty($conf->accounting->enabled)) $formaccounting = New FormAccounting($db);
+if (! empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
 
 llxHeader('',$langs->trans("DonationsSetup"),'DonConfiguration');
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';

htdocs/product/card.php

@@ -848,7 +848,7 @@
 $form = new Form($db);
 $formfile = new FormFile($db);
 $formproduct = new FormProduct($db);
-if (! empty($conf->accounting->enabled)) $formaccounting = New FormAccounting($db);
+if (! empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
 
 // Load object modBarCodeProduct
 $res=0;

htdocs/product/class/product.class.php

@@ -3585,15 +3585,15 @@ function getLibStatut($mode=0, $type=0)
 	{
 		switch ($type)
 		{
-		case 0:
-			return $this->LibStatut($this->status,$mode,$type);
-		case 1:
-			return $this->LibStatut($this->status_buy,$mode,$type);
-		case 2:
-			return $this->LibStatut($this->status_batch,$mode,$type);
-		default:
-			//Simulate previous behavior but should return an error string
-			return $this->LibStatut($this->status_buy,$mode,$type);
+			case 0:
+				return $this->LibStatut($this->status,$mode,$type);
+			case 1:
+				return $this->LibStatut($this->status_buy,$mode,$type);
+			case 2:
+				return $this->LibStatut($this->status_batch,$mode,$type);
+			default:
+				//Simulate previous behavior but should return an error string
+				return $this->LibStatut($this->status_buy,$mode,$type);
 		}
 	}