瀏覽代碼

Update images
Fix value of delay for warning on project not closed

Laurent Destailleur 5 年之前
父節點
當前提交
e2451bcd26

二進制
doc/images/dolibarr_screenshot2_1280x800.jpg


二進制
doc/images/dolibarr_screenshot2_1280x800.png


二進制
doc/images/dolibarr_screenshot4_1280x800.png


二進制
doc/images/dolibarr_screenshot4_1680x1050.png


二進制
doc/images/dolibarr_screenshot4_1920x1080.jpg


二進制
doc/images/dolibarr_screenshot5_1280x800.jpg


二進制
doc/images/dolibarr_screenshot5_1920x1080.jpg


+ 30 - 3
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 '<span class="opacitymedium">'.$langs->transnoentities("DelaysOfToleranceD
 print " ".$langs->trans("OnlyActiveElementsAreShown", DOL_URL_ROOT.'/admin/modules.php')."</span><br>\n";
 print "<br>\n";
 
-$countrynotdefined = '<font class="error">'.$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')</font>';
-
 if ($action == 'edit')
 {
     print '<form method="post" action="'.$_SERVER['PHP_SELF'].'" name="form_index">';
@@ -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 '<tr class="oddeven">';
     			print '<td width="20px">'.img_object('', $delay['img']).'</td>';
     			print '<td>'.$langs->trans('Delays_'.$delay['code']).'</td>';

二進制
htdocs/install/medias/background_dolibarr.jpg


+ 1 - 0
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=<a href="%s">%s -> %s</a><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).

+ 1 - 1
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();

+ 1 - 1
htdocs/projet/list.php

@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2019 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Marc Bariley / Ocebo <marc@ocebo.com>
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2013      Cédric Salvador      <csalvador@gpcsolutions.fr>