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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2012-02-19 18:35:52 +01:00
commit 0a4ffe6e69
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/compta/facture.php
View File

@ -141,8 +141,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->facture->
{ {
if ($user->rights->facture->supprimer) if ($user->rights->facture->supprimer)
{ {
$result = $object->fetch($id); $result = $object->delete($id);
$result = $object->delete();
if ($result > 0) if ($result > 0)
{ {
Header('Location: '.$_SERVER["PHP_SELF"]); Header('Location: '.$_SERVER["PHP_SELF"]);

4
htdocs/main.inc.php
View File

@ -609,7 +609,7 @@ if (! defined('NOLOGIN'))
} }
/* /*
* Overwrite configs global by peronal configs * Overwrite configs global by personal configs
*/ */
// Set liste_limit // Set liste_limit
if (isset($user->conf->MAIN_SIZE_LISTE_LIMIT)) // Can be 0 if (isset($user->conf->MAIN_SIZE_LISTE_LIMIT)) // Can be 0
@ -627,7 +627,7 @@ if (! defined('NOLOGIN'))
$conf->css = "/theme/".$conf->theme."/style.css.php"; $conf->css = "/theme/".$conf->theme."/style.css.php";
} }
// If theme support optim like flip-hide left menu and we use a smartphone, we force it // If theme support option like flip-hide left menu and we use a smartphone, we force it
if (! empty($conf->global->MAIN_SMARTPHONE_OPTIM) && $conf->browser->phone && $conf->theme == 'eldy') $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT='forced'; if (! empty($conf->global->MAIN_SMARTPHONE_OPTIM) && $conf->browser->phone && $conf->theme == 'eldy') $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT='forced';
// Set javascript option // Set javascript option