diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php index 66f72ea9bf6..a7bab16b30d 100644 --- a/htdocs/accountancy/class/accountancycategory.class.php +++ b/htdocs/accountancy/class/accountancycategory.class.php @@ -539,8 +539,9 @@ class AccountancyCategory /** * get cpts of category * - * @param int $cat_id Category id - * @return array Result in table + * @param int $cat_id Id accounting account category + * + * @return array Result in table */ public function getCptsCat($cat_id) { global $mysoc; diff --git a/htdocs/compta/bank/transfer.php b/htdocs/compta/bank/transfer.php index 73e94a3d197..88d5e94ed83 100644 --- a/htdocs/compta/bank/transfer.php +++ b/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","id."\">".$accountfrom->label."","id."\">".$accountto->label."",$amount,$langs->transnoentities("Currency".$conf->currency)); + $mesgs = $langs->trans("TransferFromToDone","id."\">".$accountfrom->label."","id."\">".$accountto->label."",$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 ''; print ''; print ''; -print ''; +print ''; +print ''; print ''; $var=false; @@ -181,7 +185,6 @@ $form->select_date((! empty($dateo)?$dateo:''),'','','','','add'); print "\n"; print ''; print ''; - print "
'.$langs->trans("TransferFrom").''.$langs->trans("TransferTo").''.$langs->trans("Date").''.$langs->trans("Description").''.$langs->trans("Amount").''.$langs->trans("TransferFrom").''.$langs->trans("TransferTo").''.$langs->trans("Date").''.$langs->trans("Description").''.$langs->trans("Amount").'
"; print '
'; diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php index 9a8c503ac2e..c854231307f 100644 --- a/htdocs/ecm/class/ecmfiles.class.php +++ b/htdocs/ecm/class/ecmfiles.class.php @@ -65,7 +65,7 @@ class EcmFiles //extends CommonObject /** */ - + /** * Constructor @@ -88,13 +88,13 @@ class EcmFiles //extends CommonObject public function create(User $user, $notrigger = false) { global $conf; - + dol_syslog(__METHOD__, LOG_DEBUG); $error = 0; // Clean parameters - + if (isset($this->label)) { $this->label = trim($this->label); } @@ -135,13 +135,13 @@ class EcmFiles //extends CommonObject $this->acl = trim($this->acl); } if (empty($this->date_c)) $this->date_c = dol_now(); - + $maxposition=0; if (empty($this->position)) // Get max used { $sql = "SELECT MAX(position) as maxposition FROM " . MAIN_DB_PREFIX . $this->table_element; $sql.= " WHERE filepath ='".$this->db->escape($this->filepath)."'"; - + $resql = $this->db->query($sql); if ($resql) { @@ -204,7 +204,7 @@ class EcmFiles //extends CommonObject if (!$error) { $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element); $this->position = $maxposition; - + if (!$notrigger) { // Uncomment this and change MYOBJECT to your own tag if you // want this action to call a trigger. @@ -299,7 +299,7 @@ class EcmFiles //extends CommonObject $this->fk_user_m = $obj->fk_user_m; $this->acl = $obj->acl; } - + // Retrieve all extrafields for invoice // fetch optionals attributes and labels /* @@ -309,7 +309,7 @@ class EcmFiles //extends CommonObject $this->fetch_optionals($this->id,$extralabels); */ // $this->fetch_lines(); - + $this->db->free($resql); if ($numrows) { @@ -393,7 +393,7 @@ class EcmFiles //extends CommonObject $line = new EcmfilesLine(); $line->id = $obj->rowid; - + $line->label = $obj->label; $line->entity = $obj->entity; $line->filename = $obj->filename; @@ -437,7 +437,7 @@ class EcmFiles //extends CommonObject dol_syslog(__METHOD__, LOG_DEBUG); // Clean parameters - + if (isset($this->label)) { $this->label = trim($this->label); } @@ -562,7 +562,7 @@ class EcmFiles //extends CommonObject } // If you need to delete child tables to, you can insert them here - + if (!$error) { $sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element; $sql .= ' WHERE rowid=' . $this->id; @@ -651,7 +651,7 @@ class EcmFiles //extends CommonObject global $menumanager; if (! empty($conf->dol_no_mouse_hover)) $notooltip=1; // Force disable tooltips - + $result = ''; $companylink = ''; @@ -660,7 +660,7 @@ class EcmFiles //extends CommonObject $label.= '' . $langs->trans('Ref') . ': ' . $this->ref; $url = DOL_URL_ROOT.'/ecm/'.$this->table_name.'_card.php?id='.$this->id; - + $linkclose=''; if (empty($notooltip)) { @@ -673,7 +673,7 @@ class EcmFiles //extends CommonObject $linkclose.=' class="classfortooltip'.($morecss?' '.$morecss:'').'"'; } else $linkclose = ($morecss?' class="'.$morecss.'"':''); - + $linkstart = ''; $linkend=''; @@ -757,9 +757,9 @@ class EcmFiles //extends CommonObject public function initAsSpecimen() { global $conf,$user; - + $this->id = 0; - + $this->label = '0a1b2c3e4f59999999'; $this->entity = '1'; $this->filename = 'myspecimenfilefile.pdf'; @@ -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; +} diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php index c66110fddf6..9ef593367c9 100644 --- a/htdocs/modulebuilder/template/class/myobject.class.php +++ b/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();