From 103c3f134acebb76193cba7d255ed07c923fdbe9 Mon Sep 17 00:00:00 2001
From: kannoharuto <kanno@thinkingreed.sakura.ne.jp>
Date: Thu, 8 Aug 2024 14:44:12 +0900
Subject: [PATCH] =?UTF-8?q?=E8=A6=8B=E7=A9=8D=E3=83=BB=E7=99=BA=E6=B3=A8?=
 =?UTF-8?q?=E3=83=BB=E5=8F=97=E6=B3=A8=E3=83=BB=E8=AB=8B=E6=B1=82=E3=81=A7?=
 =?UTF-8?q?=E3=80=81=E4=BD=8F=E6=89=80=E3=81=AE=E3=82=B3=E3=83=94=E3=83=BC?=
 =?UTF-8?q?=E5=85=83=E3=81=8C=E3=81=AA=E3=81=8F=E3=81=A6=E3=82=82=E4=BD=8F?=
 =?UTF-8?q?=E6=89=80=E3=81=AE=E3=82=B3=E3=83=94=E3=83=BC=E3=81=AE=E9=81=B8?=
 =?UTF-8?q?=E6=8A=9E=E8=82=A2=E3=81=8C=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C?=
 =?UTF-8?q?=E3=82=8B=E4=B8=8D=E5=85=B7=E5=90=88=E3=81=AE=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/Inventory/partials/EditViewContents.tpl   |  4 ++--
 layouts/v7/modules/PurchaseOrder/uitypes/Text.tpl     |  4 ++--
 modules/Inventory/views/Edit.php                      | 11 +++++++++++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/layouts/v7/modules/Inventory/partials/EditViewContents.tpl b/layouts/v7/modules/Inventory/partials/EditViewContents.tpl
index b92c6c210..29731f971 100644
--- a/layouts/v7/modules/Inventory/partials/EditViewContents.tpl
+++ b/layouts/v7/modules/Inventory/partials/EditViewContents.tpl
@@ -34,7 +34,7 @@
                                 <label  name="togglingHeader">{vtranslate('LBL_BILLING_ADDRESS_FROM', $MODULE)}</label>
                             </td>
                             <td class="fieldValue" name="copyAddress1">
-                                <div class="radio">
+                                <div class="radio{if $CHECK_ACCOUNTID eq false} hidden{/if}">
                                     <label>
                                         <input type="radio" name="copyAddressFromRight" class="accountAddress" data-copy-address="billing" checked="checked">
                                         &nbsp;{vtranslate('SINGLE_Accounts', $MODULE)}
@@ -68,7 +68,7 @@
                                 <label  name="togglingHeader">{vtranslate('LBL_SHIPPING_ADDRESS_FROM', $MODULE)}</label>
                             </td>
                             <td class="fieldValue" name="copyAddress2">
-                                <div class="radio">
+                                <div class="radio{if $CHECK_ACCOUNTID eq false} hidden{/if}">
                                     <label>
                                         <input type="radio" name="copyAddressFromLeft" class="accountAddress" data-copy-address="shipping" checked="checked">
                                         &nbsp;{vtranslate('SINGLE_Accounts', $MODULE)}
diff --git a/layouts/v7/modules/PurchaseOrder/uitypes/Text.tpl b/layouts/v7/modules/PurchaseOrder/uitypes/Text.tpl
index 8a76b5cf1..320d98d3f 100644
--- a/layouts/v7/modules/PurchaseOrder/uitypes/Text.tpl
+++ b/layouts/v7/modules/PurchaseOrder/uitypes/Text.tpl
@@ -35,7 +35,7 @@
 				{foreach from=$pickList key=keys item=value}
 					{if $keys eq 'vendor' or $keys eq 'contact' or $keys eq 'account'}
 						{$modl = ucfirst($keys|cat:"s")}
-						{if  vtlib_isModuleActive($modl)}
+						{if  vtlib_isModuleActive($modl) and array_key_exists($keys|cat:'_id', $RECORD_STRUCTURE['LBL_PO_INFORMATION'])}
 							<option value="{$keys}">{vtranslate($value,$MODULE)}</option>
 						{/if}
 					{else}
@@ -51,7 +51,7 @@
 					{foreach from=$pickList key=keys item=value}
 					{if $keys eq 'vendor' or $keys eq 'contact' or $keys eq 'account'}
 						{$modl = ucfirst($keys|cat:"s")}
-						{if  vtlib_isModuleActive($modl)}
+						{if  vtlib_isModuleActive($modl) and array_key_exists($keys|cat:'_id', $RECORD_STRUCTURE['LBL_PO_INFORMATION'])}
 							<option value="{$keys}">{vtranslate($value,$MODULE)}</option>
 						{/if}
 					{else}
diff --git a/modules/Inventory/views/Edit.php b/modules/Inventory/views/Edit.php
index ee927809f..cd02f7a59 100644
--- a/modules/Inventory/views/Edit.php
+++ b/modules/Inventory/views/Edit.php
@@ -170,6 +170,17 @@ public function process(Vtiger_Request $request) {
 		$viewer->assign('CURRENTDATE', date('Y-n-j'));
 		$viewer->assign('USER_MODEL', Users_Record_Model::getCurrentUserModel());
 
+		// 顧客企業が非表示項目である場合, コピーする住所の選択肢から削除する
+		$inventoryModules = array(
+			'Invoice' => 'LBL_INVOICE_INFORMATION',
+			'SalesOrder' => 'LBL_SO_INFORMATION',
+			// 'PurchaseOrder' => 'LBL_PO_INFORMATION', // POはテンプレート側で対応
+			'Quotes' => 'LBL_QUOTE_INFORMATION'
+		);
+		if ($inventoryModules[$moduleName] && $recordStructure[$inventoryModules[$moduleName]]) {
+			$viewer->assign('CHECK_ACCOUNTID', array_key_exists("account_id", $recordStructure[$inventoryModules[$moduleName]]));
+		}
+
 		$taxRegions = $recordModel->getRegionsList();
 		$defaultRegionInfo = $taxRegions[0];
 		unset($taxRegions[0]);