Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Laurent Destailleur 2024-02-23 16:34:54 +01:00
commit 8ad9dc5b44
6 changed files with 101 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/compta/bank/class/account.class.php
View File

@ -2604,12 +2604,15 @@ class AccountLine extends CommonObjectLine
*/
public function getNomUrl($withpicto = 0, $maxlen = 0, $option = '', $notooltip = 0)
{
global $langs;
global $conf, $langs;
$result = '';
$label = img_picto('', $this->picto).' <u>'.$langs->trans("BankTransactionLine").'</u>:<br>';
$label .= '<b>'.$langs->trans("Ref").':</b> '.$this->ref;
if ($this->amount) {
$label .= '<br><strong>'.$langs->trans("Amount").':</strong> '.price($this->amount, 0, $langs, 1, -1, -1, $conf->currency);
}
$linkstart = '<a href="'.DOL_URL_ROOT.'/compta/bank/line.php?rowid='.((int) $this->id).'&save_lastsearch_values=1" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
$linkend = '</a>';
@ -2621,6 +2624,7 @@ class AccountLine extends CommonObjectLine
if ($withpicto != 2) {
$result .= ($this->ref ? $this->ref : $this->id);
}
$result .= $linkend;
if ($option == 'showall' || $option == 'showconciliated' || $option == 'showconciliatedandaccounted') {

38
htdocs/compta/paiement/list.php
View File

@ -180,6 +180,8 @@ if (GETPOST("orphelins", "alpha")) {
$sql = "SELECT p.rowid, p.ref, p.datep, p.amount, p.statut, p.num_paiement as num_payment,";
$sql .= " c.code as paiement_code";
$sqlfields = $sql; // $sql fields to remove for count total
// Add fields from hooks
$parameters = array();
$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
@ -194,10 +196,13 @@ if (GETPOST("orphelins", "alpha")) {
$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
$sql .= $hookmanager->resPrint;
} else {
$sql = "SELECT p.rowid, p.ref, p.datep, p.fk_bank, p.amount, p.statut, p.num_paiement as num_payment";
$sql = "SELECT p.rowid, p.ref, p.datep, p.fk_bank, p.statut, p.num_paiement as num_payment, p.amount";
$sql .= ", c.code as paiement_code";
$sql .= ", ba.rowid as bid, ba.ref as bref, ba.label as blabel, ba.number, ba.account_number as account_number, ba.fk_accountancy_journal as accountancy_journal";
$sql .= ", s.rowid as socid, s.nom as name, s.email";
// We need an aggregate because we added a left join to get the thirdparty. In real world, it should be the same thirdparty if payment is same (but not in database structure)
// so SUM(pf.amount) should be equal to p.amount but if we filter on $socid, it may differ
$sql .= ", SUM(pf.amount) as totalamount, COUNT(f.rowid) as nbinvoices";
// Add fields from hooks
$parameters = array();
@ -210,18 +215,21 @@ if (GETPOST("orphelins", "alpha")) {
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_paiement = c.id";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON p.fk_bank = b.rowid";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON pf.fk_facture = f.rowid";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid";
$sql .= " WHERE p.entity IN (".getEntity('invoice').")";
if ($socid > 0) {
$sql .= " AND f.fk_soc = ".((int) $socid);
$sql .= " AND EXISTS (SELECT f.fk_soc FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."paiement_facture as pf";
$sql .= " WHERE p.rowid = pf.fk_paiement AND pf.fk_facture = f.rowid AND f.fk_soc = ".((int) $socid).")";
}
if ($userid) {
if ($userid == -1) {
$sql .= " AND f.fk_user_author IS NULL";
$sql .= " AND p.fk_user_creat IS NULL";
} else {
$sql .= " AND f.fk_user_author = ".((int) $userid);
$sql .= " AND p.fk_user_creat = ".((int) $userid);
}
}
@ -245,7 +253,10 @@ if (GETPOST("orphelins", "alpha")) {
$sql .= natural_search('p.num_paiement', $search_payment_num);
}
if ($search_amount) {
$sql .= natural_search('p.amount', $search_amount, 1);
$sql .= " AND (".natural_search('p.amount', $search_amount, 1, 1);
$sql .= " OR ";
$sql .= natural_search('pf.amount', $search_amount, 1, 1);
$sql .= ")";
}
if ($search_company) {
$sql .= natural_search('s.nom', $search_company);
@ -267,13 +278,18 @@ if (GETPOST("orphelins", "alpha")) {
$parameters = array();
$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
$sql .= $hookmanager->resPrint;
$sql .= " GROUP BY p.rowid, p.ref, p.datep, p.fk_bank, p.statut, p.num_paiement, p.amount";
$sql .= ", c.code";
$sql .= ", ba.rowid, ba.ref, ba.label, ba.number, ba.account_number, ba.fk_accountancy_journal";
$sql .= ", s.rowid, s.nom, s.email";
}
// Count total nb of records
$nbtotalofrecords = '';
if (!getDolGlobalInt('MAIN_DISABLE_FULL_SCANLIST')) {
/* The fast and low memory method to get and count full list converts the sql into a sql count */
$sqlforcount = preg_replace('/^'.preg_quote($sqlfields, '/').'/', 'SELECT COUNT(*) as nbtotalofrecords', $sql);
$sqlforcount = preg_replace('/^'.preg_quote($sqlfields, '/').'/', 'SELECT COUNT(DISTINCT p.rowid) as nbtotalofrecords', $sql);
$sqlforcount = preg_replace('/GROUP BY .*$/', '', $sqlforcount);
$resql = $db->query($sqlforcount);
if ($resql) {
@ -295,6 +311,7 @@ $sql .= $db->order($sortfield, $sortorder);
if ($limit) {
$sql .= $db->plimit($limit + 1, $offset);
}
//print $sql;
$resql = $db->query($sql);
if (!$resql) {
@ -578,6 +595,8 @@ while ($i < $imaxinloop) {
$object->id = $objp->rowid;
$object->ref = ($objp->ref ? $objp->ref : $objp->rowid);
$object->date = $db->jdate($objp->datep);
$object->amount = $objp->amount;
$companystatic->id = $objp->socid;
$companystatic->name = $objp->name;
@ -713,7 +732,12 @@ while ($i < $imaxinloop) {
// Amount
if (!empty($arrayfields['p.amount']['checked'])) {
print '<td class="right"><span class="amount">'.price($objp->amount).'</span></td>';
print '<td class="right">';
if ($objp->nbinvoices > 1 || ($objp->totalamount && $objp->amount != $objp->totalamount)) {
print $form->textwithpicto('', $langs->trans("PaymentMadeForSeveralInvoices"));
}
print '<span class="amount">'.price($objp->amount).'</span>';
print '</td>';
if (!$i) {
$totalarray['nbfield']++;
$totalarray['pos'][$totalarray['nbfield']] = 'amount';

81
htdocs/fourn/paiement/list.php
View File

@ -181,26 +181,32 @@ $accountstatic = new Account($db);
$companystatic = new Societe($db);
$paymentfournstatic = new PaiementFourn($db);
$sql = 'SELECT p.rowid, p.ref, p.datep, p.amount as pamount, p.num_paiement as num_payment,';
$sql .= ' s.rowid as socid, s.nom as name, s.email,';
$sql .= ' c.code as paiement_type, c.libelle as paiement_libelle,';
$sql .= ' ba.rowid as bid, ba.ref as bref, ba.label as blabel, ba.number, ba.account_number as account_number, ba.iban_prefix, ba.bic, ba.currency_code, ba.fk_accountancy_journal as accountancy_journal,';
$sql .= ' SUM(pf.amount)';
$sql = 'SELECT p.rowid, p.ref, p.datep, p.fk_bank, p.statut, p.num_paiement as num_payment, p.amount';
$sql .= ', c.code as paiement_type, c.libelle as paiement_libelle';
$sql .= ', ba.rowid as bid, ba.ref as bref, ba.label as blabel, ba.number, ba.account_number as account_number, ba.iban_prefix, ba.bic, ba.currency_code, ba.fk_accountancy_journal as accountancy_journal';
$sql .= ', s.rowid as socid, s.nom as name, s.email';
// We need an aggregate because we added a left join to get the thirdparty. In real world, it should be the same thirdparty if payment is same (but not in database structure)
// so SUM(pf.amount) should be equal to p.amount but if we filter on $socid, it may differ
$sql .= ", SUM(pf.amount) as totalamount, COUNT(f.rowid) as nbinvoices";
$sqlfields = $sql; // $sql fields to remove for count total
$sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn AS p';
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn AS pf ON p.rowid = pf.fk_paiementfourn';
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn AS f ON f.rowid = pf.fk_facturefourn';
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement AS c ON p.fk_paiement = c.id';
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON s.rowid = f.fk_soc';
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid';
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON b.fk_account = ba.rowid';
if (!$user->hasRight("societe", "client", "voir")) {
$sql .= ', '.MAIN_DB_PREFIX.'societe_commerciaux as sc';
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn AS pf ON p.rowid = pf.fk_paiementfourn';
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn AS f ON f.rowid = pf.fk_facturefourn';
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON s.rowid = f.fk_soc';
$sql .= ' WHERE f.entity IN ('.getEntity('supplier_invoice').')'; // TODO We should use p.entity that does not exists yet in this table
if ($socid > 0) {
$sql .= " AND EXISTS (SELECT f.fk_soc FROM ".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf";
$sql .= " WHERE p.rowid = pf.fk_paiementfourn AND pf.fk_facturefourn = f.rowid AND f.fk_soc = ".((int) $socid).")";
}
$sql .= ' WHERE f.entity = '.((int) $conf->entity);
if ($socid > 0) {
$sql .= ' AND f.fk_soc = '.((int) $socid);
}
// Search criteria
if ($search_ref) {
$sql .= natural_search('p.ref', $search_ref);
}
@ -215,13 +221,16 @@ if ($search_company) {
$sql .= natural_search('s.nom', $search_company);
}
if ($search_payment_type != '') {
$sql .= " AND c.code='".$db->escape($search_payment_type)."'";
$sql .= " AND c.code = '".$db->escape($search_payment_type)."'";
}
if ($search_cheque_num != '') {
$sql .= natural_search('p.num_paiement', $search_cheque_num);
}
if ($search_amount) {
$sql .= natural_search('p.amount', $search_amount, 1);
$sql .= " AND (".natural_search('p.amount', $search_amount, 1, 1);
$sql .= " OR ";
$sql .= natural_search('pf.amount', $search_amount, 1, 1);
$sql .= ")";
}
if ($search_bank_account > 0) {
$sql .= ' AND b.fk_account = '.((int) $search_bank_account);
@ -241,22 +250,36 @@ if ($search_sale && $search_sale != '-1') {
// Add where from extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
$sql .= ' GROUP BY p.rowid, p.ref, p.datep, p.amount, p.num_paiement, s.rowid, s.nom, s.email, c.code, c.libelle,';
$sql .= ' GROUP BY p.rowid, p.ref, p.datep, p.fk_bank, p.statut, p.num_paiement, p.amount, s.rowid, s.nom, s.email, c.code, c.libelle,';
$sql .= ' ba.rowid, ba.ref, ba.label, ba.number, ba.account_number, ba.iban_prefix, ba.bic, ba.currency_code, ba.fk_accountancy_journal';
$sql .= $db->order($sortfield, $sortorder);
// Count total nb of records
$nbtotalofrecords = '';
if (!getDolGlobalInt('MAIN_DISABLE_FULL_SCANLIST')) {
$result = $db->query($sql);
$nbtotalofrecords = $db->num_rows($result);
if (($page * $limit) > $nbtotalofrecords) { // if total resultset is smaller then paging size (filtering), goto and load page 0
/* The fast and low memory method to get and count full list converts the sql into a sql count */
$sqlforcount = preg_replace('/^'.preg_quote($sqlfields, '/').'/', 'SELECT COUNT(DISTINCT p.rowid) as nbtotalofrecords', $sql);
$sqlforcount = preg_replace('/GROUP BY .*$/', '', $sqlforcount);
$resql = $db->query($sqlforcount);
if ($resql) {
$objforcount = $db->fetch_object($resql);
$nbtotalofrecords = $objforcount->nbtotalofrecords;
} else {
dol_print_error($db);
}
if (($page * $limit) > $nbtotalofrecords) { // if total resultset is smaller then paging size (filtering), goto and load page 0
$page = 0;
$offset = 0;
}
$db->free($resql);
}
$sql .= $db->plimit($limit + 1, $offset);
// Complete request and execute it with limit
$sql .= $db->order($sortfield, $sortorder);
if ($limit) {
$sql .= $db->plimit($limit + 1, $offset);
}
//print $sql;
$resql = $db->query($sql);
if (!$resql) {
@ -534,6 +557,7 @@ while ($i < $imaxinloop) {
$paymentfournstatic->id = $objp->rowid;
$paymentfournstatic->ref = $objp->ref;
$paymentfournstatic->datepaye = $db->jdate($objp->datep);
$paymentfournstatic->amount = $objp->amount;
$companystatic->id = $objp->socid;
$companystatic->name = $objp->name;
@ -660,15 +684,20 @@ while ($i < $imaxinloop) {
// Amount
if (!empty($arrayfields['p.amount']['checked'])) {
print '<td class="right"><span class="amount">'.price($objp->pamount).'</span></td>';
print '<td class="right">';
if ($objp->nbinvoices > 1 || ($objp->totalamount && $objp->amount != $objp->totalamount)) {
print $form->textwithpicto('', $langs->trans("PaymentMadeForSeveralInvoices"));
}
print '<span class="amount">'.price($objp->amount).'</span>';
print '</td>';
if (!$i) {
$totalarray['nbfield']++;
$totalarray['pos'][$totalarray['nbfield']] = 'amount';
}
if (empty($totalarray['val']['amount'])) {
$totalarray['val']['amount'] = $objp->pamount;
$totalarray['val']['amount'] = $objp->amount;
} else {
$totalarray['val']['amount'] += $objp->pamount;
$totalarray['val']['amount'] += $objp->amount;
}
}

3
htdocs/install/mysql/migration/17.0.0-18.0.0.sql
View File

@ -569,3 +569,6 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('HRM_EVALUATION_DELETE', 'HR Evaluation deleted', 'Executed when an evaluation is dleted', 'hrm', 4005);
UPDATE llx_menu SET url = '/fourn/paiement/list.php?mainmenu=billing&leftmenu=suppliers_bills_payment' WHERE leftmenu = 'suppliers_bills_payment';
UPDATE llx_paiement SET ref = rowid WHERE ref IS NULL OR ref = '';

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

@ -653,3 +653,4 @@ InvoiceSubtype=Invoice Subtype
SalaryInvoice=Salary
BillsAndSalaries=Bills & Salaries
CreateCreditNoteWhenClientInvoiceExists=This option is enabled only when validated invoice(s) exist for a customer or when constant INVOICE_CREDIT_NOTE_STANDALONE is used(useful for some countries)
PaymentMadeForSeveralInvoices=Payment made for several invoices

10
htdocs/product/card.php
View File

@ -1500,7 +1500,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
print '</td></tr>';
}
if ($type != 1 && isModEnabled('stock')) {
if (($type != 1 || getDolGlobalInt('STOCK_SUPPORTS_SERVICES')) && isModEnabled('stock')) {
// Default warehouse
print '<tr><td>'.$langs->trans("DefaultWarehouse").'</td><td>';
print img_picto($langs->trans("DefaultWarehouse"), 'stock', 'class="pictofixedwidth"');
@ -1508,6 +1508,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&token='.newToken().'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?&action=create&type='.GETPOST('type', 'int')).'">';
print '<span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddWarehouse").'"></span>';
print '</a>';
print '</td>';
print '</tr>';
@ -1913,6 +1914,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
$parameters = array();
// Note that $action and $object may be modified by hook
$reshook = $hookmanager->executeHooks('tabContentEditProduct', $parameters, $object, $action);
if (empty($reshook)) {
print '<table class="border allwidth">';
@ -2111,7 +2113,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
}
// Stock
if ($object->isProduct() && isModEnabled('stock')) {
if (($object->isProduct() || getDolGlobalInt('STOCK_SUPPORTS_SERVICES')) && isModEnabled('stock')) {
// Default warehouse
print '<tr><td>'.$langs->trans("DefaultWarehouse").'</td><td>';
print img_picto($langs->trans("DefaultWarehouse"), 'stock', 'class="pictofixedwidth"');
@ -2130,7 +2132,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
*/
}
if ($object->isService() && $conf->workstation->enabled) {
if ($object->isService() && isModEnabled('workstation')) {
// Default workstation
print '<tr><td>'.$langs->trans("DefaultWorkstation").'</td><td>';
print img_picto($langs->trans("DefaultWorkstation"), 'workstation', 'class="pictofixedwidth"');
@ -2620,7 +2622,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
}
// Default warehouse
if ($object->isProduct() && isModEnabled('stock')) {
if (($object->isProduct() || getDolGlobalInt('STOCK_SUPPORTS_SERVICES')) && isModEnabled('stock')) {
$warehouse = new Entrepot($db);
$warehouse->fetch($object->fk_default_warehouse);