Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-03 23:52:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'upstream/develop'

Browse Source
This commit is contained in:
aspangaro
2014-05-28 05:35:35 +02:00
parent dce9c2bc76 baa573435b
commit b384f91096
169 changed files with 638 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/barcode.php
View File

@@ -64,7 +64,7 @@ else if ($action == 'update')
{
if (GETPOST('submit_GENBARCODE_LOCATION'))
{
$location = GETPOST('genbarcodelocation','alpha');
$location = GETPOST('GENBARCODE_LOCATION','alpha');
$res = dolibarr_set_const($db, "GENBARCODE_LOCATION",$location,'chaine',0,'',$conf->entity);
}
if (GETPOST('submit_PRODUIT_DEFAULT_BARCODE_TYPE'))

1
htdocs/admin/boxes.php
View File

@@ -468,4 +468,3 @@ print '</table>';
llxFooter();
$db->close();
?>

1
htdocs/admin/compta.php
View File

@@ -170,4 +170,3 @@ print '<br /><br /><div style="text-align:center"><input type="submit" class="bu
$db->close();
llxFooter();
?>

1
htdocs/admin/fichinter.php
View File

@@ -511,4 +511,3 @@ print '<br>';
$db->close();
llxFooter();
?>

1
htdocs/admin/index.php
View File

@@ -116,4 +116,3 @@ if (empty($reshook))
llxFooter();
$db->close();
?>

1
htdocs/admin/mailing.php
View File

@@ -143,4 +143,3 @@ print '</form>';
llxFooter();
$db->close();
?>

1
htdocs/admin/mails.php
View File

@@ -703,4 +703,3 @@ else
llxFooter();
$db->close();
?>

1
htdocs/admin/modules.php
View File

@@ -540,4 +540,3 @@ if ($mode != 'marketplace') print '<div class="info">'.showModulesExludedForExte
llxFooter();
$db->close();
?>

1
htdocs/admin/orderdet_extrafields.php
View File

@@ -157,4 +157,3 @@ if ($action == 'edit' && ! empty($attrname))
llxFooter();
$db->close();
?>

1
htdocs/admin/osc-languages.php
View File

@@ -88,4 +88,3 @@ print "</TABLE>";
$db->close();
llxFooter();
?>

1
htdocs/admin/supplierorder_extrafields.php
View File

@@ -156,4 +156,3 @@ if ($action == 'edit' && ! empty($attrname))
llxFooter();
$db->close();
?>

1
htdocs/admin/syslog.php
View File

@@ -253,4 +253,3 @@ print "</form>\n";
llxFooter();
$db->close();
?>

23
htdocs/admin/system/about.php
View File

@@ -113,28 +113,23 @@ print '<li><a href="http://plus.google.com/+DolibarrOrg" target="_blank">Google
print '</ul>';
print $langs->trans("OfficialWebHostingService").':';
$url='http://wiki.dolibarr.org/index.php/Cloud_Solutions'; $title=$langs->trans('List');
print $langs->trans("OtherResources").':';
print '<ul>';
$url='http://saas.dolibarr.org'; $title=$langs->trans("OfficialWebHostingService");
if (preg_match('/^fr_/i',$langs->getDefaultLang())) $url='http://wiki.dolibarr.org/index.php/Solutions_de_Cloud';
if (preg_match('/^es_/i',$langs->getDefaultLang())) $url='http://wiki.dolibarr.org/index.php/Soluciones_en_la_Nube';
print '<ul>';
print '<li>';
print '<a target="_blank" href="'.$url.'">'.$title.'</a>';
print '</li>';
$url='http://partners.dolibarr.org'; $title=$langs->trans("ReferencedPreferredPartners");
print '<li>';
print '<a target="_blank" href="'.$url.'">'.$title.'</a>';
print '</li>';
print '</ul>';
llxFooter();
$db->close();
?>

1
htdocs/admin/system/os.php
View File

@@ -51,4 +51,3 @@ print '</table>';
llxFooter();
?>

1
htdocs/admin/system/phpinfo.php
View File

@@ -120,4 +120,3 @@ foreach($phparray as $key => $value)
llxFooter();
$db->close();
?>

1
htdocs/admin/system/web.php
View File

@@ -64,4 +64,3 @@ print '</table>';
llxFooter();
$db->close();
?>

1
htdocs/admin/tools/listsessions.php
View File

@@ -214,4 +214,3 @@ print '<br>';
llxFooter();
$db->close();
?>