From aa64266c2f0059e679d18db11c5b65cfe26e908b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
<marcosgdf@gmail.com>
Date: Sat, 16 Apr 2016 18:44:31 +0200
Subject: [PATCH] FIX #5008 SQL error when editing the reference of a supplier
invoice that already exists
Close #5008
---
htdocs/fourn/class/fournisseur.facture.class.php | 13 +++++++++++--
htdocs/fourn/facture/card.php | 7 +++++--
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 42418184c4f..a4799bc53fe 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -7,7 +7,7 @@
* Copyright (C) 2010-2015 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
- * Copyright (C) 2014-2015 Marcos García <marcosgdf@gmail.com>
+ * Copyright (C) 2014-2016 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2015 Bahfir Abbes <bafbes@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -646,7 +646,16 @@ class FactureFournisseur extends CommonInvoice
dol_syslog(get_class($this)."::update", LOG_DEBUG);
$resql = $this->db->query($sql);
- if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+ if (!$resql) {
+ $error++;
+
+ if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+ $this->errors[] = $langs->trans('ErrorRefAlreadyExists');
+ } else {
+ $this->errors[] = "Error ".$this->db->lasterror();
+ }
+ }
if (! $error)
{
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index f70ca50c902..d8e8cbe39e3 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -238,8 +238,11 @@ if (empty($reshook))
// Set supplier ref
if ($action == 'setref_supplier' && $user->rights->fournisseur->commande->creer)
{
- $result=$object->setValueFrom('ref_supplier',GETPOST('ref_supplier','alpha'));
- if ($result < 0) dol_print_error($db, $object->error);
+ $object->ref_supplier = GETPOST('ref_supplier', 'alpha');
+
+ if ($object->update() < 0) {
+ setEventMessage($object->error, 'errors');
+ }
}
// conditions de reglement
--
GitLab