diff --git a/dev/initdata/mysqldump_dolibarr_3.6.0.sql b/dev/initdata/mysqldump_dolibarr_3.6.0.sql index 905d2179534..8fc18c6ac41 100644 --- a/dev/initdata/mysqldump_dolibarr_3.6.0.sql +++ b/dev/initdata/mysqldump_dolibarr_3.6.0.sql @@ -5502,9 +5502,11 @@ CREATE TABLE `llx_product` ( `fk_user_author` int(11) DEFAULT NULL, `tosell` tinyint(4) DEFAULT '1', `tobuy` tinyint(4) DEFAULT '1', + `tobatch` tinyint(4) DEFAULT 0 NOT NULL, `fk_product_type` int(11) DEFAULT '0', `duration` varchar(6) DEFAULT NULL, `seuil_stock_alerte` int(11) DEFAULT '0', + `url` varchar(255), `barcode` varchar(255) DEFAULT NULL, `fk_barcode_type` int(11) DEFAULT '0', `accountancy_code_sell` varchar(15) DEFAULT NULL, @@ -5539,7 +5541,17 @@ CREATE TABLE `llx_product` ( LOCK TABLES `llx_product` WRITE; /*!40000 ALTER TABLE `llx_product` DISABLE KEYS */; -INSERT INTO `llx_product` VALUES (1,'2010-07-08 14:33:17','2013-03-12 09:30:24',0,0,'PIDRESS',1,NULL,'Pink dress','A beatifull pink dress','',NULL,NULL,100.00000000,112.50000000,90.00000000,101.25000000,'HT',12.500,0,0.000,0.000,1,1,1,0,'',20,NULL,0,'','',NULL,100,0,NULL,0,NULL,0,NULL,0,2,0.00000000,NULL,1,0,NULL,0),(2,'2010-07-09 00:30:01','2013-01-19 17:31:58',0,0,'Product_P1',1,NULL,'Product P1','','','',32,0.00000000,0.00000000,0.00000000,0.00000000,'HT',12.500,0,0.000,0.000,1,1,1,0,'',NULL,NULL,0,'','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,998,0.00000000,NULL,0,0,NULL,0),(3,'2010-07-09 00:30:25','2012-12-08 13:11:14',0,0,'Service_S1',1,NULL,'Service S1','','',NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,'HT',12.500,0,0.000,0.000,1,1,1,1,'1m',NULL,NULL,0,'','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL,0,0,NULL,0),(4,'2010-07-10 14:44:06','2013-01-19 17:22:48',0,0,'DECAP',1,NULL,'Decapsuleur','','',NULL,NULL,5.00000000,5.62500000,0.00000000,0.00000000,'HT',12.500,0,0.000,0.000,1,1,1,0,'',NULL,NULL,0,'','',NULL,2,-3,NULL,0,NULL,0,NULL,0,1001,10.00000000,NULL,1,0,NULL,0),(5,'2011-07-20 23:11:38','2011-07-27 17:02:59',0,0,'aaaa',1,NULL,'aaaa','cccc','bbbb','',NULL,10.00000000,11.96000000,0.00000000,0.00000000,'HT',19.600,0,0.000,0.000,1,1,1,0,'',NULL,NULL,0,'','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,'',1,0,NULL,0),(6,'2011-07-29 22:16:44','2011-07-29 20:16:44',0,0,'Copy_of_aaaa',1,NULL,'aaaa','cccc','bbbb','',NULL,10.00000000,11.96000000,0.00000000,0.00000000,'HT',19.600,0,0.000,0.000,1,0,1,0,'',NULL,NULL,0,'','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,'',1,0,NULL,0),(7,'2011-07-29 22:31:21','2011-07-29 20:31:21',0,0,'Copy_of_Copy_of_aaaa',1,NULL,'aaaa','cccc','bbbb','',NULL,10.00000000,11.96000000,0.00000000,0.00000000,'HT',19.600,0,0.000,0.000,1,0,0,0,'',NULL,NULL,0,'','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,'',1,0,NULL,0),(8,'2011-07-29 22:46:54','2011-07-29 20:46:54',0,0,'Copy_of_Copy_of_Copy_of_aaaa',1,NULL,'aaaa','cccc','bbbb','',NULL,10.00000000,11.96000000,0.00000000,0.00000000,'HT',19.600,0,0.000,0.000,1,0,0,0,'',NULL,NULL,0,'','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,'',1,0,NULL,0),(10,'2008-12-31 00:00:00','2012-12-08 13:11:14',0,0,'PR123456',1,NULL,'My product','This is a description example for record','Some note',NULL,NULL,100.00000000,110.00000000,0.00000000,0.00000000,'HT',10.000,0,0.000,0.000,NULL,0,0,0,'1y',0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL,NULL,0,'20110729232310',0),(11,'2013-01-13 20:24:42','2013-01-19 17:22:48',0,0,'gh',1,NULL,'hfghf','','','',NULL,0.00000000,0.00000000,0.00000000,0.00000000,'HT',0.000,0,0.000,0.000,1,1,1,0,'',NULL,NULL,0,'','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,-1,0.00000000,'',1,0,NULL,0); +INSERT INTO `llx_product` (`rowid`, `datec`, `tms`, `virtual`, `fk_parent`, `ref`, `entity`, `ref_ext`, `label`, `description`, `note`, `customcode`, `fk_country`, `price`, `price_ttc`, `price_min`, `price_min_ttc`, `price_base_type`, `tva_tx`, `recuperableonly`, `localtax1_tx`, `localtax2_tx`, `fk_user_author`, `tosell`, `tobuy`, `tobatch`, `fk_product_type`, `duration`, `seuil_stock_alerte`, `url`, `barcode`, `fk_barcode_type`, `accountancy_code_sell`, `accountancy_code_buy`, `partnumber`, `weight`, `weight_units`, `length`, `length_units`, `surface`, `surface_units`, `volume`, `volume_units`, `stock`, `pmp`, `canvas`, `finished`, `hidden`, `import_key`, `desiredstock`) VALUES +(1, '2010-07-08 14:33:17', '2013-03-12 07:30:24', 0, 0, 'PIDRESS', 1, NULL, 'Pink dress', 'A beatifull pink dress', '', NULL, NULL, 100.00000000, 112.50000000, 90.00000000, 101.25000000, 'HT', 12.500, 0, 0.000, 0.000, 1, 1, 1, 0, 0, '', 20, NULL, NULL, 0, '', '', NULL, 100, 0, NULL, 0, NULL, 0, NULL, 0, 2, 0.00000000, NULL, 1, 0, NULL, 0), +(2, '2010-07-09 00:30:01', '2013-01-19 15:31:58', 0, 0, 'Product_P1', 1, NULL, 'Product P1', '', '', '', 32, 0.00000000, 0.00000000, 0.00000000, 0.00000000, 'HT', 12.500, 0, 0.000, 0.000, 1, 1, 1, 0, 0, '', NULL, NULL, NULL, 0, '', '', NULL, NULL, 0, NULL, 0, NULL, 0, NULL, 0, 998, 0.00000000, NULL, 0, 0, NULL, 0), +(3, '2010-07-09 00:30:25', '2012-12-08 11:11:14', 0, 0, 'Service_S1', 1, NULL, 'Service S1', '', '', NULL, NULL, 0.00000000, 0.00000000, 0.00000000, 0.00000000, 'HT', 12.500, 0, 0.000, 0.000, 1, 1, 1, 0, 1, '1m', NULL, NULL, NULL, 0, '', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0.00000000, NULL, 0, 0, NULL, 0), +(4, '2010-07-10 14:44:06', '2013-01-19 15:22:48', 0, 0, 'DECAP', 1, NULL, 'Decapsuleur', '', '', NULL, NULL, 5.00000000, 5.62500000, 0.00000000, 0.00000000, 'HT', 12.500, 0, 0.000, 0.000, 1, 1, 1, 0, 0, '', NULL, NULL, NULL, 0, '', '', NULL, 2, -3, NULL, 0, NULL, 0, NULL, 0, 1001, 10.00000000, NULL, 1, 0, NULL, 0), +(5, '2011-07-20 23:11:38', '2011-07-27 13:02:59', 0, 0, 'aaaa', 1, NULL, 'aaaa', 'cccc', 'bbbb', '', NULL, 10.00000000, 11.96000000, 0.00000000, 0.00000000, 'HT', 19.600, 0, 0.000, 0.000, 1, 1, 1, 0, 0, '', NULL, NULL, NULL, 0, '', '', NULL, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0.00000000, '', 1, 0, NULL, 0), +(6, '2011-07-29 22:16:44', '2011-07-29 16:16:44', 0, 0, 'Copy_of_aaaa', 1, NULL, 'aaaa', 'cccc', 'bbbb', '', NULL, 10.00000000, 11.96000000, 0.00000000, 0.00000000, 'HT', 19.600, 0, 0.000, 0.000, 1, 0, 1, 0, 0, '', NULL, NULL, NULL, 0, '', '', NULL, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0.00000000, '', 1, 0, NULL, 0), +(7, '2011-07-29 22:31:21', '2011-07-29 16:31:21', 0, 0, 'Copy_of_Copy_of_aaaa', 1, NULL, 'aaaa', 'cccc', 'bbbb', '', NULL, 10.00000000, 11.96000000, 0.00000000, 0.00000000, 'HT', 19.600, 0, 0.000, 0.000, 1, 0, 0, 0, 0, '', NULL, NULL, NULL, 0, '', '', NULL, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0.00000000, '', 1, 0, NULL, 0), +(8, '2011-07-29 22:46:54', '2011-07-29 16:46:54', 0, 0, 'Copy_of_Copy_of_Copy_of_aaaa', 1, NULL, 'aaaa', 'cccc', 'bbbb', '', NULL, 10.00000000, 11.96000000, 0.00000000, 0.00000000, 'HT', 19.600, 0, 0.000, 0.000, 1, 0, 0, 0, 0, '', NULL, NULL, NULL, 0, '', '', NULL, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0.00000000, '', 1, 0, NULL, 0), +(10, '2008-12-31 00:00:00', '2012-12-08 11:11:14', 0, 0, 'PR123456', 1, NULL, 'My product', 'This is a description example for record', 'Some note', NULL, NULL, 100.00000000, 110.00000000, 0.00000000, 0.00000000, 'HT', 10.000, 0, 0.000, 0.000, NULL, 0, 0, 0, 0, '1y', 0, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0.00000000, NULL, NULL, 0, '20110729232310', 0), +(11, '2013-01-13 20:24:42', '2013-01-19 15:22:48', 0, 0, 'gh', 1, NULL, 'hfghf', '', '', '', NULL, 0.00000000, 0.00000000, 0.00000000, 0.00000000, 'HT', 0.000, 0, 0.000, 0.000, 1, 1, 1, 0, 0, '', NULL, NULL, NULL, 0, '', '', NULL, NULL, 0, NULL, 0, NULL, 0, NULL, 0, -1, 0.00000000, '', 1, 0, NULL, 0); /*!40000 ALTER TABLE `llx_product` ENABLE KEYS */; UNLOCK TABLES; @@ -7011,6 +7023,7 @@ CREATE TABLE `llx_user` ( `lang` varchar(6) DEFAULT NULL, `openid` varchar(255) DEFAULT NULL, `fk_user` int(11) DEFAULT NULL, + `thm` double(24,8), `address` varchar(255) DEFAULT NULL, `zip` varchar(25) DEFAULT NULL, `town` varchar(50) DEFAULT NULL, @@ -7032,7 +7045,15 @@ CREATE TABLE `llx_user` ( LOCK TABLES `llx_user` WRITE; /*!40000 ALTER TABLE `llx_user` DISABLE KEYS */; -INSERT INTO `llx_user` VALUES (1,'2010-07-08 13:20:11','2012-12-12 17:54:10','admin',0,NULL,NULL,NULL,'admin','21232f297a57a5a743894a0e4a801fc3',NULL,'SuperAdminName','Firstname','',NULL,'','','','eldy@destailleur.fr','',1,'','','',1,1,NULL,NULL,NULL,'','2014-03-03 19:19:24','2014-03-02 20:11:17',NULL,'',1,'01.jpg',NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(2,'2010-07-08 13:54:48','2010-07-08 11:54:48','demo',1,NULL,NULL,NULL,'demo','fe01ce2a7fbac8fafaed7c982a04e229',NULL,'John','Doe',NULL,NULL,'09123123','','','johndoe@mycompany.com',NULL,0,'','','',1,1,NULL,NULL,NULL,'','2013-03-24 16:30:29','2010-07-08 14:12:02',NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(3,'2010-07-11 16:18:59','2013-02-20 19:07:21','adupont',1,NULL,NULL,NULL,'adupont','00856ab2bbb748aa29aa335a6e3a2407',NULL,'Dupont','Alain','',NULL,'','','','toto@aa.com','',0,'','','',1,1,NULL,NULL,2,'','2012-12-21 17:38:55',NULL,NULL,'',1,NULL,NULL,NULL,2,NULL,NULL,NULL,0,0,NULL,NULL),(4,'2013-01-23 17:52:27','2013-02-20 19:48:01','aaa',1,NULL,NULL,NULL,'aaa','47bce5c74f589f4867dbd57e9ca9f808',NULL,'aaa','','',NULL,'','','','','',0,'','','',1,1,17,6,NULL,'','2013-02-25 10:18:41','2013-01-23 17:53:20',NULL,'',1,NULL,NULL,NULL,5,NULL,NULL,NULL,0,0,NULL,NULL),(5,'2013-01-23 17:52:37','2013-01-23 16:52:37','bbb',0,NULL,NULL,NULL,'bbb','08f8e0260c64418510cefb2b06eee5cd',NULL,'bbb','','',NULL,'','','','','',1,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(6,'2013-02-16 20:22:40','2013-02-16 19:22:40','aaab',2,NULL,NULL,NULL,'aaab','4c189b020ceb022e0ecc42482802e2b8',NULL,'aaab','','',NULL,'','','','','',0,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(7,'2013-02-16 20:48:15','2013-02-16 19:48:15','zzz',2,NULL,NULL,NULL,'zzz','f3abb86bd34cf4d52698f14c0da1dc60',NULL,'zzz','','',NULL,'','','','','',0,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(9,'2013-02-16 20:50:07','2013-03-24 16:10:14','zzzg',2,NULL,NULL,NULL,'jc28fg4h','93d789524fd223cf05eecea3f59cbe86',NULL,'zzzg','','',NULL,'','','','','fsdkkfsdf
\r\nfsdfsd
\r\nfsdfs',0,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,5,'','','',NULL,NULL,NULL,NULL); +INSERT INTO `llx_user` (`rowid`, `datec`, `tms`, `login`, `entity`, `civilite`, `ref_ext`, `ref_int`, `pass`, `pass_crypted`, `pass_temp`, `lastname`, `firstname`, `job`, `skype`, `office_phone`, `office_fax`, `user_mobile`, `email`, `signature`, `admin`, `webcal_login`, `phenix_login`, `phenix_pass`, `module_comm`, `module_compta`, `fk_societe`, `fk_socpeople`, `fk_member`, `note`, `datelastlogin`, `datepreviouslogin`, `egroupware_id`, `ldap_sid`, `statut`, `photo`, `lang`, `openid`, `fk_user`, `thm`, `address`, `zip`, `town`, `fk_state`, `fk_country`, `color`, `accountancy_code`) VALUES +(1, '2010-07-08 13:20:11', '2012-12-12 16:54:10', 'admin', 0, NULL, NULL, NULL, 'admin', '21232f297a57a5a743894a0e4a801fc3', NULL, 'SuperAdminName', 'Firstname', '', NULL, '', '', '', 'eldy@destailleur.fr', '', 1, '', '', '', 1, 1, NULL, NULL, NULL, '', '2014-03-03 19:19:24', '2014-03-02 20:11:17', NULL, '', 1, '01.jpg', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL), +(2, '2010-07-08 13:54:48', '2010-07-08 09:54:48', 'demo', 1, NULL, NULL, NULL, 'demo', 'fe01ce2a7fbac8fafaed7c982a04e229', NULL, 'John', 'Doe', NULL, NULL, '09123123', '', '', 'johndoe@mycompany.com', NULL, 0, '', '', '', 1, 1, NULL, NULL, NULL, '', '2013-03-24 16:30:29', '2010-07-08 14:12:02', NULL, '', 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL), +(3, '2010-07-11 16:18:59', '2013-02-20 18:07:21', 'adupont', 1, NULL, NULL, NULL, 'adupont', '00856ab2bbb748aa29aa335a6e3a2407', NULL, 'Dupont', 'Alain', '', NULL, '', '', '', 'toto@aa.com', '', 0, '', '', '', 1, 1, NULL, NULL, 2, '', '2012-12-21 17:38:55', NULL, NULL, '', 1, NULL, NULL, NULL, 2, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL), +(4, '2013-01-23 17:52:27', '2013-02-20 18:48:01', 'aaa', 1, NULL, NULL, NULL, 'aaa', '47bce5c74f589f4867dbd57e9ca9f808', NULL, 'aaa', '', '', NULL, '', '', '', '', '', 0, '', '', '', 1, 1, 17, 6, NULL, '', '2013-02-25 10:18:41', '2013-01-23 17:53:20', NULL, '', 1, NULL, NULL, NULL, 5, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL), +(5, '2013-01-23 17:52:37', '2013-01-23 15:52:37', 'bbb', 0, NULL, NULL, NULL, 'bbb', '08f8e0260c64418510cefb2b06eee5cd', NULL, 'bbb', '', '', NULL, '', '', '', '', '', 1, '', '', '', 1, 1, NULL, NULL, NULL, '', NULL, NULL, NULL, '', 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL), +(6, '2013-02-16 20:22:40', '2013-02-16 18:22:40', 'aaab', 2, NULL, NULL, NULL, 'aaab', '4c189b020ceb022e0ecc42482802e2b8', NULL, 'aaab', '', '', NULL, '', '', '', '', '', 0, '', '', '', 1, 1, NULL, NULL, NULL, '', NULL, NULL, NULL, '', 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL), +(7, '2013-02-16 20:48:15', '2013-02-16 18:48:15', 'zzz', 2, NULL, NULL, NULL, 'zzz', 'f3abb86bd34cf4d52698f14c0da1dc60', NULL, 'zzz', '', '', NULL, '', '', '', '', '', 0, '', '', '', 1, 1, NULL, NULL, NULL, '', NULL, NULL, NULL, '', 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL), +(9, '2013-02-16 20:50:07', '2013-03-24 15:10:14', 'zzzg', 2, NULL, NULL, NULL, 'jc28fg4h', '93d789524fd223cf05eecea3f59cbe86', NULL, 'zzzg', '', '', NULL, '', '', '', '', 'fsdkkfsdf
\r\nfsdfsd
\r\nfsdfs', 0, '', '', '', 1, 1, NULL, NULL, NULL, '', NULL, NULL, NULL, '', 1, NULL, NULL, NULL, 5, NULL, '', '', '', NULL, NULL, NULL, NULL); /*!40000 ALTER TABLE `llx_user` ENABLE KEYS */; UNLOCK TABLES; diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index 15fd88305d7..daf22e0af7c 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -29,6 +29,7 @@ */ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; require_once(DOL_DOCUMENT_ROOT ."/margin/lib/margins.lib.php"); /** diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index 4fac38b385f..f208c82b5d2 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/fiche.php @@ -313,9 +313,15 @@ else if ($action == 'settrackingnumber' || $action == 'settrackingurl' if ($action == 'settrackingnumber') $object->tracking_number = trim(GETPOST('trackingnumber','alpha')); if ($action == 'settrackingurl') $object->tracking_url = trim(GETPOST('trackingurl','int')); - if ($action == 'settrueWeight') $object->trueWeight = trim(GETPOST('trueWeight','int')); + if ($action == 'settrueWeight') { + $object->trueWeight = trim(GETPOST('trueWeight','int')); + $object->weight_units = GETPOST('weight_units','int'); + } if ($action == 'settrueWidth') $object->trueWidth = trim(GETPOST('trueWidth','int')); - if ($action == 'settrueHeight') $object->trueHeight = trim(GETPOST('trueHeight','int')); + if ($action == 'settrueHeight'){ + $object->trueHeight = trim(GETPOST('trueHeight','int')); + $object->size_units = GETPOST('size_units','int'); + } if ($action == 'settrueDepth') $object->trueDepth = trim(GETPOST('trueDepth','int')); if ($action == 'setshipping_method_id') $object->shipping_method_id = trim(GETPOST('shipping_method_id','int')); @@ -1149,8 +1155,25 @@ else if ($id || $ref) // Weight print ''.$form->editfieldkey("Weight",'trueWeight',$object->trueWeight,$object,$user->rights->expedition->creer).''; - print $form->editfieldval("Weight",'trueWeight',$object->trueWeight,$object,$user->rights->expedition->creer); - print ($object->trueWeight && $object->weight_units!='')?' '.measuring_units_string($object->weight_units,"weight"):''; + + if($action=='edittrueWeight') { + + print '
'; + print ''; + print ''; + print ''; + print ''; + print $formproduct->select_measuring_units("weight_units","weight",$object->weight_units); + print ' '; + print ' '; + print '
'; + + } + else { + print $object->trueWeight; + print ($object->trueWeight && $object->weight_units!='')?' '.measuring_units_string($object->weight_units,"weight"):''; + } + if ($totalWeight > 0) { if (!empty($object->trueWeight)) print ' ('.$langs->trans("SumOfProductWeights").': '; @@ -1167,8 +1190,26 @@ else if ($id || $ref) // Height print ''.$form->editfieldkey("Height",'trueHeight',$object->trueHeight,$object,$user->rights->expedition->creer).''; - print $form->editfieldval("Height",'trueHeight',$object->trueHeight,$object,$user->rights->expedition->creer); - print ($object->trueHeight && $object->height_units!='')?' '.measuring_units_string($object->height_units,"size"):''; + if($action=='edittrueHeight') { + + print '
'; + print ''; + print ''; + print ''; + print ''; + print $formproduct->select_measuring_units("size_units","size",$object->size_units); + print ' '; + print ' '; + print '
'; + + } + else { + print $object->trueHeight; + print ($object->trueHeight && $object->height_units!='')?' '.measuring_units_string($object->height_units,"size"):''; + + } + + print ''; // Depth diff --git a/htdocs/install/mysql/migration/3.5.0-3.6.0.sql b/htdocs/install/mysql/migration/3.5.0-3.6.0.sql index f4945b0c30f..176568def37 100644 --- a/htdocs/install/mysql/migration/3.5.0-3.6.0.sql +++ b/htdocs/install/mysql/migration/3.5.0-3.6.0.sql @@ -1104,8 +1104,8 @@ ALTER TABLE llx_stock_mouvement ADD fk_origin integer; ALTER TABLE llx_stock_mouvement ADD origintype VARCHAR(32); -- New 1300 : Add THM on user -ALTER TABLE llx_user ADD thm double(24,8); -ALTER TABLE llx_projet_task_time ADD thm double(24,8); +ALTER TABLE llx_user ADD thm double(24,8) AFTER fk_user; +ALTER TABLE llx_projet_task_time ADD thm double(24,8) AFTER fk_user; -- New : extrafield on categories