Pass user object to submitDeclaration method
- Add user parameter to submitDeclaration method signature - Pass user object from view file to submitDeclaration method - Remove redundant global user declaration - Fixes null user parameter in bookkeeping create method
This commit is contained in:
parent
23d4fb3bdc
commit
99683fab10
@ -1290,12 +1290,11 @@ class DeclarationTVA
|
|||||||
* Submit declaration (create accounting entries and update status)
|
* Submit declaration (create accounting entries and update status)
|
||||||
*
|
*
|
||||||
* @param int $declaration_id Declaration ID
|
* @param int $declaration_id Declaration ID
|
||||||
|
* @param object $user User object
|
||||||
* @return bool Success
|
* @return bool Success
|
||||||
*/
|
*/
|
||||||
public function submitDeclaration($declaration_id)
|
public function submitDeclaration($declaration_id, $user)
|
||||||
{
|
{
|
||||||
global $user;
|
|
||||||
|
|
||||||
// Get declaration data
|
// Get declaration data
|
||||||
$declaration = $this->fetch($declaration_id);
|
$declaration = $this->fetch($declaration_id);
|
||||||
if (!$declaration) {
|
if (!$declaration) {
|
||||||
|
|||||||
@ -114,7 +114,7 @@ if ($action == 'unvalidate' && $token) {
|
|||||||
|
|
||||||
if ($action == 'submit' && $token) {
|
if ($action == 'submit' && $token) {
|
||||||
// Submit the declaration (create accounting entries and update status)
|
// Submit the declaration (create accounting entries and update status)
|
||||||
if ($declarationtva->submitDeclaration($id)) {
|
if ($declarationtva->submitDeclaration($id, $user)) {
|
||||||
setEventMessages($langs->trans("DeclarationSubmitted"), null, 'mesgs');
|
setEventMessages($langs->trans("DeclarationSubmitted"), null, 'mesgs');
|
||||||
} else {
|
} else {
|
||||||
setEventMessages($langs->trans("ErrorSubmittingDeclaration") . ": " . $declarationtva->error, null, 'errors');
|
setEventMessages($langs->trans("ErrorSubmittingDeclaration") . ": " . $declarationtva->error, null, 'errors');
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user