lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Laurent Destailleur 2020-10-22 21:57:24 +02:00
commit c77184c848
7 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/index.php
View File

@ -163,7 +163,7 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
$sql .= " GROUP BY f.rowid, f.ref, f.datef, f.total, f.tva, f.total_ttc, f.ref_client, f.type, "; $sql .= " GROUP BY f.rowid, f.ref, f.datef, f.total, f.tva, f.total_ttc, f.ref_client, f.type, ";
$sql .= "s.email, s.nom, s.rowid, s.code_client, s.code_compta, s.code_fournisseur, s.code_compta_fournisseur"; $sql .= "s.email, s.nom, s.rowid, s.code_client, s.code_compta, s.code_fournisseur, s.code_compta_fournisseur";
$sql .= ", cc.rowid as country_id, cc.code as country_code"; $sql .= ", cc.rowid, cc.code";
// Add Group from hooks // Add Group from hooks
$parameters = array(); $parameters = array();

2
htdocs/compta/prelevement/fiche-rejet.php
View File

@ -151,7 +151,7 @@ if ($prev_id > 0 || $ref)
} }
$rej = new RejetPrelevement($db, $user); $rej = new RejetPrelevement($db, $user, $type);
/* /*
* List errors * List errors

4
htdocs/compta/prelevement/line.php
View File

@ -95,7 +95,7 @@ if ($action == 'confirm_rejet')
if ($lipre->fetch($id) == 0) if ($lipre->fetch($id) == 0)
{ {
$rej = new RejetPrelevement($db, $user,$type); $rej = new RejetPrelevement($db, $user, $type);
$rej->create($user, $id, GETPOST('motif', 'alpha'), $daterej, $lipre->bon_rowid, GETPOST('facturer', 'int')); $rej->create($user, $id, GETPOST('motif', 'alpha'), $daterej, $lipre->bon_rowid, GETPOST('facturer', 'int'));
@ -158,7 +158,7 @@ if ($id)
if ($lipre->statut == 3) if ($lipre->statut == 3)
{ {
$rej = new RejetPrelevement($db, $user); $rej = new RejetPrelevement($db, $user, $type);
$resf = $rej->fetch($lipre->id); $resf = $rej->fetch($lipre->id);
if ($resf == 0) if ($resf == 0)
{ {

2
htdocs/compta/prelevement/rejets.php
View File

@ -65,7 +65,7 @@ llxHeader('', $title);
if ($sortorder == "") $sortorder = "DESC"; if ($sortorder == "") $sortorder = "DESC";
if ($sortfield == "") $sortfield = "p.datec"; if ($sortfield == "") $sortfield = "p.datec";
$rej = new RejetPrelevement($db, $user); $rej = new RejetPrelevement($db, $user, $type);
$line = new LignePrelevement($db); $line = new LignePrelevement($db);
$hookmanager->initHooks(array('withdrawalsreceiptsrejectedlist')); $hookmanager->initHooks(array('withdrawalsreceiptsrejectedlist'));

2
htdocs/compta/prelevement/stats.php
View File

@ -214,7 +214,7 @@ if ($resql)
print '<td class="right">%</td><td class="right">'.$langs->trans("Amount").'</td><td class="right">%</td></tr>'; print '<td class="right">%</td><td class="right">'.$langs->trans("Amount").'</td><td class="right">%</td></tr>';
require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php';
$Rejet = new RejetPrelevement($db, $user); $Rejet = new RejetPrelevement($db, $user, $type);
while ($i < $num) while ($i < $num)
{ {

1
htdocs/langs/en_US/companies.lang
View File

@ -461,3 +461,4 @@ InEEC=Europe (EEC)
RestOfEurope=Rest of Europe (EEC) RestOfEurope=Rest of Europe (EEC)
OutOfEurope=Out of Europe (EEC) OutOfEurope=Out of Europe (EEC)
CurrentOutstandingBillLate=Current outstanding bill late CurrentOutstandingBillLate=Current outstanding bill late
BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.

3
htdocs/product/class/product.class.php
View File

@ -14,7 +14,7 @@
* Copyright (C) 2014 Ion agorria <ion@agorria.com> * Copyright (C) 2014 Ion agorria <ion@agorria.com>
* Copyright (C) 2016-2018 Ferran Marcet <fmarcet@2byte.es> * Copyright (C) 2016-2018 Ferran Marcet <fmarcet@2byte.es>
* Copyright (C) 2017 Gustavo Novaro * Copyright (C) 2017 Gustavo Novaro
* Copyright (C) 2019 Frédéric France <frederic.france@netlogic.fr> * Copyright (C) 2019-2020 Frédéric France <frederic.france@netlogic.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -2441,6 +2441,7 @@ class Product extends CommonObject
$sql .= " WHERE "; $sql .= " WHERE ";
$sql .= " b.entity IN (".getEntity('bom').")"; $sql .= " b.entity IN (".getEntity('bom').")";
$sql .= " AND b.fk_product =".$this->id; $sql .= " AND b.fk_product =".$this->id;
$sql .= " GROUP BY b.rowid";
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result) { if ($result) {