forked from Dolibarr/dolibarr
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
26 changed files
with
136 additions
and
82 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,6 +6,7 @@ | |
| * Copyright (C) 2013 Philippe Grand <[email protected]> | ||
| * Copyright (C) 2015-2016 Alexandre Spangaro <[email protected]> | ||
| * Copyright (C) 2018-2024 Frédéric France <[email protected]> | ||
| * Copyright (C) 2024 MDW <[email protected]> | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
|
|
@@ -203,7 +204,7 @@ | |
| header("Location: index.php"); | ||
| exit; | ||
| } else { | ||
| setEventMessages($paiement->error, $paiement->errors, 'errors'); | ||
| setEventMessages($object->error, $object->errors, 'errors'); | ||
| } | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,6 +2,7 @@ | |
| /* Copyright (C) 2004-2014 Laurent Destailleur <[email protected]> | ||
| * Copyright (C) 2016-2024 Frédéric France <[email protected]> | ||
| * Copyright (C) 2022 Alexandre Spangaro <[email protected]> | ||
| * Copyright (C) 2024 MDW <[email protected]> | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
|
|
@@ -201,6 +202,7 @@ | |
| $sql = "SELECT sum(p.amount) as total"; | ||
| $sql .= " FROM ".MAIN_DB_PREFIX."paiementcharge as p"; | ||
| $sql .= " WHERE p.fk_charge = ".((int) $chid); | ||
| $sumpaid = 0; | ||
| $resql = $db->query($sql); | ||
| if ($resql) { | ||
| $obj = $db->fetch_object($resql); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,7 @@ | |
| * Copyright (C) 2005-2010 Laurent Destailleur <[email protected]> | ||
| * Copyright (C) 2010-2016 Juanjo Menent <[email protected]> | ||
| * Copyright (C) 2018-2024 Frédéric France <[email protected]> | ||
| * Copyright (C) 2024 MDW <[email protected]> | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
|
|
@@ -245,7 +246,7 @@ | |
| print '<form name="setdate_trans" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">'; | ||
| print '<input type="hidden" name="token" value="'.newToken().'">'; | ||
| print '<input type="hidden" name="action" value="setdate_trans">'; | ||
| print $form->selectDate($object->date_trans ? $object->date_trans : -1, 'date_trans', 0, 0, "setdate_trans"); | ||
| print $form->selectDate($object->date_trans ? $object->date_trans : -1, 'date_trans', 0, 0, 0, "setdate_trans"); | ||
| print '<input type="submit" class="button button-edit smallpaddingimp valign middle" value="'.$langs->trans('Modify').'">'; | ||
| print '</form>'; | ||
| } else { | ||
|
|
@@ -564,12 +565,14 @@ | |
| if (!$salaryBonPl) { | ||
| $thirdparty = new Societe($db); | ||
| $thirdparty->fetch($obj->socid); | ||
| $name = $thirdparty->getNomUrl(1); | ||
| } else { | ||
| $userSalary = new User($db); | ||
| $userSalary->fetch($obj->fk_user); | ||
| $name = $userSalary->getNomUrl(-1); | ||
| } | ||
| print '<td class="tdoverflowmax150">'; | ||
| print(!$salaryBonPl ? $thirdparty->getNomUrl(1) : $userSalary->getNomUrl(-1)); | ||
| print($name); | ||
| print "</td>\n"; | ||
|
|
||
| print '<td class="right"><span class="amount">'.price($obj->amount)."</span></td>\n"; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,6 +4,7 @@ | |
| * Copyright (C) 2005-2009 Regis Houssin <[email protected]> | ||
| * Copyright (C) 2011-2012 Juanjo Menent <[email protected]> | ||
| * Copyright (C) 2024 Frédéric France <[email protected]> | ||
| * Copyright (C) 2024 MDW <[email protected]> | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
|
|
@@ -215,6 +216,7 @@ | |
| } | ||
| // Count total nb of records | ||
| $nbtotalofrecords = ''; | ||
| $resql = null; | ||
| if (!getDolGlobalInt('MAIN_DISABLE_FULL_SCANLIST')) { | ||
| $resql = $db->query($sql); | ||
| $nbtotalofrecords = $db->num_rows($resql); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,6 +4,7 @@ | |
| * Copyright (C) 2005-2009 Regis Houssin <[email protected]> | ||
| * Copyright (C) 2010-2012 Juanjo Menent <[email protected]> | ||
| * Copyright (C) 2024 Frédéric France <[email protected]> | ||
| * Copyright (C) 2024 MDW <[email protected]> | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
|
|
@@ -329,6 +330,10 @@ | |
|
|
||
| $totalinvoices = 0; | ||
| $totalamount_requested = 0; | ||
| $salarytmp = null; | ||
| $usertmp = null; | ||
| $invoicetmpcustomer = null; | ||
| $invoicetmpsupplier = null; | ||
|
|
||
| if ($salaryBonPl) { | ||
| $salarytmp = new Salary($db); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,6 +5,7 @@ | |
| * Copyright (C) 2010-2012 Juanjo Menent <[email protected]> | ||
| * Copyright (C) 2024 Alexandre Spangaro <[email protected]> | ||
| * Copyright (C) 2024 Frédéric France <[email protected]> | ||
| * Copyright (C) 2024 MDW <[email protected]> | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
|
|
@@ -118,6 +119,8 @@ | |
| $TMsg = array(); | ||
| $db->begin(); | ||
| $objecttmp = new BonPrelevement($db); | ||
| $nbignored = 0; | ||
| $nbok = 0; | ||
| foreach ($toselect as $toselectid) { | ||
| $result = $objecttmp->fetch($toselectid); | ||
| if ($result > 0) { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,6 +4,7 @@ | |
| * Copyright (C) 2005-2009 Regis Houssin <[email protected]> | ||
| * Copyright (C) 2010-2011 Juanjo Menent <[email protected]> | ||
| * Copyright (C) 2024 Frédéric France <[email protected]> | ||
| * Copyright (C) 2024 MDW <[email protected]> | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
|
|
@@ -79,6 +80,8 @@ | |
| $sql .= " AND pb.type = 'debit-order'"; | ||
| } | ||
| $sql .= " AND pb.entity = ".$conf->entity; | ||
| $total = 0; | ||
| $nbtotal = 0; | ||
| $resql = $db->query($sql); | ||
| if ($resql) { | ||
| $num = $db->num_rows($resql); | ||
|
|
||
Oops, something went wrong.