Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop

dev/dolibarr_changes.txt

@@ -52,6 +52,21 @@ Replace call to serialize_val with no bugged value
 
 TCPDF:
 ------
+* Replace in tcpdf.php:
+
+            if (isset($this->imagekeys)) {
+                foreach($this->imagekeys as $file) {
+                    unlink($file);
+                }
+            }
+with
+
+            if (isset($this->imagekeys)) {
+                foreach($this->imagekeys as $file) {
+//                  unlink($file);
+                }
+            }
+
 * To avoid to have QRcode changed because generated with a random mask, replace
 define('QR_FIND_FROM_RANDOM', 2);
 with

htdocs/bom/class/bom.class.php

@@ -992,7 +992,7 @@ class BOM extends CommonObject
 /**
  * Class for BOMLine
  */
-class BOMLine extends CommonObject
+class BOMLine extends CommonObjectLine
 {
 	/**
 	 * @var string ID to identify managed object

htdocs/core/lib/project.lib.php

@@ -2088,14 +2088,15 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
     }
 
 
-
     $out .= '</span>';
     $out .= '    <div class="progress sm '.$spaced.'">';
     $diffval = doubleval($task->progress) - doubleval($progressCalculated);
     if ($diffval >= 0) {
     	// good
     	$out .= '        <div class="progress-bar '.$progressBarClass.'" style="width: '.doubleval($task->progress).'%" title="'.doubleval($task->progress).'%">';
-    	$out .= '        <div class="progress-bar progress-bar-consumed" style="width: '.doubleval($progressCalculated / $task->progress * 100).'%" title="'.doubleval($progressCalculated).'%"></div>';
+    	if(!empty($task->progress)) {
+			$out .= '        <div class="progress-bar progress-bar-consumed" style="width: ' . doubleval($progressCalculated / $task->progress * 100) . '%" title="' . doubleval($progressCalculated) . '%"></div>';
+		}
     	$out .= '        </div>';
     }
     else

htdocs/includes/tecnickcom/tcpdf/tcpdf.php

@@ -7798,7 +7798,8 @@ class TCPDF {
 			}
 			if (isset($this->imagekeys)) {
 				foreach($this->imagekeys as $file) {
-					unlink($file);
+// @CHANGE DOL
+//					unlink($file);
 				}
 			}
 		}

htdocs/product/card.php

@@ -70,7 +70,7 @@ $refalreadyexists = 0;
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$type = GETPOST('type', 'int');
+$type = (GETPOST('type', 'int') !== '')? GETPOST('type', 'int'):Product::TYPE_PRODUCT;
 $action = (GETPOST('action', 'alpha') ? GETPOST('action', 'alpha') : 'view');
 $cancel = GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');

htdocs/product/class/product.class.php

@@ -385,6 +385,7 @@ class Product extends CommonObject
         'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'index'=>1, 'position'=>1, 'comment'=>'Id'),
         'ref'           =>array('type'=>'varchar(128)', 'label'=>'Ref',              'enabled'=>1, 'visible'=>1,  'notnull'=>1,  'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
         'entity'        =>array('type'=>'integer',      'label'=>'Entity',           'enabled'=>1, 'visible'=>0,  'default'=>1, 'notnull'=>1,  'index'=>1, 'position'=>20),
+        'label'         =>array('type'=>'varchar(255)', 'label'=>'Label',              'enabled'=>1, 'visible'=>1,  'notnull'=>1,  'showoncombobox'=>1),
 		'note_public'   =>array('type'=>'html',            'label'=>'NotePublic',         'enabled'=>1, 'visible'=>0,  'position'=>61),
         'note'          =>array('type'=>'html',            'label'=>'NotePrivate',         'enabled'=>1, 'visible'=>0,  'position'=>62),
         'datec'         =>array('type'=>'datetime',     'label'=>'DateCreation',     'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'position'=>500),

htdocs/product/stock/class/entrepot.class.php

@@ -107,7 +107,7 @@ class Entrepot extends CommonObject
 		'ref' =>array('type'=>'varchar(255)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>-2, 'showoncombobox'=>1, 'position'=>25),
 		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'notnull'=>1, 'position'=>30),
 		'description' =>array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>-2, 'position'=>35),
-		'lieu' =>array('type'=>'varchar(64)', 'label'=>'LocationSummary', 'enabled'=>1, 'visible'=>-2, 'position'=>40),
+		'lieu' =>array('type'=>'varchar(64)', 'label'=>'LocationSummary', 'enabled'=>1, 'visible'=>-2, 'position'=>40, 'showoncombobox'=>1),
 		'fk_parent' =>array('type'=>'integer', 'label'=>'ParentWarehouse', 'enabled'=>1, 'visible'=>-2, 'position'=>41),
 		'address' =>array('type'=>'varchar(255)', 'label'=>'Address', 'enabled'=>1, 'visible'=>-2, 'position'=>45),
 		'zip' =>array('type'=>'varchar(10)', 'label'=>'Zip', 'enabled'=>1, 'visible'=>-2, 'position'=>50),

htdocs/takepos/css/pos.css

@@ -6,10 +6,39 @@ html,body {
 	width:100%;
 }
 
+.bodytakepos {
+    background-color: #EEE;	
+}
+
 .center {
 	text-align: center;	
 }
 
+button.calcbutton.poscolorblue {
+    background-color: #0066AA;
+}
+
+button.calcbutton2.poscolordelete {
+	background: rgb(255, 188, 185);
+    color: #633;
+    /*background-color: #884444;
+    color: #fff;*/
+}
+
+button.calcbutton {
+    background-color: #8c907e;
+    color: #fff;
+    /* border-color: unset; */
+    border-width: 0;
+    margin: 1px;
+}
+
+button.calcbutton2 {
+    color: #fff;
+    background-color: #5555AA;
+    border-width: 0px;
+}
+
 button.calcbutton {
 	display: inline-block;
 	position: relative;
@@ -52,6 +81,12 @@ button.calcbutton3 {
 	height:24%;
 }
 
+button.actionbutton {
+    background: #EABCA6;
+    border: 2px solid #EEE;
+    min-height: 40px;
+}
+
 button.actionbutton {
 	display: inline-block;
 	position: relative;
@@ -65,6 +100,12 @@ button.actionbutton {
 	height:24%;
 }
 
+
+.fa.fa-trash:before {
+    font-size: 1.5em;
+}
+
+
 div.wrapper{
 	float:left; /* important */
 	position:relative; /* important(so we can absolutely position the description div */
@@ -72,7 +113,7 @@ div.wrapper{
 	height:25%;
 	margin:0;
 	padding:1px;
-	border: 2px solid #D1D1D1;
+	border: 2px solid #EEE;
 	/*box-shadow: 3px 3px 3px #bbb; */
 	text-align: center;
 	box-sizing: border-box;
@@ -86,7 +127,7 @@ div.wrapper2{
 	height:25%;
 	margin:0;
 	/* padding:1px; */
-	border: 2px solid #D1D1D1;
+	border: 2px solid #EEE;
 	/*box-shadow: 3px 3px 3px #bbb;*/
 	text-align: center;
 	box-sizing: border-box;
@@ -109,10 +150,13 @@ div.description{
 	width:100%;
 	/* styling below */
 	background-color:black;
-	color:white;
+	/*color:white;*/
-	opacity:0.8; /* transparency */
+	opacity:1; /* transparency */
-	filter:alpha(opacity=80); /* IE transparency */
+	/*filter:alpha(opacity=80); IE transparency */
 	text-align:center;
+	
+	padding-top: 30px;
+    background: -webkit-linear-gradient(top, rgba(255,255,255,0), rgba(255,255,255,1), white);
 }
 
 div.catwatermark{
@@ -125,7 +169,7 @@ div.catwatermark{
 	text-align:center;
 	font-size: 20px;
 	display: none;
-	opacity: 0.8;
+	opacity: 0.25;
 }
 
 table.postablelines tr td {
@@ -195,6 +239,7 @@ div.paymentbordline
 	padding-bottom: 10px;
 	padding-right: 5px;
 	padding-left: 5px;
+	min-height: 180px;
 }
 
 .div3{

htdocs/takepos/takepos.php

@@ -617,7 +617,7 @@ $( document ).ready(function() {
 });
 </script>
 
-<body style="overflow: hidden; background-color:#D1D1D1;">
+<body class="bodytakepos" style="overflow: hidden;">
 <?php
 if ($conf->global->TAKEPOS_NUM_TERMINALS != "1" && $_SESSION["takeposterminal"] == "") print '<div id="dialog-info" title="TakePOS">'.$langs->trans('TerminalSelect').'</div>';
 ?>