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

Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/element_time_code_integration

Browse Source
This commit is contained in:
Gauthier PC portable 024 2023-03-09 16:15:53 +01:00
commit 4a3e668daa
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/compta/paiement/cheque/card.php
View File

@ -145,9 +145,8 @@ if ($action == 'create' && GETPOST("accountid", "int") > 0 && $user->rights->ban
if (GETPOSTISARRAY('toRemise')) { if (GETPOSTISARRAY('toRemise')) {
$object->type = $type; $object->type = $type;
$arrayofid = GETPOST('toRemise', 'array:int'); $arrayofid = GETPOST('toRemise', 'array:int');
var_dump($arrayofid);
$result = $object->create($user, GETPOST("accountid", "int"), 0, GETPOST('toRemise', 'array:int')); $result = $object->create($user, GETPOST("accountid", "int"), 0, $arrayofid);
if ($result > 0) { if ($result > 0) {
if ($object->statut == 1) { // If statut is validated, we build doc if ($object->statut == 1) { // If statut is validated, we build doc
$object->fetch($object->id); // To force to reload all properties in correct property name $object->fetch($object->id); // To force to reload all properties in correct property name

2
htdocs/compta/paiement/cheque/index.php
View File

@ -130,7 +130,7 @@ foreach ($arrayofpaymentmodetomanage as $val) {
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_journal as aj ON aj.rowid = ba.fk_accountancy_journal"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_journal as aj ON aj.rowid = ba.fk_accountancy_journal";
$sql .= " WHERE ba.rowid = bc.fk_bank_account"; $sql .= " WHERE ba.rowid = bc.fk_bank_account";
$sql .= " AND bc.entity = ".((int) $conf->entity); $sql .= " AND bc.entity = ".((int) $conf->entity);
$sql .= " AND bc.type = '".$db->escape($type)."'"; $sql .= " AND bc.type = '".$db->escape($val)."'";
$sql .= " ORDER BY bc.date_bordereau DESC, rowid DESC"; $sql .= " ORDER BY bc.date_bordereau DESC, rowid DESC";
$sql .= $db->plimit($max); $sql .= $db->plimit($max);