Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Debug v21

Browse Source
This commit is contained in:
Laurent Destailleur
2024-11-05 01:43:48 +01:00
parent e7d628109d
commit 590ecf0243
7 changed files with 53 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/compta/resultat/projects.php
View File

@@ -177,19 +177,19 @@ $total_ttc = 0;
// Affiche en-tete de rapport // Affiche en-tete de rapport
if ($modecompta == "CREANCES-DETTES") { if ($modecompta == "CREANCES-DETTES") {
$name = $langs->trans("ReportInOut").', '.$langs->trans("ByProject"); $name = $langs->trans("ReportInOut").', '.$langs->trans("ByProjects");
$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0); $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($tmps['year'] - 1)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($tmps['year'] + 1)."&modecompta=".$modecompta."'>".img_next()."</a>" : ""); $periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($tmps['year'] - 1)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($tmps['year'] + 1)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
$builddate = dol_now(); $builddate = dol_now();
//$exportlink=$langs->trans("NotYetAvailable"); //$exportlink=$langs->trans("NotYetAvailable");
} elseif ($modecompta == "RECETTES-DEPENSES") { } elseif ($modecompta == "RECETTES-DEPENSES") {
$name = $langs->trans("ReportInOut").', '.$langs->trans("ByProject"); $name = $langs->trans("ReportInOut").', '.$langs->trans("ByProjects");
$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0); $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($tmps['year'] - 1)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($tmps['year'] + 1)."&modecompta=".$modecompta."'>".img_next()."</a>" : ""); $periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($tmps['year'] - 1)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($tmps['year'] + 1)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
$builddate = dol_now(); $builddate = dol_now();
//$exportlink=$langs->trans("NotYetAvailable"); //$exportlink=$langs->trans("NotYetAvailable");
} elseif ($modecompta == "BOOKKEEPING") { } elseif ($modecompta == "BOOKKEEPING") {
$name = $langs->trans("ReportInOut").', '.$langs->trans("ByProject"); $name = $langs->trans("ReportInOut").', '.$langs->trans("ByProjects");
$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0); $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
$arraylist = array('no'=>$langs->trans("CustomerCode"), 'yes'=>$langs->trans("AccountWithNonZeroValues"), 'all'=>$langs->trans("All")); $arraylist = array('no'=>$langs->trans("CustomerCode"), 'yes'=>$langs->trans("AccountWithNonZeroValues"), 'all'=>$langs->trans("All"));
$period .= ' &nbsp; &nbsp; <span class="opacitymedium">'.$langs->trans("DetailBy").'</span> '.$form->selectarray('showaccountdetail', $arraylist, $showaccountdetail, 0); $period .= ' &nbsp; &nbsp; <span class="opacitymedium">'.$langs->trans("DetailBy").'</span> '.$form->selectarray('showaccountdetail', $arraylist, $showaccountdetail, 0);
@@ -249,7 +249,7 @@ print '<table class="liste noborder centpercent">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
if ($modecompta == 'BOOKKEEPING') { if ($modecompta == 'BOOKKEEPING') {
print_liste_field_titre("ByProject", $_SERVER["PHP_SELF"], 'f.thirdparty_code,f.rowid', '', $param, '', $sortfield, $sortorder, 'width200 '); print_liste_field_titre("ByProjects", $_SERVER["PHP_SELF"], 'f.thirdparty_code,f.rowid', '', $param, '', $sortfield, $sortorder, 'width200 ');
} else { } else {
print_liste_field_titre("", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'width200 '); print_liste_field_titre("", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'width200 ');
} }

37
htdocs/core/class/html.form.class.php
View File

@@ -11243,31 +11243,34 @@ class Form
// Adding the div for search assistance // Adding the div for search assistance
$ret .= '<div class="search-component-assistance">'; $ret .= '<div class="search-component-assistance">';
$ret .= '<div>';
$ret .= '<table><tbody>'; $ret .= '<p class="assistance-title">' . img_picto('', 'filter') . ' ' . $langs->trans('FilterAssistance') . ' </p>';
$ret .= '<p class="assistance-title">' . img_picto('', 'help') . ' ' . $langs->trans('FilterAssistance') . ' </p>';
$ret .= '<p class="assistance-errors error" style="display:none">' . $langs->trans('AllFieldsRequired') . ' </p>'; $ret .= '<p class="assistance-errors error" style="display:none">' . $langs->trans('AllFieldsRequired') . ' </p>';
$ret .= '<tr><td>'; $ret .= '<div class="inline-block">';
$ret .= $form->selectarray('search_filter_field', $arrayoffilterfieldslabel, '', $langs->trans("Fields"), 0, 0, '', 0, 0, 0, '', 'maxwidth250', 1); $ret .= $form->selectarray('search_filter_field', $arrayoffilterfieldslabel, '', $langs->trans("Fields"), 0, 0, '', 0, 0, 0, '', 'width250', 1);
$ret .= '</td>'; $ret .= '</div>';
$ret .= '<span class="separator"></span>';
$ret .= '<td><span class="separator"></span>';
// Operator selector (will be populated dynamically) // Operator selector (will be populated dynamically)
$ret .= '<select class="operator-selector" id="operator-selector"">'; $ret .= '<div class="inline-block">';
$ret .= '<select class="operator-selector width150" id="operator-selector"">';
$ret .= '</select>'; $ret .= '</select>';
$ret .= '<script>$(document).ready(function() {'; $ret .= '<script>$(document).ready(function() {';
$ret .= ' $(".operator-selector").select2({'; $ret .= ' $(".operator-selector").select2({';
$ret .= ' placeholder: "' . $langs->trans('Operator') . '"'; $ret .= ' placeholder: \'' . dol_escape_js($langs->trans('Operator')) . '\'';
$ret .= ' });'; $ret .= ' });';
$ret .= '});</script>'; $ret .= '});</script>';
$ret .= '</td>'; $ret .= '</div>';
$ret .= '<td><span class="separator"></span>'; $ret .= '<span class="separator"></span>';
$ret .= '<div class="inline-block">';
// Input field for entering values // Input field for entering values
$ret .= '<input type="text" class="flat width100 value-input" placeholder="' . $langs->trans('Value') . '">'; $ret .= '<input type="text" class="flat width100 value-input" placeholder="' . dolPrintHTML($langs->trans('Value')) . '">';
// Date selector // Date selector
$dateOne = ''; $dateOne = '';
@@ -11275,14 +11278,14 @@ class Form
$ret .= $form->selectDate(($dateOne ? $dateOne : -1), 'dateone', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, ''); $ret .= $form->selectDate(($dateOne ? $dateOne : -1), 'dateone', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '');
$ret .= '</span>'; $ret .= '</span>';
$ret .= '<span class="end-separator"></span> </td>'; $ret .= '</div>';
$ret .= '<td>'; $ret .= '<div class="inline-block">';
$ret .= '<button class="button buttongen button-save small add-filter-btn" type="button">' . $langs->trans("addToFilter") . '</button>'; $ret .= '<button class="button buttongen button-save small add-filter-btn" type="button">' . $langs->trans("addToFilter") . '</button>';
$ret .= '</td>'; $ret .= '</div>';
$ret .= '</tr>'; $ret .= '</div>';
$ret .= '</tbody></table>'; //$ret .= '</tbody></table>';
// End of the assistance div // End of the assistance div
$ret .= '</div>'; $ret .= '</div>';

38
htdocs/core/js/lib_head.js.php
View File

@@ -1110,31 +1110,31 @@ function getOperatorsForFieldType(type) {
// Define the list of operators for each general field category // Define the list of operators for each general field category
const operatorList = { const operatorList = {
text: { text: {
Contains: "<?php print $langs->trans('Contains'); ?>", Contains: '<?php print dol_escape_js($langs->trans('Contains')); ?>',
DoesNotContain: "<?php print $langs->trans('DoesNotContain'); ?>", DoesNotContain: '<?php print dol_escape_js($langs->trans('DoesNotContain')); ?>',
Is: "<?php print $langs->trans('Is'); ?>", Is: '<?php print dol_escape_js($langs->trans('Is')); ?>',
IsNot: "<?php print $langs->trans('IsNot'); ?>", IsNot: '<?php print dol_escape_js($langs->trans('IsNot')); ?>',
StartsWith: "<?php print $langs->trans('StartsWith'); ?>", StartsWith: '<?php print dol_escape_js($langs->trans('StartsWith')); ?>',
EndsWith: "<?php print $langs->trans('EndsWith'); ?>" EndsWith: '<?php print dol_escape_js($langs->trans('EndsWith')); ?>'
}, },
number: { number: {
"=": "=", '=': '<?php print dol_escape_js($langs->trans('Is')); ?>',
"!=": "!=", '!=': '<?php print dol_escape_js($langs->trans('IsNot')); ?>',
"<": "<", '<': '<?php print dol_escape_js($langs->trans('IsLowerThan')); ?>',
">": ">", '>': '<?php print dol_escape_js($langs->trans('IsHigherThan')); ?>',
"<=": "<=", '<=': '<?php print dol_escape_js($langs->trans('IsLowerThanOrEqual')); ?>',
">=": ">=" '>=': '<?php print dol_escape_js($langs->trans('IsHigherThanOrEqual')); ?>',
}, },
date: { date: {
Is: "<?php print $langs->trans('Is'); ?>", Is: '<?php print dol_escape_js($langs->trans('Is')); ?>',
IsNot: "<?php print $langs->trans('IsNot'); ?>", IsNot: '<?php print dol_escape_js($langs->trans('IsNot')); ?>',
IsBefore: "<?php print $langs->trans('IsBefore'); ?>", IsBefore: '<?php print dol_escape_js($langs->trans('IsBefore')); ?>',
IsAfter: "<?php print $langs->trans('IsAfter'); ?>", IsAfter: '<?php print dol_escape_js($langs->trans('IsAfter')); ?>',
IsOnOrBefore: "<?php print $langs->trans('IsOnOrBefore'); ?>", IsOnOrBefore: '<?php print dol_escape_js($langs->trans('IsOnOrBefore')); ?>',
IsOnOrAfter: "<?php print $langs->trans('IsOnOrAfter'); ?>" IsOnOrAfter: '<?php print dol_escape_js($langs->trans('IsOnOrAfter')); ?>'
}, },
html: { html: {
Contains: "<?php print $langs->trans('Contains'); ?>" Contains: '<?php print $langs->trans('Contains'); ?>'
} }
}; };

1
htdocs/core/lib/customreports.lib.php
View File

@@ -545,6 +545,7 @@ function fillArrayOfFilterFields($object, $tablealias, $labelofobject, &$arrayof
// Add main fields of object // Add main fields of object
foreach ($object->fields as $key => $val) { foreach ($object->fields as $key => $val) {
if (empty($val['measure'])) { if (empty($val['measure'])) {
// Exclude some fields
if (in_array($key, array( if (in_array($key, array(
'id', 'ref_ext', 'rowid', 'entity', 'last_main_doc', 'logo', 'logo_squarred', 'extraparams', 'id', 'ref_ext', 'rowid', 'entity', 'last_main_doc', 'logo', 'logo_squarred', 'extraparams',
'parent', 'photo', 'socialnetworks', 'webservices_url', 'webservices_key'))) { 'parent', 'photo', 'socialnetworks', 'webservices_url', 'webservices_key'))) {

2
htdocs/langs/en_US/compta.lang
View File

@@ -131,7 +131,9 @@ TurnoverCollected=Turnover collected
SalesTurnoverMinimum=Minimum turnover SalesTurnoverMinimum=Minimum turnover
ByExpenseIncome=By expenses & incomes ByExpenseIncome=By expenses & incomes
ByThirdParties=By third parties ByThirdParties=By third parties
ByProjects=By projects
ByUserAuthorOfInvoice=By invoice author ByUserAuthorOfInvoice=By invoice author
DetailedListLowercase=detailed list
CheckReceipt=Deposit slip CheckReceipt=Deposit slip
CheckReceiptShort=Deposit slip CheckReceiptShort=Deposit slip
LastCheckReceiptShort=Latest %s deposit slips LastCheckReceiptShort=Latest %s deposit slips

6
htdocs/langs/en_US/main.lang
View File

@@ -1326,9 +1326,9 @@ StartsWith=Starts with
EndsWith=Ends with EndsWith=Ends with
IsBefore=Is before IsBefore=Is before
IsAfter=Is after IsAfter=Is after
IsOnOrBefore=Is on or before IsOnOrBefore=Is before or equal
IsOnOrAfter=Is on or after IsOnOrAfter=Is after or equal
addToFilter=Add to filter addToFilter=Add
FilterAssistance=Filter editor FilterAssistance=Filter editor
Operator=Operator Operator=Operator
AllFieldsRequired=All fields are required. AllFieldsRequired=All fields are required.

4
htdocs/langs/en_US/other.lang
View File

@@ -291,6 +291,10 @@ SuffixSessionName=Suffix for session name
LoginWith=Login with %s LoginWith=Login with %s
ObjectId=Object ID ObjectId=Object ID
FullData=Full data FullData=Full data
IsHigherThan=Is higher than
IsHigherThanOrEqual=Is higher than or equal
IsLowerThan=Is lower than
IsLowerThanOrEqual=Is lower than or equal
##### Export ##### ##### Export #####
ExportsArea=Exports area ExportsArea=Exports area