From 88e6c203eb919c2f28ddbfe8381ea8bedb93c966 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Fri, 25 Nov 2016 23:41:47 +0100 Subject: [PATCH 1/2] Fix #6037 Bill Orders issue --- htdocs/compta/facture/class/facture.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 61f51b19436..b938bdd0883 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -424,7 +424,7 @@ class Facture extends CommonInvoice else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1)) { $origin_id = $tmp_origin_id; - $ret = $this->add_object_linked($origin, $origin_id); + $ret = $this->add_object_linked($this->origin, $origin_id); if (! $ret) { dol_print_error($this->db); @@ -434,7 +434,7 @@ class Facture extends CommonInvoice if (! empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN)) { - $originforcontact = $origin; + $originforcontact = $this->origin; $originidforcontact = $origin_id; if ($originforcontact == 'shipping') // shipment and order share the same contacts. If creating from shipment we take data of order { From 370f76d097e4eff28390c5502a3fcf2a2a6977a2 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Sat, 10 Dec 2016 12:27:11 +0100 Subject: [PATCH 2/2] Fix #6106 error message when cancel pic resize --- htdocs/core/photos_resize.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php index 3d241b6d5e4..2ef81d6e8df 100644 --- a/htdocs/core/photos_resize.php +++ b/htdocs/core/photos_resize.php @@ -2,6 +2,7 @@ /* Copyright (C) 2010-2015 Laurent Destailleur * Copyright (C) 2009 Meos * Copyright (C) 2012 Regis Houssin + * Copyright (C) 2016 Juanjo Menent * * 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 @@ -105,7 +106,7 @@ elseif ($modulepart == 'holiday') if (empty($backtourl)) { - if (in_array($modulepart, array('product','produit','service'))) $backtourl=DOL_URL_ROOT."/product/document.php?id=".$id.'&file='.urldecode($_POST["file"]); + if (in_array($modulepart, array('product','produit','service','produit|service'))) $backtourl=DOL_URL_ROOT."/product/document.php?id=".$id.'&file='.urldecode($_POST["file"]); else if (in_array($modulepart, array('holiday'))) $backtourl=DOL_URL_ROOT."/holiday/document.php?id=".$id.'&file='.urldecode($_POST["file"]); else if (in_array($modulepart, array('project'))) $backtourl=DOL_URL_ROOT."/projet/document.php?id=".$id.'&file='.urldecode($_POST["file"]); }