Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.5' into 3.6

Browse Source 
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/langs/en_US/errors.lang
	htdocs/product/class/product.class.php
This commit is contained in:
Laurent Destailleur
2014-09-18 10:08:56 +02:00
parent 039105a3f1 015b0d8036
commit b16b1c2ce0
6 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/.gitignore vendored
View File

@@ -2,6 +2,7 @@
/custom* /custom*
/extensions* /extensions*
/nltechno* /nltechno*
/teclib*
/bootstrap* /bootstrap*
/google* /google*
/multicompany* /multicompany*

2
htdocs/core/lib/functions2.lib.php
View File

@@ -1325,7 +1325,7 @@ function getListOfModels($db,$type,$maxfilenamelength=0)
if (! $tmpdir) { unset($listofdir[$key]); continue; } if (! $tmpdir) { unset($listofdir[$key]); continue; }
if (is_dir($tmpdir)) if (is_dir($tmpdir))
{ {
$tmpfiles=dol_dir_list($tmpdir,'files',0,'\.od(s|t)$'); $tmpfiles=dol_dir_list($tmpdir,'files',0,'\.od(s|t)$','','name',SORT_ASC,0);
if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles); if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
} }
} }

3
htdocs/langs/en_US/errors.lang
View File

@@ -153,4 +153,5 @@ WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all page
WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card). WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card).
WarningNotRelevant=Irrelevant operation for this dataset WarningNotRelevant=Irrelevant operation for this dataset
WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters

3
htdocs/product/class/product.class.php
View File

@@ -1407,7 +1407,7 @@ class Product extends CommonObject
return -1; return -1;
} }
$sql = "SELECT rowid, ref, label, description, url, note, customcode, fk_country, price, price_ttc,"; $sql = "SELECT rowid, ref, ref_ext, label, description, url, note, customcode, fk_country, price, price_ttc,";
$sql.= " price_min, price_min_ttc, price_base_type, tva_tx, recuperableonly as tva_npr, localtax1_tx, localtax2_tx, tosell,"; $sql.= " price_min, price_min_ttc, price_base_type, tva_tx, recuperableonly as tva_npr, localtax1_tx, localtax2_tx, tosell,";
$sql.= " tobuy, fk_product_type, duration, seuil_stock_alerte, canvas,"; $sql.= " tobuy, fk_product_type, duration, seuil_stock_alerte, canvas,";
$sql.= " weight, weight_units, length, length_units, surface, surface_units, volume, volume_units, barcode, fk_barcode_type, finished,"; $sql.= " weight, weight_units, length, length_units, surface, surface_units, volume, volume_units, barcode, fk_barcode_type, finished,";
@@ -1432,6 +1432,7 @@ class Product extends CommonObject
$this->id = $obj->rowid; $this->id = $obj->rowid;
$this->ref = $obj->ref; $this->ref = $obj->ref;
$this->ref_ext = $obj->ref_ext;
$this->libelle = $obj->label; // TODO deprecated $this->libelle = $obj->label; // TODO deprecated
$this->label = $obj->label; $this->label = $obj->label;
$this->description = $obj->description; $this->description = $obj->description;

5
htdocs/projet/index.php
View File

@@ -164,9 +164,10 @@ if ( $resql )
if ($num > (empty($conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA)?1000:$conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA)) if ($num > (empty($conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA)?1000:$conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA))
{ {
/* print '<tr '.$bc[0].'>'; /* $langs->load("errors");
print '<tr '.$bc[0].'>';
print '<td colspan="9">'; print '<td colspan="9">';
print $langs->trans("TooManyDataPleaseUseMoreFilters"); print $langs->trans("WarningTooManyDataPleaseUseMoreFilters");
print '</td></tr>';*/ print '</td></tr>';*/
} }
else else

3
htdocs/projet/tasks/index.php
View File

@@ -128,9 +128,10 @@ print "</tr>\n";
if (count($tasksarray) > (empty($conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA)?1000:$conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA)) if (count($tasksarray) > (empty($conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA)?1000:$conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA))
{ {
$langs->load("errors");
print '<tr '.$bc[0].'>'; print '<tr '.$bc[0].'>';
print '<td colspan="9">'; print '<td colspan="9">';
print $langs->trans("TooManyDataPleaseUseMoreFilters"); print $langs->trans("WarningTooManyDataPleaseUseMoreFilters");
print '</td></tr>'; print '</td></tr>';
} }
else else