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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2017-08-21 00:49:47 +02:00
commit 4f6363bff8
5 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -28,7 +28,7 @@ NEW: add property to show warnings when activating modules
NEW: add rapport file for supplier paiement NEW: add rapport file for supplier paiement
NEW: Add statistics on supplier tab. NEW: Add statistics on supplier tab.
NEW: Add tooltip help on shipment weight and volume calculation 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: Better reponsive design
NEW: Bookmarks are into a combo list. NEW: Bookmarks are into a combo list.
NEW: Bulk actions available on supplier orders NEW: Bulk actions available on supplier orders

10
htdocs/cron/admin/cron.php
View File

@ -74,7 +74,7 @@ $head = cronadmin_prepare_head();
print '<form name="agendasetupform" action="'.$_SERVER["PHP_SELF"].'" method="post">'; print '<form name="agendasetupform" action="'.$_SERVER["PHP_SELF"].'" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
dol_fiche_head($head,'setup',$langs->trans("Module2300Name"),0,'cron'); dol_fiche_head($head, 'setup', $langs->trans("Module2300Name"), -1, 'cron');
print "<br>\n"; print "<br>\n";
@ -91,16 +91,16 @@ print '<td class="fieldrequired">'.$langs->trans("KeyForCronAccess").'</td>';
$disabled=''; $disabled='';
if (! empty($conf->global->CRON_DISABLE_KEY_CHANGE)) $disabled=' disabled="disabled"'; if (! empty($conf->global->CRON_DISABLE_KEY_CHANGE)) $disabled=' disabled="disabled"';
print '<td>'; print '<td>';
if (empty($conf->global->CRON_DISABLE_KEY_CHANGE)) if (empty($conf->global->CRON_DISABLE_KEY_CHANGE))
{ {
print '<input type="text" class="flat minwidth200"'.$disabled.' id="CRON_KEY" name="CRON_KEY" value="'. (GETPOST('CRON_KEY')?GETPOST('CRON_KEY'):(! empty($conf->global->CRON_KEY)?$conf->global->CRON_KEY:'')) . '">'; print '<input type="text" class="flat minwidth200"'.$disabled.' id="CRON_KEY" name="CRON_KEY" value="'. (GETPOST('CRON_KEY')?GETPOST('CRON_KEY'):(! empty($conf->global->CRON_KEY)?$conf->global->CRON_KEY:'')) . '">';
if (! empty($conf->use_javascript_ajax)) if (! empty($conf->use_javascript_ajax))
print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"'); print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"');
} }
else else
{ {
print (! empty($conf->global->CRON_KEY)?$conf->global->CRON_KEY:''); print (! empty($conf->global->CRON_KEY)?$conf->global->CRON_KEY:'');
print '<input type="hidden" id="CRON_KEY" name="CRON_KEY" value="'. (GETPOST('CRON_KEY')?GETPOST('CRON_KEY'):(! empty($conf->global->CRON_KEY)?$conf->global->CRON_KEY:'')) . '">'; print '<input type="hidden" id="CRON_KEY" name="CRON_KEY" value="'. (GETPOST('CRON_KEY')?GETPOST('CRON_KEY'):(! empty($conf->global->CRON_KEY)?$conf->global->CRON_KEY:'')) . '">';
} }
print '</td>'; print '</td>';
print '<td>&nbsp;</td>'; print '<td>&nbsp;</td>';

6
htdocs/index.php
View File

@ -541,12 +541,11 @@ if ($showweather)
$boxwork.='</tr>'; $boxwork.='</tr>';
} }
$boxwork.='<tr class="nohover"><td class="tdboxstats nohover flexcontainer centpercent">';
// Show dashboard // Show dashboard
$nbworkboardempty=0; $nbworkboardempty=0;
if (! empty($valid_dashboardlines)) if (! empty($valid_dashboardlines))
{ {
$boxwork.='<tr class="nohover"><td class="tdboxstats nohover flexcontainer centpercent">';
foreach($valid_dashboardlines as $board) foreach($valid_dashboardlines as $board)
{ {
if (empty($boad->nbtodo)) $nbworkboardempty++; if (empty($boad->nbtodo)) $nbworkboardempty++;
@ -581,11 +580,12 @@ if (! empty($valid_dashboardlines))
$boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>'; $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
$boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>'; $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
$boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>'; $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
$boxwork .='</td></tr>';
} }
else else
{ {
$boxwork.='<tr class="nohover">'; $boxwork.='<tr class="nohover">';
$boxwork.='<td colspan="4" class="nohover valignmiddle opacitymedium">'; $boxwork.='<td class="nohover valignmiddle opacitymedium">';
$boxwork.=$langs->trans("NoOpenedElementToProcess"); $boxwork.=$langs->trans("NoOpenedElementToProcess");
$boxwork.='</td>'; $boxwork.='</td>';
$boxwork.='</tr>'; $boxwork.='</tr>';

17
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
View File

@ -413,15 +413,19 @@ ALTER TABLE llx_supplier_proposaldet ADD CONSTRAINT fk_supplier_proposaldet_fk_s
CREATE TABLE llx_inventory CREATE TABLE llx_inventory
( (
rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
entity integer DEFAULT 0,
ref varchar(48),
datec datetime DEFAULT NULL, datec datetime DEFAULT NULL,
tms timestamp, tms timestamp,
fk_user_author integer,
fk_user_modif integer,
fk_user_valid integer,
fk_warehouse integer DEFAULT 0, fk_warehouse integer DEFAULT 0,
entity integer DEFAULT 0,
status integer DEFAULT 0, status integer DEFAULT 0,
title varchar(255) NOT NULL, title varchar(255) NOT NULL,
date_inventory datetime DEFAULT NULL date_inventory datetime DEFAULT NULL,
) import_key varchar(14)
ENGINE=InnoDB; )ENGINE=InnoDB;
CREATE TABLE llx_inventorydet CREATE TABLE llx_inventorydet
( (
@ -438,8 +442,9 @@ qty_regulated double DEFAULT NULL,
pmp double DEFAULT 0, pmp double DEFAULT 0,
pa double DEFAULT 0, pa double DEFAULT 0,
new_pmp 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_tms (tms);
ALTER TABLE llx_inventory ADD INDEX idx_inventory_datec (datec); ALTER TABLE llx_inventory ADD INDEX idx_inventory_datec (datec);

4
htdocs/langs/en_US/admin.lang
View File

@ -545,8 +545,8 @@ Module2000Name=WYSIWYG editor
Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor) Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
Module2200Name=Dynamic Prices Module2200Name=Dynamic Prices
Module2200Desc=Enable the usage of math expressions for prices Module2200Desc=Enable the usage of math expressions for prices
Module2300Name=Cron Module2300Name=Scheduled jobs
Module2300Desc=Scheduled job management Module2300Desc=Scheduled jobs management (alias cron or chrono table)
Module2400Name=Events/Agenda Module2400Name=Events/Agenda
Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. 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 Module2500Name=Electronic Content Management