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

Debug v14

Browse Source
This commit is contained in:
Laurent Destailleur 2021-05-12 09:27:04 +02:00
parent f334f2a255
commit cfded75d11
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/class/html.formother.class.php
View File

@ -57,7 +57,8 @@ class FormOther
} }
/** /**
* Return HTML code for scanner tool * Return HTML code for scanner tool.
* This must be called into an existing <form>
* *
* @param string $jstoexecuteonadd Name of javascript function to call * @param string $jstoexecuteonadd Name of javascript function to call
* @return string HTML component * @return string HTML component
@ -68,7 +69,6 @@ class FormOther
$out = ''; $out = '';
$out .= '<form name="barcodescanner" method="POST">';
$out .= '<!-- Popup for mass barcode scanning -->'."\n"; $out .= '<!-- Popup for mass barcode scanning -->'."\n";
$out .= '<div class="div-for-modal-topright" style="padding: 15px">'; $out .= '<div class="div-for-modal-topright" style="padding: 15px">';
$out .= '<center><strong>Barcode scanner tool...</strong></center><br>'; $out .= '<center><strong>Barcode scanner tool...</strong></center><br>';
@ -98,7 +98,6 @@ class FormOther
$out .= '</center>'; $out .= '</center>';
$out .= '</div>'; $out .= '</div>';
$out .= '</form>';
return $out; return $out;
} }

4
htdocs/product/inventory/inventory.php
View File

@ -99,6 +99,10 @@ $now = dol_now();
* Actions * Actions
*/ */
if ($cancel) {
$action = '';
}
if ($action == 'cancel_record' && $permissiontoadd) { if ($action == 'cancel_record' && $permissiontoadd) {
$object->setCanceled($user); $object->setCanceled($user);
} }