From 494d6dcfef4574a29ee0c1dcb5cbd763c0662d6e Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 18 Jun 2018 13:50:58 +0200 Subject: [PATCH 1/2] Fix: libelle is deprecated, use label instead --- htdocs/product/canvas/product/tpl/card_create.tpl.php | 2 +- htdocs/product/canvas/product/tpl/card_edit.tpl.php | 2 +- htdocs/product/canvas/service/tpl/card_create.tpl.php | 2 +- htdocs/product/canvas/service/tpl/card_edit.tpl.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/product/canvas/product/tpl/card_create.tpl.php b/htdocs/product/canvas/product/tpl/card_create.tpl.php index e763605f701..bc4b5409688 100644 --- a/htdocs/product/canvas/product/tpl/card_create.tpl.php +++ b/htdocs/product/canvas/product/tpl/card_create.tpl.php @@ -55,7 +55,7 @@ $statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSe trans("Label"); ?> - + diff --git a/htdocs/product/canvas/product/tpl/card_edit.tpl.php b/htdocs/product/canvas/product/tpl/card_edit.tpl.php index c64c5dbe1e4..6c13bddb6a1 100644 --- a/htdocs/product/canvas/product/tpl/card_edit.tpl.php +++ b/htdocs/product/canvas/product/tpl/card_edit.tpl.php @@ -55,7 +55,7 @@ dol_htmloutput_errors($object->error,$object->errors); trans("Label"); ?> - + diff --git a/htdocs/product/canvas/service/tpl/card_create.tpl.php b/htdocs/product/canvas/service/tpl/card_create.tpl.php index 46db54d63b8..b9dc10fd5dc 100644 --- a/htdocs/product/canvas/service/tpl/card_create.tpl.php +++ b/htdocs/product/canvas/service/tpl/card_create.tpl.php @@ -52,7 +52,7 @@ $statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSe trans("Label"); ?> - + diff --git a/htdocs/product/canvas/service/tpl/card_edit.tpl.php b/htdocs/product/canvas/service/tpl/card_edit.tpl.php index 06d1b3ff612..6fc3bf3273a 100644 --- a/htdocs/product/canvas/service/tpl/card_edit.tpl.php +++ b/htdocs/product/canvas/service/tpl/card_edit.tpl.php @@ -52,7 +52,7 @@ dol_htmloutput_errors($object->error,$object->errors); trans("Label"); ?> - + From 54a333c37413eb06b64ea2b0913ff56e8dda7659 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 18 Jun 2018 13:54:14 +0200 Subject: [PATCH 2/2] Fix: use label instead libelle --- htdocs/product/canvas/product/actions_card_product.class.php | 2 +- htdocs/product/canvas/service/actions_card_service.class.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/product/canvas/product/actions_card_product.class.php b/htdocs/product/canvas/product/actions_card_product.class.php index 09508f5c2cb..6e263cde36c 100644 --- a/htdocs/product/canvas/product/actions_card_product.class.php +++ b/htdocs/product/canvas/product/actions_card_product.class.php @@ -101,7 +101,7 @@ class ActionsCardProduct $this->tpl['ref'] = $this->ref; // Label - $this->tpl['label'] = $this->libelle; + $this->tpl['label'] = $this->label; // Description $this->tpl['description'] = nl2br($this->description); diff --git a/htdocs/product/canvas/service/actions_card_service.class.php b/htdocs/product/canvas/service/actions_card_service.class.php index 171e3960299..8e1ec2f9ce7 100644 --- a/htdocs/product/canvas/service/actions_card_service.class.php +++ b/htdocs/product/canvas/service/actions_card_service.class.php @@ -100,7 +100,7 @@ class ActionsCardService $this->tpl['ref'] = $this->ref; // Label - $this->tpl['label'] = $this->libelle; + $this->tpl['label'] = $this->label; // Description $this->tpl['description'] = nl2br($this->description);