feat(MasterDetail) add support for defaultvalue and duplicatevalue in…

… Inventory modules
tsolucio · Jun 1, 2021 · 3d5bfe8 · 3d5bfe8
1 parent b755093
commit 3d5bfe8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/include/utils/EditViewUtils.php b/include/utils/EditViewUtils.php
@@ -1302,7 +1302,11 @@ function getAssociatedProducts($module, $focus, $seid = '') {
 				);
 				if ($mdrs) {
 					$col_fields = array();
-					$col_fields[$mdfield['fieldinfo']['name']] = $adb->query_result($mdrs, 0, $mdfield['fieldinfo']['name']);
+					if (isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate']=='true' && !is_null($mdfield['duplicatevalue'])) {
+						$col_fields[$mdfield['fieldinfo']['name']] = $mdfield['duplicatevalue'];
+					} else {
+						$col_fields[$mdfield['fieldinfo']['name']] = $adb->query_result($mdrs, 0, $mdfield['fieldinfo']['name']);
+					}
 					$col_fields['record_id'] = $adb->query_result($mdrs, 0, 'inventorydetailsid');
 					$foutput = getOutputHtml($mdfield['fieldinfo']['uitype'], $mdfield['fieldinfo']['name'], $mdfield['fieldinfo']['label'], 100, $col_fields, 0, 'InventoryDetails', 'edit', $mdfield['fieldinfo']['typeofdata']);
 					$product_Detail[$i]['moreinfo'.$i][] = $foutput;

diff --git a/modules/cbMap/processmap/MasterDetailLayout.php b/modules/cbMap/processmap/MasterDetailLayout.php
@@ -65,6 +65,8 @@
 		<value>xxx</value>
 		<editable>1</editable>
 		<mandatory>1</mandatory>
+		<defaultvalue>11</defaultvalue>
+		<duplicatevalue>22</duplicatevalue>
 		<hidden>1</hidden>
 		<layout></layout>
 	  </field>
@@ -211,6 +213,8 @@ private function convertMap2Array() {
 					'mandatory' => isset($v->mandatory) ? (String)$v->mandatory : '',
 					'hidden' => isset($v->hidden) ? (String)$v->hidden : '0',
 					'value' => isset($v->value) ? (String)$v->value : '',
+					'defaultvalue' => isset($v->defaultvalue) ? (String)$v->defaultvalue : null,
+					'duplicatevalue' => isset($v->duplicatevalue) ? (String)$v->duplicatevalue : null,
 					'layout' => isset($v->layout) ? (String)$v->layout : '',
 				);
 				$mapping['detailview']['fieldnames'][] = $fieldinfo['name'];
@@ -301,7 +305,11 @@ public static function setCreateAsociatedProductsValue($module, &$smarty) {
 				if ($mdfield['fieldinfo']['name']=='id') {
 					continue;
 				}
-				$col_fields[$mdfield['fieldinfo']['name']] = '';
+				if (is_null($mdfield['defaultvalue'])) {
+					$col_fields[$mdfield['fieldinfo']['name']] = '';
+				} else {
+					$col_fields[$mdfield['fieldinfo']['name']] = $mdfield['defaultvalue'];
+				}
 				$foutput = getOutputHtml(
 					$mdfield['fieldinfo']['uitype'],
 					$mdfield['fieldinfo']['name'],