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

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

Browse Source
This commit is contained in:
fhenry
2013-04-24 17:53:59 +02:00
parent d9551abb70 74e7dc319d
commit 5789a5d6e9
11 changed files with 78 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build/rpm/README
View File

@@ -26,8 +26,9 @@ with format RPM (for Redhat, OpenSuse, Mandriva, ...).
# restorecon -R -v /file Restore values into files (cancel chcon, validate semanage)
#
# On OpenSuse
# yast --install dolibarr-...rpm To install package and dependencies
# yast --remove dolibarr To remove package
# zypper install dolibarr-...rpm To install package and dependencies
# zypper remove dolibarr To remove package
# zypper search xxx To search a package
#
# On Mageia (after su - root)
# urpmi dolibarr-...rpm To install package and dependencies

2
build/rpm/install.forced.php.generic
View File

@@ -18,4 +18,6 @@ $force_install_dolibarrlogin='admin';
$force_install_nophpinfo='1';
$force_install_lockinstall='444';
// Value to overwrite path to use shared libraries/fonts instead of embedded one
// We don't force any external lib with generic package
?>

4
build/rpm/install.forced.php.opensuse
View File

@@ -19,10 +19,10 @@ $force_install_nophpinfo='1';
$force_install_lockinstall='444';
// Value to overwrite path to use shared libraries/fonts instead of embedded one
$force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
//$force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
//$force_dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi';
//$force_dolibarr_lib_GEOIP_PATH='';
$force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';
//$force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';
//$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip';
$force_dolibarr_lib_PHPEXCEL_PATH='';
$force_dolibarr_lib_TCPDF_PATH='';

6
htdocs/core/class/html.form.class.php
View File

@@ -3775,14 +3775,16 @@ class Form
*/
function showrefnav($object,$paramid,$morehtml='',$shownav=1,$fieldid='rowid',$fieldref='ref',$morehtmlref='',$moreparam='')
{
global $langs,$conf;
$ret='';
if (empty($fieldid)) $fieldid='rowid';
if (empty($fieldref)) $fieldref='ref';
//print "paramid=$paramid,morehtml=$morehtml,shownav=$shownav,$fieldid,$fieldref,$morehtmlref,$moreparam";
$object->load_previous_next_ref((isset($object->next_prev_filter)?$object->next_prev_filter:''),$fieldid);
$previous_ref = $object->ref_previous?'<a href="'.$_SERVER["PHP_SELF"].'?'.$paramid.'='.urlencode($object->ref_previous).$moreparam.'">'.img_previous().'</a>':'';
$next_ref = $object->ref_next?'<a href="'.$_SERVER["PHP_SELF"].'?'.$paramid.'='.urlencode($object->ref_next).$moreparam.'">'.img_next().'</a>':'';
$previous_ref = $object->ref_previous?'<a data-role="button" data-icon="arrow-l" data-iconpos="left" href="'.$_SERVER["PHP_SELF"].'?'.$paramid.'='.urlencode($object->ref_previous).$moreparam.'">'.(empty($conf->dol_use_jmobile)?img_picto($langs->trans("Previous"),'previous.png'):'&nbsp;').'</a>':'';
$next_ref = $object->ref_next?'<a data-role="button" data-icon="arrow-r" data-iconpos="right" href="'.$_SERVER["PHP_SELF"].'?'.$paramid.'='.urlencode($object->ref_next).$moreparam.'">'.(empty($conf->dol_use_jmobile)?img_picto($langs->trans("Next"),'next.png'):'&nbsp;').'</a>':'';
//print "xx".$previous_ref."x".$next_ref;
if ($previous_ref || $next_ref || $morehtml) {

3
htdocs/install/etape1.php
View File

@@ -196,7 +196,8 @@ if (! $error)
elseif ($db->error && ! (! empty($_POST["db_create_database"]) && $db->connected))
{
// Note: you may experience error here with message "No such file or directory" when mysql was installed for the first time but not yet launched.
print '<div class="error">'.$db->error.'</div>';
if ($db->error == "No such file or directory") print '<div class="error">'.$langs->trans("ErrorToConnectToMysqlCheckInstance").'</div>';
else print '<div class="error">'.$db->error.'</div>';
if (! $db->connected) print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
//print '<a href="#" onClick="javascript: history.back();">';
print $langs->trans("ErrorGoBackAndCorrectParameters");

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

@@ -121,6 +121,7 @@ ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP
ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base
ErrorNewValueCantMatchOldValue=New value can't be equal to old one
ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check Mysql server is running (in most cases, you can launch it from command line with 'sudo /etc/init.d/mysql start').
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined

1
htdocs/langs/fr_FR/errors.lang
View File

@@ -122,6 +122,7 @@ ErrorFailedToAddToMailmanList=Echec de l'ajout de %s à la liste Mailman %s ou b
ErrorFailedToRemoveToMailmanList=Echec de la suppression de %s de la liste Mailman %s ou base SPIP
ErrorNewValueCantMatchOldValue=La nouvelle valeur ne peut être égale à l'ancienne
ErrorFailedToValidatePasswordReset=Echec de la réinitialisation du mot de passe. Il est possible que ce lien ait déjà été utilisé (l'utilisation de ce lien ne fonctionne qu'une fois). Si ce n'est pas le cas, essayer de recommencer le processus de réinit de mot de passe depuis le début.
ErrorToConnectToMysqlCheckInstance=Echec de la connection au serveur de base de donnée. Vérifier que Mysql est bien lancé (dans la plupart des cas, vous pouvez le lancer depuis la ligne de commande par la commande 'sudo /etc/init.d/mysql start').
# Warnings
WarningMandatorySetupNotComplete=Les informations de configuration obligatoire doivent être renseignées

6
htdocs/theme/amarok/style.css.php
View File

@@ -2071,6 +2071,12 @@ div.tabsElem a.ui-btn-corner-all {
border-bottom-right-radius: 0px;
}
.ui-btn-icon-left .ui-icon {
left: 8px;
}
.ui-btn-icon-right .ui-icon {
right: 8px;
}
<?php
if (is_object($db)) $db->close();

15
htdocs/theme/auguria/style.css.php
View File

@@ -2212,6 +2212,21 @@ div.ecmjqft {
text-shadow: none;
}
div.tabsElem a.ui-btn-corner-all {
-webkit-border-bottom-left-radius: 0px;
-moz-border-radius-bottomleft: 0px;
border-bottom-left-radius: 0px;
-webkit-border-bottom-right-radius: 0px;
-moz-border-radius-bottomright: 0px;
border-bottom-right-radius: 0px;
}
.ui-btn-icon-left .ui-icon {
left: 8px;
}
.ui-btn-icon-right .ui-icon {
right: 8px;
}
<?php
if (is_object($db)) $db->close();

16
htdocs/theme/bureau2crea/style.css.php
View File

@@ -2430,9 +2430,15 @@ div.ecmjqft {
white-space: normal;
}
div.ui-controlgroup
{
height: auto;
background-image: none;
}
div.ui-controlgroup-controls div.tabsElem, div.ui-controlgroup-controls div.tabsElem a.tab
{
height: 22px;
height: auto;
}
a.tab span.ui-btn-inner
@@ -2443,7 +2449,7 @@ a.tab span.ui-btn-inner
div.tabs a.tab#active span.ui-btn-inner, div.tabs a.tab#active span.ui-btn-text, div.tabs a.tab span.ui-btn-inner, div.tabs a.tab span.ui-btn-text {
background-image: none;
color: #D45416;
height: 22px
height: auto;
}
.ui-body-c {
@@ -2451,6 +2457,12 @@ div.tabs a.tab#active span.ui-btn-inner, div.tabs a.tab#active span.ui-btn-text,
text-shadow: none;
}
.ui-btn-icon-left .ui-icon {
left: 8px;
}
.ui-btn-icon-right .ui-icon {
right: 8px;
}
<?php
if (is_object($db)) $db->close();

28
htdocs/theme/cameleo/style.css.php
View File

@@ -2257,6 +2257,34 @@ div.ecmjqft {
text-shadow: none;
}
div.ui-controlgroup
{
height: auto;
background-image: none;
}
div.ui-controlgroup-controls div.tabsElem, div.ui-controlgroup-controls div.tabsElem a.tab
{
height: auto;
}
a.tab span.ui-btn-inner
{
border: none;
padding: 0;
}
div.tabs a.tab#active span.ui-btn-inner, div.tabs a.tab#active span.ui-btn-text, div.tabs a.tab span.ui-btn-inner, div.tabs a.tab span.ui-btn-text {
background-image: none;
color: #D45416;
height: auto;
}
.ui-btn-icon-left .ui-icon {
left: 8px;
}
.ui-btn-icon-right .ui-icon {
right: 8px;
}
<?php
if (is_object($db)) $db->close();