lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2012-10-27 20:04:03 +02:00
commit 6c0fb9a1f1
3 changed files with 671 additions and 658 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/core/ajax/saveinplace.php
View File

@ -54,6 +54,7 @@ if (! empty($field) && ! empty($element) && ! empty($table_element) && ! empty($
$loadmethod = GETPOST('loadmethod','alpha',2); $loadmethod = GETPOST('loadmethod','alpha',2);
$savemethod = GETPOST('savemethod','alpha',2); $savemethod = GETPOST('savemethod','alpha',2);
$savemethodname = (! empty($savemethod) ? $savemethod : 'setValueFrom'); $savemethodname = (! empty($savemethod) ? $savemethod : 'setValueFrom');
$newelement = $element;
$view=''; $view='';
$format='text'; $format='text';

1326
htdocs/core/modules/import/import_csv.modules.php
View File

File diff suppressed because it is too large Load Diff

2
htdocs/societe/class/societe.class.php
View File

@ -1757,7 +1757,7 @@ class Societe extends CommonObject
$dirsociete=array_merge(array('/core/modules/societe/'),$conf->societe_modules); $dirsociete=array_merge(array('/core/modules/societe/'),$conf->societe_modules);
foreach ($dirsociete as $dirroot) foreach ($dirsociete as $dirroot)
{ {
$res=dol_include_once($dirroot.$conf->global->SOCIETE_FOURNISSEUR_ADDON.'.php'); $res=dol_include_once($dirroot.$conf->global->SOCIETE_CODEFOURNISSEUR_ADDON.'.php');
if ($res) break; if ($res) break;
} }
$var = $conf->global->SOCIETE_CODEFOURNISSEUR_ADDON; $var = $conf->global->SOCIETE_CODEFOURNISSEUR_ADDON;