diff --git a/doc/images/dolibarr_screenshot2_1280x800.jpg b/doc/images/dolibarr_screenshot2_1280x800.jpg new file mode 100644 index 00000000000..1f3231f82a4 Binary files /dev/null and b/doc/images/dolibarr_screenshot2_1280x800.jpg differ diff --git a/doc/images/dolibarr_screenshot2_1280x800.png b/doc/images/dolibarr_screenshot2_1280x800.png deleted file mode 100644 index c5e30130c3e..00000000000 Binary files a/doc/images/dolibarr_screenshot2_1280x800.png and /dev/null differ diff --git a/doc/images/dolibarr_screenshot4_1280x800.png b/doc/images/dolibarr_screenshot4_1280x800.png deleted file mode 100644 index c00c3ea92e0..00000000000 Binary files a/doc/images/dolibarr_screenshot4_1280x800.png and /dev/null differ diff --git a/doc/images/dolibarr_screenshot4_1680x1050.png b/doc/images/dolibarr_screenshot4_1680x1050.png deleted file mode 100644 index afb2828b08a..00000000000 Binary files a/doc/images/dolibarr_screenshot4_1680x1050.png and /dev/null differ diff --git a/doc/images/dolibarr_screenshot4_1920x1080.jpg b/doc/images/dolibarr_screenshot4_1920x1080.jpg new file mode 100644 index 00000000000..d41dd87d027 Binary files /dev/null and b/doc/images/dolibarr_screenshot4_1920x1080.jpg differ diff --git a/doc/images/dolibarr_screenshot5_1280x800.jpg b/doc/images/dolibarr_screenshot5_1280x800.jpg index c732bc43709..de0d8151e03 100644 Binary files a/doc/images/dolibarr_screenshot5_1280x800.jpg and b/doc/images/dolibarr_screenshot5_1280x800.jpg differ diff --git a/doc/images/dolibarr_screenshot5_1920x1080.jpg b/doc/images/dolibarr_screenshot5_1920x1080.jpg index 0b5c749cb5c..8f14c3497c8 100644 Binary files a/doc/images/dolibarr_screenshot5_1920x1080.jpg and b/doc/images/dolibarr_screenshot5_1920x1080.jpg differ diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php index 9897b3c8a88..ac893c1d658 100644 --- a/htdocs/admin/delais.php +++ b/htdocs/admin/delais.php @@ -130,6 +130,35 @@ $modules = array( $labelmeteo = array(0=>$langs->trans("No"), 1=>$langs->trans("Yes"), 2=>$langs->trans("OnMobileOnly")); +if (! isset($conf->global->MAIN_DELAY_PROJECT_TO_CLOSE)) { + $conf->global->MAIN_DELAY_PROJECT_TO_CLOSE = 7; // Must be same value than into conf.class.php +} +if (! isset($conf->global->MAIN_DELAY_TASKS_TODO)) { + $conf->global->MAIN_DELAY_TASKS_TODO = 7; // Must be same value than into conf.class.php +} +if (! isset($conf->global->MAIN_DELAY_MEMBERS)) { + $conf->global->MAIN_DELAY_MEMBERS = 0; // Must be same value than into conf.class.php +} +if (! isset($conf->global->MAIN_DELAY_ACTIONS_TODO)) { + $conf->global->MAIN_DELAY_ACTIONS_TODO = 7; // Must be same value than into conf.class.php +} +if (! isset($conf->global->MAIN_DELAY_ORDERS_TO_PROCESS)) { + $conf->global->MAIN_DELAY_ORDERS_TO_PROCESS = 2; +} +if (! isset($conf->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS)) { + $conf->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS = 7; +} +if (! isset($conf->global->MAIN_DELAY_ORDERS_TO_PROCESS)) { + $conf->global->MAIN_DELAY_ORDERS_TO_PROCESS = 2; +} +if (! isset($conf->global->MAIN_DELAY_ORDERS_TO_PROCESS)) { + $conf->global->MAIN_DELAY_ORDERS_TO_PROCESS = 2; +} +if (! isset($conf->global->MAIN_DELAY_ORDERS_TO_PROCESS)) { + $conf->global->MAIN_DELAY_ORDERS_TO_PROCESS = 2; +} + + /* * Actions @@ -178,8 +207,6 @@ print ''.$langs->transnoentities("DelaysOfToleranceD print " ".$langs->trans("OnlyActiveElementsAreShown", DOL_URL_ROOT.'/admin/modules.php')."
\n"; print "
\n"; -$countrynotdefined = ''.$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')'; - if ($action == 'edit') { print '
'; @@ -234,7 +261,7 @@ else { foreach ($delays as $delay) { - $value = (!empty($conf->global->{$delay['code']}) ? $conf->global->{$delay['code']}:0); + $value = (!empty($conf->global->{$delay['code']}) ? $conf->global->{$delay['code']}:0); print ''; print ''.img_object('', $delay['img']).''; print ''.$langs->trans('Delays_'.$delay['code']).''; diff --git a/htdocs/install/medias/background_dolibarr.jpg b/htdocs/install/medias/background_dolibarr.jpg index 31177b1b5c2..b57e1a84814 100644 Binary files a/htdocs/install/medias/background_dolibarr.jpg and b/htdocs/install/medias/background_dolibarr.jpg differ diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 9a165f6c171..e4e7768128e 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1102,6 +1102,7 @@ Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Pending bank reconciliation Delays_MAIN_DELAY_MEMBERS=Delayed membership fee Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Check deposit not done Delays_MAIN_DELAY_EXPENSEREPORTS=Expense report to approve +Delays_MAIN_DELAY_HOLIDAYS=Leave requests to approve SetupDescription1=Before starting to use Dolibarr some initial parameters must be defined and modules enabled/configured. SetupDescription2=The following two sections are mandatory (the two first entries in the Setup menu): SetupDescription3=%s -> %s
Basic parameters used to customize the default behavior of your application (e.g for country-related features). diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index 9fc172207a3..54d13a51549 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -1938,7 +1938,7 @@ class Project extends CommonObject { global $conf; - if (!($this->statut == 1)) return false; + if (!($this->statut == self::STATUS_VALIDATED)) return false; if (!$this->datee && !$this->date_end) return false; $now = dol_now(); diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php index 0832dd41901..ef09ade1b91 100644 --- a/htdocs/projet/list.php +++ b/htdocs/projet/list.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2016 Laurent Destailleur + * Copyright (C) 2004-2019 Laurent Destailleur * Copyright (C) 2005 Marc Bariley / Ocebo * Copyright (C) 2005-2010 Regis Houssin * Copyright (C) 2013 Cédric Salvador