diff --git a/ChangeLog b/ChangeLog index 154222d599a..42cf4d14f1e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,7 +28,7 @@ NEW: add property to show warnings when activating modules NEW: add rapport file for supplier paiement NEW: Add statistics on supplier tab. NEW: Add tooltip help on shipment weight and volume calculation -NEW: An external module can hook and add mass actions +NEW: An external module can hook and add mass actions. NEW: Better reponsive design NEW: Bookmarks are into a combo list. NEW: Bulk actions available on supplier orders diff --git a/htdocs/cron/admin/cron.php b/htdocs/cron/admin/cron.php index 62cca5a0f20..3efec52edfa 100644 --- a/htdocs/cron/admin/cron.php +++ b/htdocs/cron/admin/cron.php @@ -74,7 +74,7 @@ $head = cronadmin_prepare_head(); print '
'; print ''; -dol_fiche_head($head,'setup',$langs->trans("Module2300Name"),0,'cron'); +dol_fiche_head($head, 'setup', $langs->trans("Module2300Name"), -1, 'cron'); print "
\n"; @@ -91,16 +91,16 @@ print ''.$langs->trans("KeyForCronAccess").''; $disabled=''; if (! empty($conf->global->CRON_DISABLE_KEY_CHANGE)) $disabled=' disabled="disabled"'; print ''; -if (empty($conf->global->CRON_DISABLE_KEY_CHANGE)) +if (empty($conf->global->CRON_DISABLE_KEY_CHANGE)) { print ''; if (! empty($conf->use_javascript_ajax)) print ' '.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"'); } -else +else { - print (! empty($conf->global->CRON_KEY)?$conf->global->CRON_KEY:''); - print ''; + print (! empty($conf->global->CRON_KEY)?$conf->global->CRON_KEY:''); + print ''; } print ''; print ' '; diff --git a/htdocs/index.php b/htdocs/index.php index f76526d23ea..0f45cd1eb67 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -541,12 +541,11 @@ if ($showweather) $boxwork.=''; } -$boxwork.=''; - // Show dashboard $nbworkboardempty=0; if (! empty($valid_dashboardlines)) { + $boxwork.=''; foreach($valid_dashboardlines as $board) { if (empty($boad->nbtodo)) $nbworkboardempty++; @@ -581,11 +580,12 @@ if (! empty($valid_dashboardlines)) $boxwork .='
'; $boxwork .='
'; $boxwork .='
'; + $boxwork .=''; } else { $boxwork.=''; - $boxwork.=''; + $boxwork.=''; $boxwork.=$langs->trans("NoOpenedElementToProcess"); $boxwork.=''; $boxwork.=''; diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql index 43f4162e9cb..e41e561da38 100644 --- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql +++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql @@ -413,15 +413,19 @@ ALTER TABLE llx_supplier_proposaldet ADD CONSTRAINT fk_supplier_proposaldet_fk_s CREATE TABLE llx_inventory ( rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, +entity integer DEFAULT 0, +ref varchar(48), datec datetime DEFAULT NULL, tms timestamp, +fk_user_author integer, +fk_user_modif integer, +fk_user_valid integer, fk_warehouse integer DEFAULT 0, -entity integer DEFAULT 0, status integer DEFAULT 0, title varchar(255) NOT NULL, -date_inventory datetime DEFAULT NULL -) -ENGINE=InnoDB; +date_inventory datetime DEFAULT NULL, +import_key varchar(14) +)ENGINE=InnoDB; CREATE TABLE llx_inventorydet ( @@ -438,8 +442,9 @@ qty_regulated double DEFAULT NULL, pmp double DEFAULT 0, pa double DEFAULT 0, new_pmp double DEFAULT 0 -) -ENGINE=InnoDB; +)ENGINE=InnoDB; + +ALTER TABLE llx_inventory ADD COLUMN datec datetime DEFAULT NULL; ALTER TABLE llx_inventory ADD INDEX idx_inventory_tms (tms); ALTER TABLE llx_inventory ADD INDEX idx_inventory_datec (datec); diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index d386ed03614..3f21438a5fd 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -545,8 +545,8 @@ Module2000Name=WYSIWYG editor Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor) Module2200Name=Dynamic Prices Module2200Desc=Enable the usage of math expressions for prices -Module2300Name=Cron -Module2300Desc=Scheduled job management +Module2300Name=Scheduled jobs +Module2300Desc=Scheduled jobs management (alias cron or chrono table) Module2400Name=Events/Agenda Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. Module2500Name=Electronic Content Management