From 737dfab5b24e0b8c91b82a69f915bd26c76f0b18 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 16 Nov 2014 19:12:05 +0100
Subject: [PATCH] Fix: If error on add line of type "product" when creating
proposal/order/invoice, do not show date of services.
---
htdocs/comm/propal.php | 2 +-
htdocs/core/tpl/objectline_create.tpl.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 3eeef6916eb..6d23d3a982d 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -2000,7 +2000,7 @@ if ($action == 'create')
{
$var = true;
- // Add free products/services
+ // Add products/services form
$object->formAddObjectLine(1, $mysoc, $soc);
$parameters = array();
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 86ef648bf94..a69ab60c254 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -271,7 +271,7 @@ else {
</tr>
<?php
-if (! empty($conf->service->enabled) && $dateSelector)
+if (! empty($conf->service->enabled) && $dateSelector && GETPOST('type') != '0')
{
if(! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) $colspan = 10;
else $colspan = 9;
--
GitLab