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

Debug v17

Browse Source
This commit is contained in:
Laurent Destailleur 2022-11-02 16:50:45 +01:00
parent 674fdb11c5
commit 946624fd67
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/class/html.formprojet.class.php
View File

@ -689,10 +689,10 @@ class FormProjets
$sellist .= '<option value="-1">&nbsp;</option>'; $sellist .= '<option value="-1">&nbsp;</option>';
} }
if ($showallnone) { if ($showallnone) {
$sellist .= '<option value="all"'.($preselected == 'all' ? ' selected="selected"' : '').'>-- '.$langs->trans("OnlyOpportunitiesShort").' --</option>'; $sellist .= '<option value="all"'.($preselected == 'all' ? ' selected="selected"' : '').'>-- '.$langs->trans("OnlyOpportunitiesShort").'</option>';
$sellist .= '<option value="openedopp"'.($preselected == 'openedopp' ? ' selected="selected"' : '').'>-- '.$langs->trans("OpenedOpportunitiesShort").' --</option>'; $sellist .= '<option value="openedopp"'.($preselected == 'openedopp' ? ' selected="selected"' : '').'>-- '.$langs->trans("OpenedOpportunitiesShort").'</option>';
$sellist .= '<option value="notopenedopp"'.($preselected == 'notopenedopp' ? ' selected="selected"' : '').'>-- '.$langs->trans("NotOpenedOpportunitiesShort").' --</option>'; $sellist .= '<option value="notopenedopp"'.($preselected == 'notopenedopp' ? ' selected="selected"' : '').'>-- '.$langs->trans("NotOpenedOpportunitiesShort").'</option>';
$sellist .= '<option value="none"'.($preselected == 'none' ? ' selected="selected"' : '').'>-- '.$langs->trans("NotAnOpportunityShort").' --</option>'; $sellist .= '<option value="none"'.($preselected == 'none' ? ' selected="selected"' : '').'>-- '.$langs->trans("NotAnOpportunityShort").'</option>';
} }
while ($i < $num) { while ($i < $num) {
$obj = $this->db->fetch_object($resql); $obj = $this->db->fetch_object($resql);

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

@ -88,7 +88,7 @@ DeleteFromCat=Remove from tags/category
ExtraFieldsCategories=Complementary attributes ExtraFieldsCategories=Complementary attributes
CategoriesSetup=Tags/categories setup CategoriesSetup=Tags/categories setup
CategorieRecursiv=Link with parent tag/category automatically CategorieRecursiv=Link with parent tag/category automatically
CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category. CategorieRecursivHelp=If option is on, when you add an object into a subcategory, the object will also be added into the parent categories.
AddProductServiceIntoCategory=Add the following product/service AddProductServiceIntoCategory=Add the following product/service
AddCustomerIntoCategory=Assign category to customer AddCustomerIntoCategory=Assign category to customer
AddSupplierIntoCategory=Assign category to supplier AddSupplierIntoCategory=Assign category to supplier

12
htdocs/projet/list.php
View File

@ -1008,7 +1008,7 @@ if (!empty($arrayfields['c.assigned']['checked'])) {
// Opp status // Opp status
if (!empty($arrayfields['p.fk_opp_status']['checked'])) { if (!empty($arrayfields['p.fk_opp_status']['checked'])) {
print '<td class="liste_titre nowrap center">'; print '<td class="liste_titre nowrap center">';
print $formproject->selectOpportunityStatus('search_opp_status', $search_opp_status, 1, 0, 1, 0, 'maxwidth100 nowrapoption', 1, 0); print $formproject->selectOpportunityStatus('search_opp_status', $search_opp_status, 1, 1, 1, 0, 'maxwidth125 nowrapoption', 1, 1);
print '</td>'; print '</td>';
} }
if (!empty($arrayfields['p.opp_amount']['checked'])) { if (!empty($arrayfields['p.opp_amount']['checked'])) {
@ -1267,6 +1267,9 @@ while ($i < $imaxinloop) {
print '<input id="cb'.$obj->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->id.'"'.($selected ? ' checked="checked"' : '').'>'; print '<input id="cb'.$obj->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->id.'"'.($selected ? ' checked="checked"' : '').'>';
} }
print '</td>'; print '</td>';
if (!$i) {
$totalarray['nbfield']++;
}
} }
// Project url // Project url
if (!empty($arrayfields['p.ref']['checked'])) { if (!empty($arrayfields['p.ref']['checked'])) {
@ -1428,6 +1431,9 @@ while ($i < $imaxinloop) {
} }
} }
print '</td>'; print '</td>';
if (!$i) {
$totalarray['nbfield']++;
}
} }
// Opp Status // Opp Status
if (!empty($arrayfields['p.fk_opp_status']['checked'])) { if (!empty($arrayfields['p.fk_opp_status']['checked'])) {
@ -1612,7 +1618,7 @@ while ($i < $imaxinloop) {
$userstatic->gender = $obj->gender; $userstatic->gender = $obj->gender;
if (!empty($arrayfields['u.login']['checked'])) { if (!empty($arrayfields['u.login']['checked'])) {
print '<td class="center tdoverflowmax200">'; print '<td class="center tdoverflowmax150">';
if ($userstatic->id) { if ($userstatic->id) {
print $userstatic->getNomUrl(-1); print $userstatic->getNomUrl(-1);
} else { } else {
@ -1672,10 +1678,10 @@ while ($i < $imaxinloop) {
print '<input id="cb'.$obj->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->id.'"'.($selected ? ' checked="checked"' : '').'>'; print '<input id="cb'.$obj->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->id.'"'.($selected ? ' checked="checked"' : '').'>';
} }
print '</td>'; print '</td>';
}
if (!$i) { if (!$i) {
$totalarray['nbfield']++; $totalarray['nbfield']++;
} }
}
print "</tr>\n"; print "</tr>\n";
} }