From 954c29786e7102c7cf3bf771e42d00d5eb81933d Mon Sep 17 00:00:00 2001
From: Florian Mortgat <florian.mortgat@atm-consulting.fr>
Date: Wed, 27 May 2020 12:15:42 +0200
Subject: [PATCH 1/2] FIX 10.0 - pagination in prelevement/bons.php

---
 htdocs/compta/prelevement/bons.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php
index 27654de1ad0..b5610b81f68 100644
--- a/htdocs/compta/prelevement/bons.php
+++ b/htdocs/compta/prelevement/bons.php
@@ -36,7 +36,10 @@ $socid = GETPOST('socid', 'int');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'prelevement', '', '', 'bons');
 
+$urladd = '';
 $limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):$conf->liste_limit;
+if ($limit != $conf->liste_limit) $urladd .= '&limit=' . $limit;
+
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page', 'int');
@@ -102,7 +105,7 @@ if ($result)
     $num = $db->num_rows($result);
     $i = 0;
 
-    $urladd= "&amp;statut=".$statut;
+    $urladd .= "&amp;statut=" . $statut;
 
     $selectedfields='';
 

From 1e208e537f12cf9be59655c728a64ab38df9e39a Mon Sep 17 00:00:00 2001
From: kamel <kamel@kam>
Date: Fri, 29 May 2020 16:24:07 +0200
Subject: [PATCH 2/2] FIX: Fix link of the button to create a credit note and
 fix the awareness of a error happen when to create a credit note

---
 htdocs/compta/facture/card.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index cb3aa9cd099..b97d22631a1 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -1106,12 +1106,12 @@ if (empty($reshook))
 				}
 
 				// Add link between credit note and origin
-				if(! empty($object->fk_facture_source)) {
+				if(! empty($object->fk_facture_source) && $id>0) {
 					$facture_source->fetch($object->fk_facture_source);
 					$facture_source->fetchObjectLinked();
 
-					if(! empty($facture_source->linkedObjectsIds)) {
-						foreach($facture_source->linkedObjectsIds as $sourcetype => $TIds) {
+					if (!empty($facture_source->linkedObjectsIds)) {
+						foreach ($facture_source->linkedObjectsIds as $sourcetype => $TIds) {
 							$object->add_object_linked($sourcetype, current($TIds));
 						}
 					}
@@ -4835,9 +4835,8 @@ elseif ($id > 0 || ! empty($ref))
 			// Create a credit note
 			if (($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_PROFORMA) && $object->statut > 0 && $usercancreate)
 			{
-				if (! $objectidnext)
-				{
-					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?socid=' . $object->socid .'&amp;fac_avoir=' . $object->id . '&amp;action=create&amp;type=2'.($object->fk_project > 0 ? '&amp;projectid='.$object->fk_project : '').'' . ($object->entity > 0 ? '&amp;originentity='.$object->entity : '').'">' . $langs->trans("CreateCreditNote") . '</a></div>';
+				if (! $objectidnext) {
+					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?socid=' . $object->socid . '&amp;fac_avoir=' . $object->id . '&amp;action=create&amp;type=2' . ($object->fk_project > 0 ? '&amp;projectid=' . $object->fk_project : '') . ($object->entity > 0 ? '&amp;originentity=' . $object->entity : '') . '">' . $langs->trans("CreateCreditNote") . '</a></div>';
 				}
 			}