Merge pull request #7084 from atm-florian/develop

FIX Transfer between account with different currencies

htdocs/accountancy/class/accountancycategory.class.php

@@ -539,8 +539,9 @@ class AccountancyCategory
 	/**
 	 * get cpts of category
 	 *
-	 * @param  int     $cat_id     Category id
+	 * @param int $cat_id Id accounting account category
-	 * @return array               Result in table
+	 *
+	 * @return array       Result in table
 	 */
 	public function getCptsCat($cat_id) {
 		global $mysoc;

htdocs/compta/bank/transfer.php

@@ -43,13 +43,14 @@ $action = GETPOST('action','alpha');
  * Actions
  */
 
-if ($action == 'add')
+if ($action == 'add_confirm')
 {
 	$langs->load("errors");
 
 	$dateo = dol_mktime(12,0,0,GETPOST('remonth','int'),GETPOST('reday','int'),GETPOST('reyear','int'));
 	$label = GETPOST('label','alpha');
 	$amount= GETPOST('amount');
+	$amount_to= GETPOST('amount_to');
 
 	if (! $label)
 	{
@@ -81,7 +82,7 @@ if ($action == 'add')
 		$accountto=new Account($db);
 		$accountto->fetch(GETPOST('account_to','int'));
 
-		if (($accountto->id != $accountfrom->id) && ($accountto->currency_code == $accountfrom->currency_code))
+		if ($accountto->id != $accountfrom->id)
 		{
 			$db->begin();
 
@@ -91,7 +92,7 @@ if ($action == 'add')
 			$result=0;
 
 			// By default, electronic transfert from bank to bank
-			$typefrom='VIR';
+			$typefrom='PRE';
 			$typeto='VIR';
 			if ($accountto->courant == Account::TYPE_CASH || $accountfrom->courant == Account::TYPE_CASH)
 			{
@@ -102,7 +103,8 @@ if ($action == 'add')
 
 			if (! $error) $bank_line_id_from = $accountfrom->addline($dateo, $typefrom, $label, -1*price2num($amount), '', '', $user);
 			if (! ($bank_line_id_from > 0)) $error++;
-			if (! $error) $bank_line_id_to = $accountto->addline($dateo, $typeto, $label, price2num($amount), '', '', $user);
+			if ((! $error) && ($accountto->currency_code == $accountfrom->currency_code)) $bank_line_id_to = $accountto->addline($dateo, $typeto, $label, price2num($amount), '', '', $user);
+			if ((! $error) && ($accountto->currency_code != $accountfrom->currency_code)) $bank_line_id_to = $accountto->addline($dateo, $typeto, $label, price2num($amount_to), '', '', $user);
 			if (! ($bank_line_id_to > 0)) $error++;
 
 		    if (! $error) $result=$accountfrom->add_url_line($bank_line_id_from, $bank_line_id_to, DOL_URL_ROOT.'/compta/bank/ligne.php?rowid=', '(banktransfert)', 'banktransfert');
@@ -112,7 +114,7 @@ if ($action == 'add')
 
 			if (! $error)
 			{
-				$mesgs = $langs->trans("TransferFromToDone","<a href=\"bankentries.php?id=".$accountfrom->id."\">".$accountfrom->label."</a>","<a href=\"bankentries.php?id=".$accountto->id."\">".$accountto->label."</a>",$amount,$langs->transnoentities("Currency".$conf->currency));
+				$mesgs = $langs->trans("TransferFromToDone","<a href=\"account.php?account=".$accountfrom->id."\">".$accountfrom->label."</a>","<a href=\"account.php?account=".$accountto->id."\">".$accountto->label."</a>",$amount,$langs->transnoentities("Currency".$conf->currency));
 				setEventMessages($mesgs, null, 'mesgs');
 				$db->commit();
 			}
@@ -143,6 +145,7 @@ $account_from='';
 $account_to='';
 $label='';
 $amount='';
+$amount_to='';
 
 if($error)
 {
@@ -164,7 +167,8 @@ print '<input type="hidden" name="action" value="add">';
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("TransferFrom").'</td><td>'.$langs->trans("TransferTo").'</td><td>'.$langs->trans("Date").'</td><td>'.$langs->trans("Description").'</td><td>'.$langs->trans("Amount").'</td>';
+print '<td>'.$langs->trans("TransferFrom").'</td><td>'.$langs->trans("TransferTo").'</td><td>'.$langs->trans("Date").'</td>';
+print '<td>'.$langs->trans("Description").'</td><td>'.$langs->trans("Amount").'</td>';
 print '</tr>';
 
 $var=false;
@@ -181,7 +185,6 @@ $form->select_date((! empty($dateo)?$dateo:''),'','','','','add');
 print "</td>\n";
 print '<td><input name="label" class="flat quatrevingtpercent" type="text" value="'.$label.'"></td>';
 print '<td><input name="amount" class="flat" type="text" size="6" value="'.$amount.'"></td>';
-
 print "</table>";
 
 print '<br><div class="center"><input type="submit" class="button" value="'.$langs->trans("Add").'"></div>';

htdocs/ecm/class/ecmfiles.class.php

@@ -780,3 +780,23 @@ class EcmFiles //extends CommonObject
 
 }
 
+
+class EcmfilesLine
+{
+	public $label;
+	public $entity;
+	public $filename;
+	public $filepath;
+	public $fullpath_orig;
+	public $description;
+	public $keywords;
+	public $cover;
+	public $position;
+	public $gen_or_uploaded;       // can be 'generated', 'uploaded', 'unknown'
+	public $extraparams;
+	public $date_c = '';
+	public $date_m = '';
+	public $fk_user_c;
+	public $fk_user_m;
+	public $acl;
+}

htdocs/modulebuilder/template/class/myobject.class.php

@@ -433,7 +433,7 @@ class MyObject extends CommonObject
 
 		global $user;
 		$error = 0;
-		$object = new MyModuleObject($this->db);
+		$object = new self($this->db);
 
 		$this->db->begin();