svn commit: r1804408 - in /ofbiz/ofbiz-framework/trunk/applications: datamodel/entitydef/product-entitymodel.xml product/config/ProductUiLabels.xml product/widget/catalog/ProductForms.xml product/widget/facility/FacilityForms.xml

Author: jleroux
Date: Tue Aug  8 12:33:33 2017
New Revision: 1804408

URL: http://svn.apache.org/viewvc?rev=1804408&view=rev
Log:
Improved: OEM Party Id field should have lookup on Edit Product page
(OFBIZ-9368)

As suggested by Jacques and Pierre, the patch includes removing all the traces
of OEMPartyId (manufacturerPartyId) as it was some old approach.

Changes in Patch:
1. Removed manufacturerPartyId from Product entity
2. Removed its relations from view entities namely GoodIdentificationAndProduct
3. Removed it from forms EditProduct (Product),
SearchInventoryItemsParams (EditFacilityInventoryItems screen in Facility) and
SearchInventoryItemsDetailsParams (ViewFacilityInventoryItemsDetails screen in
Facility)

Thanks: Aditya Sharma

Modified:
    ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/product-entitymodel.xml
    ofbiz/ofbiz-framework/trunk/applications/product/config/ProductUiLabels.xml
    ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/ProductForms.xml
    ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/FacilityForms.xml

Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/product-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/product-entitymodel.xml?rev=1804408&r1=1804407&r2=1804408&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/product-entitymodel.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/product-entitymodel.xml Tue Aug  8 12:33:33 2017
@@ -2655,9 +2655,6 @@ under the License.
       <relation type="one-nofk" rel-entity-name="Facility">
         <key-map field-name="facilityId"/>
       </relation>
-      <relation type="one-nofk" title="Manufacturer" rel-entity-name="Party">
-        <key-map field-name="manufacturerPartyId" rel-field-name="partyId"/>
-      </relation>
       <relation type="one-nofk" title="Quantity" rel-entity-name="Uom">
         <key-map field-name="quantityUomId" rel-field-name="uomId"/>
       </relation>
@@ -2708,7 +2705,6 @@ under the License.
       <field name="productId" type="id"></field>
       <field name="productTypeId" type="id"></field>
       <field name="primaryProductCategoryId" type="id"><description>The primary category ; it should be one of the productCategoryId already setup in ProductCategoryMember</description></field>
-      <field name="manufacturerPartyId" type="id"></field>
       <field name="facilityId" type="id"></field>
       <field name="introductionDate" type="date-time"></field>
       <field name="releaseDate" type="date-time"></field>
@@ -2789,9 +2785,6 @@ under the License.
       <relation type="one" fk-name="PROD_FACILITY" rel-entity-name="Facility">
         <key-map field-name="facilityId"/>
       </relation>
-      <relation type="one" fk-name="PROD_MFG_PARTY" title="Manufacturer" rel-entity-name="Party">
-        <key-map field-name="manufacturerPartyId" rel-field-name="partyId"/>
-      </relation>
       <relation type="one" fk-name="PROD_QUANT_UOM" title="Quantity" rel-entity-name="Uom">
         <key-map field-name="quantityUomId" rel-field-name="uomId"/>
       </relation>

Modified: ofbiz/ofbiz-framework/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/config/ProductUiLabels.xml?rev=1804408&r1=1804407&r2=1804408&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/config/ProductUiLabels.xml Tue Aug  8 12:33:33 2017
@@ -23193,20 +23193,6 @@
         <value xml:lang="zh">因这些产品而过时：</value>
         <value xml:lang="zh-TW">因這些產品而過時:</value>
     </property>
-    <property key="ProductOemPartyId">
-        <value xml:lang="de">OEM Akteur ID</value>
-        <value xml:lang="en">OEM Party ID</value>
-        <value xml:lang="es">Código de proveedor OEM</value>
-        <value xml:lang="fr">Réf. fournisseur OEM</value>
-        <value xml:lang="it">OEM Codice Soggetto</value>
-        <value xml:lang="ja">OEM取引先ID</value>
-        <value xml:lang="ro">OEM Cod Soggetto</value>
-        <value xml:lang="ru">OEM производитель</value>
-        <value xml:lang="th">OEM รหัสกลุ่มผู้ใช้</value>
-        <value xml:lang="vi">Công ty chế tác (OEM)</value>
-        <value xml:lang="zh">OEM会员标识</value>
-        <value xml:lang="zh-TW">OEM團體識別</value>
-    </property>
     <property key="ProductOemPartyName">
         <value xml:lang="de">Produkt OEM Namen</value>
         <value xml:lang="en">Product OEM Name</value>

Modified: ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/ProductForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/ProductForms.xml?rev=1804408&r1=1804407&r2=1804408&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/ProductForms.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/ProductForms.xml Tue Aug  8 12:33:33 2017
@@ -103,7 +103,6 @@ under the License.
         <field position="1" name="internalName" title="${uiLabelMap.ProductInternalName}" required-field="true"><text size="30" maxlength="255"/></field>
         <field position="2" name="brandName" title="${uiLabelMap.ProductBrandName}" ><text size="30" maxlength="60"/></field>
         <field name="productName" title="${uiLabelMap.ProductProductName}"><text size="30" maxlength="255"/></field>
-        <field name="manufacturerPartyId" title="${uiLabelMap.ProductOemPartyId}" ><text size="20" maxlength="20"/></field>
         <field name="comments" title="${uiLabelMap.CommonComments}"><text size="60" maxlength="250"/></field>
 
         <field position="1" name="introductionDate" title="${uiLabelMap.CommonIntroductionDate}" red-when="after-now"><date-time/></field>
@@ -292,7 +291,6 @@ under the License.
                 <sort-field name="internalName"/>
                 <sort-field name="brandName"/>
                 <sort-field name="productName"/>
-                <sort-field name="manufacturerPartyId"/>
                 <sort-field name="comments"/>
             </field-group>
             <field-group title="${uiLabelMap.ProductVirtualFieldGroup}" collapsible="true" initially-collapsed="true">

Modified: ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/FacilityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/FacilityForms.xml?rev=1804408&r1=1804407&r2=1804408&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/FacilityForms.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/FacilityForms.xml Tue Aug  8 12:33:33 2017
@@ -186,9 +186,6 @@ under the License.
         <field name="inventoryItemId"><text-find/></field>
         <field name="serialNumber"><text-find/></field>
         <field name="softIdentifier"><text/></field>
-        <field name="manufacturerPartyId">
-            <lookup target-form-name="LookupPartyName"/>
-        </field>
         <field name="orderId">
             <lookup target-form-name="LookupOrderHeader"/>
         </field>