From d89954210e1bb7199cb82fd029b027717d2eb54c Mon Sep 17 00:00:00 2001 From: sonikf <93765174+sonikf@users.noreply.github.com> Date: Fri, 20 Oct 2023 02:29:09 +0300 Subject: [PATCH 1/2] fix cannot cancel salary when language is not latin (#26281) --- htdocs/salaries/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php index f7ec645f287..0e133005ec3 100644 --- a/htdocs/salaries/card.php +++ b/htdocs/salaries/card.php @@ -53,7 +53,7 @@ if (isModEnabled('project')) { $id = GETPOSTINT('id'); $ref = GETPOST('ref', 'alpha'); $action = GETPOST('action', 'aZ09'); -$cancel = GETPOST('cancel', 'aZ09'); +$cancel = GETPOST('cancel', 'alpha'); $backtopage = GETPOST('backtopage', 'alpha'); $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); $confirm = GETPOST('confirm'); From 1949eb564fb287699b942c23307077b5edd0c2a5 Mon Sep 17 00:00:00 2001 From: lamrani abdelwadoud Date: Fri, 20 Oct 2023 01:34:08 +0200 Subject: [PATCH 2/2] NEW updating by adjust request Sql for Salary invoice (#26279) * adjust request Sql for Salary invoice * remove print_r * Update bonprelevement.class.php --------- Co-authored-by: Laurent Destailleur --- .../class/bonprelevement.class.php | 76 +++++++++++++------ htdocs/user/class/userbankaccount.class.php | 16 ++++ 2 files changed, 67 insertions(+), 25 deletions(-) diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php index e993e69d1d7..ad87cbfd25f 100644 --- a/htdocs/compta/prelevement/class/bonprelevement.class.php +++ b/htdocs/compta/prelevement/class/bonprelevement.class.php @@ -35,6 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/user/class/userbankaccount.class.php'; /** @@ -1212,7 +1213,12 @@ class BonPrelevement extends CommonObject // Generation of direct debit or credit transfer file $this->filename (May be a SEPA file for european countries) // This also set the property $this->total with amount that is included into file - $result = $this->generate($format, $executiondate, $type); + if (!empty($sourcetype)) { + $usertmp = $this->context['factures_prev'][0][2]; + $result = $this->generate($format, $executiondate, $type, $fk_bank_account, $usertmp); + } else { + $result = $this->generate($format, $executiondate, $type); + } if ($result < 0) { //var_dump($this->error); //var_dump($this->invoice_in_error); @@ -1521,9 +1527,10 @@ class BonPrelevement extends CommonObject * @param int $executiondate Timestamp date to execute transfer * @param string $type 'direct-debit' or 'bank-transfer' * @param int $fk_bank_account Bank account ID the receipt is generated for. Will use the ID into the setup of module Direct Debit or Credit Transfer if 0. + * @param string $user_dest User id for bankaccount when if it is salary invoice * @return int >=0 if OK, <0 if KO */ - public function generate($format = 'ALL', $executiondate = 0, $type = 'direct-debit', $fk_bank_account = 0) + public function generate($format = 'ALL', $executiondate = 0, $type = 'direct-debit', $fk_bank_account = 0, $user_dest = '') { global $conf, $langs, $mysoc; @@ -1549,6 +1556,9 @@ class BonPrelevement extends CommonObject // Build file for European countries if ($mysoc->isInEEC()) { + $userAcount = new UserBankAccount($this->db); + $userAcount->fetch(0, '', $user_dest); + $userAcount->checkCountryBankAccount(); $found++; if ($type != 'bank-transfer') { @@ -1694,27 +1704,45 @@ class BonPrelevement extends CommonObject /* * Section Creditor (sepa Crediteurs bloc lines) */ - - $sql = "SELECT soc.rowid as socid, soc.code_client as code, soc.address, soc.zip, soc.town, c.code as country_code,"; - $sql .= " pl.client_nom as nom, pl.code_banque as cb, pl.code_guichet as cg, pl.number as cc, pl.amount as somme,"; - $sql .= " f.ref as reffac, pf.fk_facture_fourn as idfac, f.ref_supplier as fac_ref_supplier,"; - $sql .= " rib.rowid, rib.datec, rib.iban_prefix as iban, rib.bic as bic, rib.rowid as drum, rib.rum, rib.date_rum"; - $sql .= " FROM"; - $sql .= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,"; - $sql .= " ".MAIN_DB_PREFIX."facture_fourn as f,"; - $sql .= " ".MAIN_DB_PREFIX."prelevement as pf,"; - $sql .= " ".MAIN_DB_PREFIX."societe as soc,"; - $sql .= " ".MAIN_DB_PREFIX."c_country as c,"; - $sql .= " ".MAIN_DB_PREFIX."societe_rib as rib"; - $sql .= " WHERE pl.fk_prelevement_bons = ".((int) $this->id); - $sql .= " AND pl.rowid = pf.fk_prelevement_lignes"; - $sql .= " AND pf.fk_facture_fourn = f.rowid"; - $sql .= " AND f.fk_soc = soc.rowid"; - $sql .= " AND soc.fk_pays = c.rowid"; - $sql .= " AND rib.fk_soc = f.fk_soc"; - $sql .= " AND rib.default_rib = 1"; - $sql .= " AND rib.type = 'ban'"; - + // add condition for traiting sourcetype TODO + if (!empty($user_dest)) { + $sql = "SELECT u.rowid as userId, c.code as country_code, CONCAT(u.firstname,' ',u.lastname) as nom,"; + $sql .= " pl.code_banque as cb, pl.code_guichet as cg, pl.number as cc, pl.amount as somme,"; + $sql .= " s.rowid as idSalary,rib.datec, rib.iban_prefix as iban, rib.bic as bic, rib.rowid as drum"; + $sql .= " FROM"; + $sql .= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,"; + $sql .= " ".MAIN_DB_PREFIX."salary as s,"; + $sql .= " ".MAIN_DB_PREFIX."prelevement as p,"; + $sql .= " ".MAIN_DB_PREFIX."c_country as c,"; + $sql .= " ".MAIN_DB_PREFIX."user as u,"; + $sql .= " ".MAIN_DB_PREFIX."user_rib as rib"; + $sql .= " WHERE pl.fk_prelevement_bons=".((int) $this->id); + $sql .= " AND pl.rowid = p.fk_prelevement_lignes"; + $sql .= " AND p.fk_salary = s.rowid"; + $sql .= " AND s.fk_user = u.rowid"; + $sql .= " AND rib.fk_user = s.fk_user"; + $sql .= " AND rib.fk_country = c.rowid"; + } else { + $sql = "SELECT soc.rowid as socid, soc.code_client as code, soc.address, soc.zip, soc.town, c.code as country_code,"; + $sql .= " pl.client_nom as nom, pl.code_banque as cb, pl.code_guichet as cg, pl.number as cc, pl.amount as somme,"; + $sql .= " f.ref as reffac, pf.fk_facture_fourn as idfac, f.ref_supplier as fac_ref_supplier,"; + $sql .= " rib.rowid, rib.datec, rib.iban_prefix as iban, rib.bic as bic, rib.rowid as drum, rib.rum, rib.date_rum"; + $sql .= " FROM"; + $sql .= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,"; + $sql .= " ".MAIN_DB_PREFIX."facture_fourn as f,"; + $sql .= " ".MAIN_DB_PREFIX."prelevement as pf,"; + $sql .= " ".MAIN_DB_PREFIX."societe as soc,"; + $sql .= " ".MAIN_DB_PREFIX."c_country as c,"; + $sql .= " ".MAIN_DB_PREFIX."societe_rib as rib"; + $sql .= " WHERE pl.fk_prelevement_bons = ".((int) $this->id); + $sql .= " AND pl.rowid = pf.fk_prelevement_lignes"; + $sql .= " AND pf.fk_facture_fourn = f.rowid"; + $sql .= " AND f.fk_soc = soc.rowid"; + $sql .= " AND soc.fk_pays = c.rowid"; + $sql .= " AND rib.fk_soc = f.fk_soc"; + $sql .= " AND rib.default_rib = 1"; + $sql .= " AND rib.type = 'ban'"; + } // Define $fileCrediteurSection. One section DrctDbtTxInf per invoice. $resql = $this->db->query($sql); if ($resql) { @@ -1745,7 +1773,6 @@ class BonPrelevement extends CommonObject fputs($this->file, 'ERROR CREDITOR '.$sql.$CrLf); // CREDITORS = Suppliers $result = -2; } - // Define $fileEmetteurSection. Start of bloc PmtInf. Will contains all $nbtotalDrctDbtTxInf if ($result != -2) { $fileEmetteurSection .= $this->EnregEmetteurSEPA($conf, $date_actu, $nbtotalDrctDbtTxInf, $this->total, $CrLf, $format, $type); @@ -1827,7 +1854,6 @@ class BonPrelevement extends CommonObject $sql .= " WHERE pl.fk_prelevement_bons = ".((int) $this->id); $sql .= " AND pl.rowid = pf.fk_prelevement_lignes"; $sql .= " AND pf.fk_facture_fourn = f.rowid"; - // Lines $i = 0; $resql = $this->db->query($sql); diff --git a/htdocs/user/class/userbankaccount.class.php b/htdocs/user/class/userbankaccount.class.php index e0bb67537b5..14269610491 100644 --- a/htdocs/user/class/userbankaccount.class.php +++ b/htdocs/user/class/userbankaccount.class.php @@ -303,4 +303,20 @@ class UserBankAccount extends Account return $rib; } + + /** + * Return if a country of userBank is inside the EEC (European Economic Community) + * @return boolean true = country inside EEC, false = country outside EEC + */ + public function checkCountryBankAccount() + { + + if (!empty($this->country_code)) { + require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; + $country_code_in_EEC = getCountriesInEEC(); + return in_array($this->country_code, $country_code_in_EEC); + } else { + return -1; + } + } }