Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
7ff3e4253f
@ -123,10 +123,10 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
|
||||
|
||||
$filenamenb = $dir."/invoicesnbinyear-".$year.".png";
|
||||
if ($mode == 'customer') {
|
||||
$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&file=invoicesnbinyear-'.$year.'.png';
|
||||
$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&file=invoicesnbinyear-'.$year.'.png';
|
||||
}
|
||||
if ($mode == 'supplier') {
|
||||
$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&file=invoicesnbinyear-'.$year.'.png';
|
||||
$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&file=invoicesnbinyear-'.$year.'.png';
|
||||
}
|
||||
|
||||
$px1 = new DolGraph();
|
||||
|
||||
@ -132,7 +132,7 @@ $arrayfields = array(
|
||||
'origin'=>array('label'=>"Origin", 'checked'=>1, 'position'=>155),
|
||||
'm.fk_projet'=>array('label'=>'Project', 'checked'=>0, 'position'=>180),
|
||||
'm.value'=>array('label'=>"Qty", 'checked'=>1, 'position'=>200),
|
||||
'm.price'=>array('label'=>"UnitPurchaseValue", 'checked'=>0, 'position'=>210)
|
||||
'm.price'=>array('label'=>"UnitPurchaseValue", 'checked'=>0, 'position'=>210, 'enabled'=>empty($conf->global->STOCK_MOVEMENT_LIST_HIDE_UNIT_PRICE))
|
||||
//'m.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
|
||||
//'m.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500)
|
||||
);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user