diff --git a/htdocs/core/ajax/ajaxinvoiceline.php b/htdocs/core/ajax/ajaxinvoiceline.php
new file mode 100644
index 00000000000..432ad15b151
--- /dev/null
+++ b/htdocs/core/ajax/ajaxinvoiceline.php
@@ -0,0 +1,69 @@
+
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+/**
+ * \file htdocs/core/ajax/ajaxinvoiceline.php
+ * \brief File to load contacts combobox
+ */
+
+if (!defined('NOTOKENRENEWAL')) {
+ define('NOTOKENRENEWAL', '1'); // Disables token renewal
+}
+if (!defined('NOREQUIREMENU')) {
+ define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+ define('NOREQUIREAJAX', '1');
+}
+
+// Load Dolibarr environment
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+
+$invoice_id = GETPOST('id', 'int'); // id of thirdparty
+$action = GETPOST('action', 'aZ09');
+$htmlname = GETPOST('htmlname', 'alpha');
+
+
+
+// Security check
+restrictedArea($user, 'facture', $invoice_id, '', '', 'fk_soc', 'rowid');
+
+
+/*
+ * View
+ */
+
+top_httphead();
+
+//print ''."\n";
+
+// Load original field value
+if (!empty($invoice_id) && !empty($action) && !empty($htmlname)) {
+ $formProject = new FormProjets($db);
+
+ $return = array();
+ if (empty($showempty)) {
+ $showempty = 0;
+ }
+
+ $return['value'] = $formProject->selectInvoiceAndLine($invoice_id, 0, 'invoiceid', 'invoicelineid', 'maxwidth500', array(), 1);
+ //$return['num'] = $form->num;
+ //$return['error'] = $form->error;
+
+ echo json_encode($return);
+}
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 21d245aec2a..e666980833b 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -37,15 +37,15 @@
*/
/**
- * \file htdocs/core/class/html.form.class.php
+ * \file htdocs/core/class/html.form.class.php
* \ingroup core
- * \brief File of class with all html predefined components
+ * \brief File of class with all html predefined components
*/
/**
- * Class to manage generation of HTML components
- * Only common components must be here.
+ * Class to manage generation of HTML components
+ * Only common components must be here.
*
* TODO Merge all function load_cache_* and loadCache* (except load_cache_vatrates) into one generic function loadCacheTable
*/
@@ -81,7 +81,7 @@ class Form
/**
* Constructor
*
- * @param DoliDB $db Database handler
+ * @param DoliDB $db Database handler
*/
public function __construct($db)
{
@@ -91,18 +91,18 @@ class Form
/**
* Output key field for an editable field
*
- * @param string $text Text of label or key to translate
- * @param string $htmlname Name of select field ('edit' prefix will be added)
- * @param string $preselected Value to show/edit (not used in this function)
- * @param object $object Object (on the page we show)
- * @param boolean $perm Permission to allow button to edit parameter. Set it to 0 to have a not edited field.
- * @param string $typeofdata Type of data ('string' by default, 'email', 'amount:99', 'numeric:99', 'text' or 'textarea:rows:cols', 'datepicker' ('day' do not work, don't know why), 'dayhour' or 'datehourpicker' 'checkbox:ckeditor:dolibarr_zzz:width:height:savemethod:1:rows:cols', 'select;xxx[:class]'...)
- * @param string $moreparam More param to add on a href URL.
- * @param int $fieldrequired 1 if we want to show field as mandatory using the "fieldrequired" CSS.
- * @param int $notabletag 1=Do not output table tags but output a ':', 2=Do not output table tags and no ':', 3=Do not output table tags but output a ' '
- * @param string $paramid Key of parameter for id ('id', 'socid')
- * @param string $help Tooltip help
- * @return string HTML edit field
+ * @param string $text Text of label or key to translate
+ * @param string $htmlname Name of select field ('edit' prefix will be added)
+ * @param string $preselected Value to show/edit (not used in this function)
+ * @param object $object Object (on the page we show)
+ * @param boolean $perm Permission to allow button to edit parameter. Set it to 0 to have a not edited field.
+ * @param string $typeofdata Type of data ('string' by default, 'email', 'amount:99', 'numeric:99', 'text' or 'textarea:rows:cols', 'datepicker' ('day' do not work, don't know why), 'dayhour' or 'datehourpicker' 'checkbox:ckeditor:dolibarr_zzz:width:height:savemethod:1:rows:cols', 'select;xxx[:class]'...)
+ * @param string $moreparam More param to add on a href URL.
+ * @param int $fieldrequired 1 if we want to show field as mandatory using the "fieldrequired" CSS.
+ * @param int $notabletag 1=Do not output table tags but output a ':', 2=Do not output table tags and no ':', 3=Do not output table tags but output a ' '
+ * @param string $paramid Key of parameter for id ('id', 'socid')
+ * @param string $help Tooltip help
+ * @return string HTML edit field
*/
public function editfieldkey($text, $htmlname, $preselected, $object, $perm, $typeofdata = 'string', $moreparam = '', $fieldrequired = 0, $notabletag = 0, $paramid = 'id', $help = '')
{
@@ -114,7 +114,7 @@ class Form
if (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && !preg_match('/^select;/', $typeofdata)) {
if (!empty($perm)) {
$tmp = explode(':', $typeofdata);
- $ret .= '';
+ $ret .= '
';
if ($fieldrequired) {
$ret .= '';
}
@@ -126,7 +126,7 @@ class Form
if ($fieldrequired) {
$ret .= '';
}
- $ret .= '
'."\n";
+ $ret .= '
';
}
- if ($htmlname && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) {
- $ret .= 'id.$moreparam.'">'.img_edit($langs->trans('Edit'), ($notabletag ? 0 : 1)).'';
+ if ($htmlname && GETPOST('action', 'aZ09') != 'edit' . $htmlname && $perm) {
+ $ret .= '' . img_edit($langs->trans('Edit'), ($notabletag ? 0 : 1)) . '';
}
if (!empty($notabletag) && $notabletag == 1) {
if ($text) {
@@ -191,23 +191,23 @@ class Form
/**
* Output value of a field for an editable field
*
- * @param string $text Text of label (not used in this function)
- * @param string $htmlname Name of select field
- * @param string $value Value to show/edit
- * @param object $object Object (that we want to show)
- * @param boolean $perm Permission to allow button to edit parameter
- * @param string $typeofdata Type of data ('string' by default, 'email', 'amount:99', 'numeric:99', 'text' or 'textarea:rows:cols%', 'datepicker' ('day' do not work, don't know why), 'dayhour' or 'datehourpicker', 'ckeditor:dolibarr_zzz:width:height:savemethod:toolbarstartexpanded:rows:cols', 'select;xkey:xval,ykey:yval,...')
- * @param string $editvalue When in edit mode, use this value as $value instead of value (for example, you can provide here a formated price instead of numeric value). Use '' to use same than $value
- * @param object $extObject External object ???
- * @param mixed $custommsg String or Array of custom messages : eg array('success' => 'MyMessage', 'error' => 'MyMessage')
- * @param string $moreparam More param to add on the form on action href URL parameter
- * @param int $notabletag Do no output table tags
- * @param string $formatfunc Call a specific function to output field in view mode (For example: 'dol_print_email')
- * @param string $paramid Key of parameter for id ('id', 'socid')
- * @param string $gm 'auto' or 'tzuser' or 'tzuserrel' or 'tzserver' (when $typeofdata is a date)
- * @param array $moreoptions Array with more options. For example array('addnowlink'=>1), array('valuealreadyhtmlescaped'=>1)
- * @param string $editaction [=''] use GETPOST default action or set action to edit mode
- * @return string HTML edit field
+ * @param string $text Text of label (not used in this function)
+ * @param string $htmlname Name of select field
+ * @param string $value Value to show/edit
+ * @param object $object Object (that we want to show)
+ * @param boolean $perm Permission to allow button to edit parameter
+ * @param string $typeofdata Type of data ('string' by default, 'email', 'amount:99', 'numeric:99', 'text' or 'textarea:rows:cols%', 'datepicker' ('day' do not work, don't know why), 'dayhour' or 'datehourpicker', 'ckeditor:dolibarr_zzz:width:height:savemethod:toolbarstartexpanded:rows:cols', 'select;xkey:xval,ykey:yval,...')
+ * @param string $editvalue When in edit mode, use this value as $value instead of value (for example, you can provide here a formated price instead of numeric value). Use '' to use same than $value
+ * @param object $extObject External object ???
+ * @param mixed $custommsg String or Array of custom messages : eg array('success' => 'MyMessage', 'error' => 'MyMessage')
+ * @param string $moreparam More param to add on the form on action href URL parameter
+ * @param int $notabletag Do no output table tags
+ * @param string $formatfunc Call a specific function to output field in view mode (For example: 'dol_print_email')
+ * @param string $paramid Key of parameter for id ('id', 'socid')
+ * @param string $gm 'auto' or 'tzuser' or 'tzuserrel' or 'tzserver' (when $typeofdata is a date)
+ * @param array $moreoptions Array with more options. For example array('addnowlink'=>1), array('valuealreadyhtmlescaped'=>1)
+ * @param string $editaction [=''] use GETPOST default action or set action to edit mode
+ * @return string HTML edit field
*/
public function editfieldval($text, $htmlname, $value, $object, $perm, $typeofdata = 'string', $editvalue = '', $extObject = null, $custommsg = null, $moreparam = '', $notabletag = 1, $formatfunc = '', $paramid = 'id', $gm = 'auto', $moreoptions = array(), $editaction = '')
{
@@ -230,7 +230,7 @@ class Form
} elseif ($reg[1] == 'int') {
$typeofdata = 'numeric';
} else {
- return 'ErrorBadParameter '.$typeofdata;
+ return 'ErrorBadParameter ' . $typeofdata;
}
}
@@ -241,13 +241,13 @@ class Form
if ($editaction == '') {
$editaction = GETPOST('action', 'aZ09');
}
- $editmode = ($editaction == 'edit'.$htmlname);
+ $editmode = ($editaction == 'edit' . $htmlname);
if ($editmode) {
$ret .= "\n";
- $ret .= ' |