forked from Wavyzz/dolibarr
Fix: carriage return
This commit is contained in:
@@ -57,7 +57,7 @@ header('Access-Control-Allow-Methods: OPTIONS, HEAD, GET, POST, PUT, DELETE');
|
||||
header('Access-Control-Allow-Headers: X-File-Name, X-File-Type, X-File-Size');
|
||||
|
||||
switch ($_SERVER['REQUEST_METHOD']) {
|
||||
case 'OPTIONS':
|
||||
case 'OPTIONS':
|
||||
break;
|
||||
case 'HEAD':
|
||||
case 'GET':
|
||||
|
||||
@@ -90,7 +90,7 @@ if (! empty($field) && ! empty($element) && ! empty($table_element) && ! empty($
|
||||
$module = $subelement = $ext_element;
|
||||
if (preg_match('/^([^_]+)_([^_]+)/i',$ext_element,$regs))
|
||||
{
|
||||
$module = $regs[1];
|
||||
$module = $regs[1];
|
||||
$subelement = $regs[2];
|
||||
}
|
||||
|
||||
|
||||
@@ -30,9 +30,9 @@ if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1');
|
||||
require('../../main.inc.php');
|
||||
require_once(DOL_DOCUMENT_ROOT."/core/class/genericobject.class.php");
|
||||
|
||||
$field = GETPOST('field','alpha',2);
|
||||
$element = GETPOST('element','alpha',2);
|
||||
$table_element = GETPOST('table_element','alpha',2);
|
||||
$field = GETPOST('field','alpha',2);
|
||||
$element = GETPOST('element','alpha',2);
|
||||
$table_element = GETPOST('table_element','alpha',2);
|
||||
$fk_element = GETPOST('fk_element','alpha',2);
|
||||
|
||||
/*
|
||||
@@ -132,11 +132,11 @@ if (! empty($field) && ! empty($element) && ! empty($table_element) && ! empty($
|
||||
}
|
||||
else
|
||||
{
|
||||
$module = $subelement = $ext_element;
|
||||
if (preg_match('/^([^_]+)_([^_]+)/i',$ext_element,$regs))
|
||||
{
|
||||
$module = $regs[1];
|
||||
$subelement = $regs[2];
|
||||
$module = $subelement = $ext_element;
|
||||
if (preg_match('/^([^_]+)_([^_]+)/i',$ext_element,$regs))
|
||||
{
|
||||
$module = $regs[1];
|
||||
$subelement = $regs[2];
|
||||
}
|
||||
|
||||
dol_include_once('/'.$module.'/class/actions_'.$subelement.'.class.php');
|
||||
|
||||
@@ -49,12 +49,12 @@ if (! empty($id) && ! empty($action) && ! empty($htmlname))
|
||||
|
||||
$soc->fetch($id);
|
||||
|
||||
$return=array();
|
||||
|
||||
$return['value'] = $form->load_tva('tva_tx','',$soc,$mysoc,0,0,'',true);
|
||||
$return['num'] = $form->num;
|
||||
$return['error'] = $form->error;
|
||||
|
||||
$return=array();
|
||||
|
||||
$return['value'] = $form->load_tva('tva_tx','',$soc,$mysoc,0,0,'',true);
|
||||
$return['num'] = $form->num;
|
||||
$return['error'] = $form->error;
|
||||
|
||||
echo json_encode($return);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user