Fix/supplier doc keep project (#39306)
* FIX : situation invoice credit note wrong amount in progressive mode When creating a credit note "with same lines" from a situation invoice, the code always subtracts the previous situation invoice's line values before inverting the sign, assuming lines are stored cumulative (INVOICE_USE_SITUATION = 1, legacy mode). In progressive mode (INVOICE_USE_SITUATION = 2), each situation invoice line already stores its own delta amount and percent, so this extra subtraction credits the wrong amount and percent (e.g. 60% / 1272 instead of the correct 20% / 424 on a real cycle). Skip the subtraction in progressive mode so the credit note reuses the source line's own delta values, as expected. * FIX supplier order/proposal loses project after supplier selection On the create form of a supplier order (fourn/commande/card.php) and a supplier price request (supplier_proposal/card.php), the project select was filtered on the supplier third party as soon as one was chosen: the `if ($socid > 0)` branch took precedence over the PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS constant. As a result, a supplier document created from a customer project lost its preselected project when the page reloaded after picking the supplier (the customer project is not linked to the supplier, so it was filtered out). This aligns the behavior with the supplier invoice (fourn/facture/card.php), which gives priority to PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS. The external user restriction now targets $user->socid (the real external-user marker) instead of $socid > 0, which also matched internal users after selecting a supplier.
This commit is contained in:
parent
64bccf16c3
commit
1156dc7ac7
2 changed files with 12 additions and 8 deletions
|
|
@ -1838,12 +1838,14 @@ if ($action == 'create') {
|
|||
|
||||
$langs->load('projects');
|
||||
print '<tr><td>'.$langs->trans('Project').'</td><td>';
|
||||
if ($socid > 0) { // external user
|
||||
$projSocFilter = $socid;
|
||||
} elseif ((int) $societe->id == 0 || getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS')) {
|
||||
if (!empty($user->socid)) { // external user: restrict to their own third party
|
||||
$projSocFilter = $user->socid;
|
||||
} elseif (getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') || $socid == 0) {
|
||||
// Give priority to the constant (as on supplier invoice), so a supplier document created from a
|
||||
// customer project keeps that project selected after the supplier is chosen.
|
||||
$projSocFilter = -1;
|
||||
} else {
|
||||
$projSocFilter = $societe->id;
|
||||
$projSocFilter = $socid;
|
||||
}
|
||||
print img_picto('', 'project', 'class="pictofixedwidth"').$formproject->select_projects($projSocFilter, $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');
|
||||
print ' <a href="'.DOL_URL_ROOT.'/projet/card.php?action=create&status=1'.(!empty($societe->id) ? '&socid='.$societe->id : "").'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create'.(!empty($societe->id) ? '&socid='.$societe->id : "")).'"><span class="fa fa-plus-circle valignmiddle" title="'.$langs->trans("AddProject").'"></span></a>';
|
||||
|
|
|
|||
|
|
@ -1439,12 +1439,14 @@ if ($action == 'create') {
|
|||
|
||||
print '<tr>';
|
||||
print '<td>'.$langs->trans("Project").'</td><td colspan="2">';
|
||||
if ($socid > 0) { // external user
|
||||
$projSocFilter = $socid;
|
||||
} elseif ((int) $soc->id == 0 || getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS')) {
|
||||
if (!empty($user->socid)) { // external user: restrict to their own third party
|
||||
$projSocFilter = $user->socid;
|
||||
} elseif (getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') || $socid == 0) {
|
||||
// Give priority to the constant (as on supplier invoice), so a supplier document created from a
|
||||
// customer project keeps that project selected after the supplier is chosen.
|
||||
$projSocFilter = -1;
|
||||
} else {
|
||||
$projSocFilter = $soc->id;
|
||||
$projSocFilter = $socid;
|
||||
}
|
||||
print img_picto('', 'project', 'class="pictofixedwidth"').$formproject->select_projects($projSocFilter, $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');
|
||||
print ' <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.((int) $soc->id).'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'"><span class="fa fa-plus-circle valignmiddle" title="'.$langs->trans("AddProject").'"></span></a>';
|
||||
|
|
|
|||
Loading…
Reference in a new issue