svn commit: r608662 - in /ofbiz/trunk/applications/prod
Locked
 
|
Author: mrisaliti
Date: Thu Jan 3 14:30:48 2008 New Revision: 608662 URL: http://svn.apache.org/viewvc?rev=608662&view=rev Log: Inventory Items/Labels forms (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1556) Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.properties ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml ofbiz/trunk/applications/product/webapp/facility/labels/InventoryItemLabelForms.xml ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.properties?rev=608662&r1=608661&r2=608662&view=diff ============================================================================== --- ofbiz/trunk/applications/product/config/ProductUiLabels.properties (original) +++ ofbiz/trunk/applications/product/config/ProductUiLabels.properties Thu Jan 3 14:30:48 2008 @@ -66,6 +66,8 @@ OrderShipGroup=Ship Group OrderShipping=Shipping PageTitleAddItemsFromOrder=Add Items From Order +PageTitleAddInventoryItemLabelAppls=Add Inventory Item Label Appls +PageTitleAddInventoryItemLabelTypes=Add Inventory Item Label Types PageTitleAddProductAssetUsage=Add Product Asset Usage PageTitleAddProductCatalogParties=Add Product Catalog Parties PageTitleAddProductCatalogStores=Add Product Catalog Stores @@ -131,6 +133,8 @@ PageTitleEditFeatureType=Edit Feature Type PageTitleEditFeatureTypes=Edit Feature Types PageTitleEditInventoryItem=Edit Inventory Item +PageTitleEditInventoryItemLabelAppls=Edit Inventory Item Label Appls +PageTitleEditInventoryItemLabelTypes=Edit Inventory Item Label Types PageTitleEditProduct=Edit Product PageTitleEditProductAssetUsage=Edit Product Asset Usage PageTitleEditProductAssociations=Edit Product Associations @@ -201,6 +205,7 @@ PageTitleFindFacilityLocation=Find Facility Location PageTitleFindFacilityPhysicalInventory=Find Facility Physical Inventory PageTitleFindFacilityTransfers=Find Facility Transfers +PageTitleFindInventoryItemLabels=Find Inventory Item Labels PageTitleFindProductCatalog=Find Product Catalog PageTitleFindProductPriceRule=Find Product Price Rule PageTitleFindProductPromos=Find Product Promos @@ -825,7 +830,7 @@ ProductLocationsFor=Location(s) for ProductLongDescription=Long Description ProductLookupShipment=Lookup Shipment(s) -ProductLotId=Lot ID +ProductLotId=Lot Id ProductLowLevelCode=Low Level Code ProductLowToHigh=Low to High ProductMain=Main @@ -1330,6 +1335,7 @@ ProductShipmentPackageNotFound=shipmentPackageSeqId [${shipmentPackageSeqId}] was not found in shipment with ID [${shipmentId}] ProductShipmentPlan=Shipment Plan ProductShipmentPlanToOrderItems=Shipment Plan --> Order Items +ProductShipmentReceiptsFor=Shipment Receipts for ProductShipmentQuickComplete=Quick Complete Drop Shipment ProductShipmentThirdPartyAccountNumber=Third Party Account Number ProductShipmentThirdPartyPostalCode=Third Party Postal Code @@ -1978,4 +1984,35 @@ FormFieldTitle_creditCardEnumId=Credit Card Enum Id FormFieldTitle_datetimeReceived=Date Time Received FormFieldTitle_softIdentifier=Soft Identifier -FormFieldTitle_quantityOnHandTotal=Quantity On Hand Total \ No newline at end of file +FormFieldTitle_quantityOnHandTotal=Quantity On Hand Total +FormFieldTitle_datetimeManufactured=Date Time Manufactured +FormFieldTitle_containerId=Container Id +FormFieldTitle_unitCost=Unit Cost +FormFieldTitle_activationNumber=Activation Number +FormFieldTitle_activationValidThru=Activation Valid Thru +FormFieldTitle_shipGroupSeqId=Ship Group Seq Id +FormFieldTitle_quantityNotAvailable=Quantity Not Available +FormFieldTitle_reservedDatetime=Reserved Date Time +FormFieldTitle_createdDatetime=Created Datetime +FormFieldTitle_promisedDatetime=Promised Datetime +FormFieldTitle_currentPromisedDate=Current Promised Date +FormFieldTitle_sequenceId=Sequence Id +FormFieldTitle_oldPickStartDate=Old Pick Start Date +FormFieldTitle_inventoryItemDetailSeqId=Inventory Item Detail Seq Id +FormFieldTitle_effectiveDate=Effective Date +FormFieldTitle_quantityOnHandDiff=Quantity On Hand Diff +FormFieldTitle_availableToPromiseDiff=Available To Promise Diff +FormFieldTitle_shipmentItemSeqId=Shipment Item Seq Id +FormFieldTitle_returnId=Return Id +FormFieldTitle_returnItemSeqId=Return Item Seq Id +FormFieldTitle_fixedAssetId=Fixed Asset Id +FormFieldTitle_itemIssuanceId=Item Issuance Id +FormFieldTitle_reasonEnumId=Reason Enum Id +FormFieldTitle_rejectionId=Rejection Id +FormFieldTitle_receivedByUserLoginId=Received By User Login Id +FormFieldTitle_itemDescription=Item Description +FormFieldTitle_quantityAccepted=Quantity Accepted +FormFieldTitle_quantityRejected=Quantity Rejected +FormFieldTitle_inventoryItemLabelId=Inventory Item Label Id +FormFieldTitle_inventoryItemLabelTypeId=Inventory Item Label Type Id +FormFieldTitle_parentTypeId=Parent Type Id \ No newline at end of file Modified: ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties?rev=608662&r1=608661&r2=608662&view=diff ============================================================================== --- ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties (original) +++ ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties Thu Jan 3 14:30:48 2008 @@ -64,6 +64,8 @@ OrderShipGroup=Gruppo Spedizione OrderShipping=Spedizione PageTitleAddItemsFromOrder=Aggiungi Righe Dall'Ordine +PageTitleAddInventoryItemLabelAppls=Aggiungi Applicabilit\u00e0 Etichetta Riga Inventario +PageTitleAddInventoryItemLabelTypes=Aggiungi Tipo Etichetta Riga Inventario PageTitleAddProductAssetUsage=Aggiungi Bene a Noleggio PageTitleAddProductCatalogParties=Aggiungi Soggetti Catalogo Prodotto PageTitleAddProductCatalogStores=Aggiungi Catalogo Prodotto @@ -126,6 +128,8 @@ PageTitleEditFeatureType=Aggiorna Tipo Caratteristica PageTitleEditFeatureTypes=Aggiorna Tipi Caratteristica PageTitleEditInventoryItem=Aggiorna Riga Inventario +PageTitleEditInventoryItemLabelAppls=Aggiorna Applicabilit\u00e0 Etichetta Riga Inventario +PageTitleEditInventoryItemLabelTypes=Aggiorna Tipo Etichetta Riga Inventario PageTitleEditProduct=Aggiorna Prodotto PageTitleEditProductAssetUsage=Aggiorna Bene a Noleggio PageTitleEditProductAssociations=Aggiorna Associazioni Prodotto @@ -199,6 +203,7 @@ PageTitleFindFacilityLocation=Ricerca Posizione Stabilimento PageTitleFindFacilityPhysicalInventory=Ricerca Stabilimento Inventario Fisico PageTitleFindFacilityTransfers=Ricerca Trasferimenti Stabilimento +PageTitleFindInventoryItemLabels=Ricerca Etichette Riga Inventario PageTitleFindProductCatalog=Ricerca Catalogo Prodotto PageTitleFindProductPriceRule=Ricerca Regole Prezzo Prodotto PageTitleFindProductPromos=Ricerca Promozioni Prodotto @@ -739,6 +744,10 @@ ProductInventoryFacility=Inventario Stabilimento ProductInventoryItem=Riga Inventario ProductInventoryItemId=Numero Riga Inventario +ProductInventoryItemLabel=Etichetta Riga Inventario +ProductInventoryItemLabelAppl=Applicabilit\u00e0 Etichetta +ProductInventoryItemLabels=Etichette Riga Inventario +ProductInventoryItemLabelTypes=Tipo Etichetta ProductInventoryItemReservations=Riga Inventario Riservato ProductInventoryItemType=Tipo Riga Inventario ProductInventoryItemTypeId=Tipo Riga Inventario @@ -1312,6 +1321,7 @@ ProductShipmentPackageNotFound=Pacco spedizione [${shipmentPackageSeqId}] non trovato per la spedizione [${shipmentId}] ProductShipmentPlan=Piano di Spedizione ProductShipmentPlanToOrderItems=Piano di Spedizione --> Righe Ordine +ProductShipmentReceiptsFor=Ricevute di Spedizione per ProductShipmentQuickComplete=Quick Complete Drop Shipment ProductShipmentThirdPartyAccountNumber=Numero Conto Soggetto Terzo ProductShipmentThirdPartyAddress=Conto Indirizzo Soggetto Terzo @@ -1953,4 +1963,35 @@ FormFieldTitle_creditCardEnumId=Tipo Carta di Credito FormFieldTitle_datetimeReceived=Data Ora Ricezione FormFieldTitle_softIdentifier=Identificativo -FormFieldTitle_quantityOnHandTotal=Totale Quantit\u00e0 Disponibile \ No newline at end of file +FormFieldTitle_quantityOnHandTotal=Totale Quantit\u00e0 Disponibile +FormFieldTitle_datetimeManufactured=Data Ora Produzione +FormFieldTitle_containerId=Codice Container +FormFieldTitle_unitCost=Costo Unitario +FormFieldTitle_activationNumber=Numero Attivazione +FormFieldTitle_activationValidThru=Attivazione Valida Fino A +FormFieldTitle_shipGroupSeqId=Gruppo Spedizione +FormFieldTitle_quantityNotAvailable=Quantit\u00e0 Non Disponibile +FormFieldTitle_reservedDatetime=Data Ora Riservazione +FormFieldTitle_createdDatetime=Data Ora Creazione +FormFieldTitle_promisedDatetime=Data Ora Promessa +FormFieldTitle_currentPromisedDate=Attuale Data Promessa +FormFieldTitle_sequenceId=Numero Sequenza +FormFieldTitle_oldPickStartDate=Vecchia Data Inizio Prelievo +FormFieldTitle_inventoryItemDetailSeqId=N.Seq. Dettaglio Riga Inventario +FormFieldTitle_effectiveDate=Data Effettiva +FormFieldTitle_quantityOnHandDiff=Differenza Quantit\u00e0 Disponibile +FormFieldTitle_availableToPromiseDiff=Differenza Disponibilit\u00e0 Promessa +FormFieldTitle_shipmentItemSeqId=Numero Seq Riga Spedizione +FormFieldTitle_returnId=Numero Reso +FormFieldTitle_returnItemSeqId=Numero Riga Reso +FormFieldTitle_fixedAssetId=Numero Cespite +FormFieldTitle_itemIssuanceId=Numero Riga Prelievo +FormFieldTitle_reasonEnumId=Motivazione +FormFieldTitle_rejectionId=Rifiuto +FormFieldTitle_receivedByUserLoginId=Ricevuto dall\'Utente +FormFieldTitle_itemDescription=Descrizione Riga +FormFieldTitle_quantityAccepted=Quantit\u00e0 Accettata +FormFieldTitle_quantityRejected=Quantit\u00e0 Rifiutata +FormFieldTitle_inventoryItemLabelId=Codice Etichetta Riga Inventario +FormFieldTitle_inventoryItemLabelTypeId=Tipo Etichetta Riga +FormFieldTitle_parentTypeId=Tipo Padre \ No newline at end of file Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml?rev=608662&r1=608661&r2=608662&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml Thu Jan 3 14:30:48 2008 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8" ?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -20,7 +20,8 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - <form name="EditInventoryItem" type="single" target="UpdateInventoryItem" title=""> + <form name="EditInventoryItem" type="single" target="UpdateInventoryItem" title="" + header-row-style="header-row" default-table-style="basic-table"> <actions> <set field="inventoryItemTypeId" from-field="inventoryItem.inventoryItemTypeId"/> <set field="productId" from-field="inventoryItem.productId"/> @@ -39,16 +40,16 @@ <field name="oldQuantityOnHand"><ignored/></field> <!-- custom formatted fields --> - <field use-when="inventoryItem!=null" name="inventoryItemId" tooltip="&nbsp;${uiLabelMap.ProductNotModificationRecrationInventoryItem}"><display/></field> + <field use-when="inventoryItem!=null" name="inventoryItemId" tooltip="${uiLabelMap.ProductNotModificationRecrationInventoryItem}"><display/></field> <field use-when="inventoryItem==null" name="inventoryItemId"><text/></field> - <field name="inventoryItemTypeId"> + <field name="inventoryItemTypeId" title="${uiLabelMap.ProductInventoryItemTypeId}"> <drop-down allow-empty="false"> <entity-options entity-name="InventoryItemType" description="${description}" key-field-name="inventoryItemTypeId"/> </drop-down> </field> <field name="productId"> <text> - <sub-hyperlink use-when="productId!=null" target="/catalog/control/EditProduct?productId=${productId}" target-type="inter-app" description="Edit Product [${productId}]"/> + <sub-hyperlink use-when="productId!=null" target="/catalog/control/EditProduct?productId=${productId}" target-type="inter-app" description="${uiLabelMap.ProductEditProduct} [${productId}]"/> </text> </field> <field name="statusId"> @@ -58,14 +59,18 @@ </entity-options> </drop-down> </field> + <field name="expireDate" title="${uiLabelMap.ProductExpireDate}"/> <field name="facilityId"> <drop-down allow-empty="true"> <entity-options entity-name="Facility" description="${facilityName}" key-field-name="facilityId"> <entity-order-by field-name="facilityName"/> </entity-options> - <sub-hyperlink use-when="facilityId!=null" target="EditFacility?facilityId=${facilityId}" description="Edit Facility [${facilityId}]"/> + <sub-hyperlink use-when="facilityId!=null" target="EditFacility?facilityId=${facilityId}" description="${uiLabelMap.ProductEditFacility} [${facilityId}]"/> </drop-down> </field> + <field name="lotId" title="${uiLabelMap.ProductLotId}"/> + <field name="uomId" title="${uiLabelMap.ProductUomId}"/> + <field name="binNumber" title="${uiLabelMap.ProductBinNumber}"/> <field name="locationSeqId" title="${uiLabelMap.ProductFacilityLocation}"> <lookup target-form-name="LookupFacilityLocation"> <sub-hyperlink use-when="locationSeqId!=null" target="EditFacilityLocation?facilityId=${facilityId}&locationSeqId=${locationSeqId}"></sub-hyperlink> @@ -83,16 +88,16 @@ <display description="${inventoryItem.availableToPromiseTotal} / ${inventoryItem.quantityOnHandTotal}"/> </field> - <field use-when="inventoryItem!=null" name="submit" title="Update"> + <field use-when="inventoryItem!=null" name="submit" title="${uiLabelMap.CommonUpdate}"> <submit/> </field> - <field use-when="inventoryItem==null" name="submit" title="Create"> + <field use-when="inventoryItem==null" name="submit" title="${uiLabelMap.CommonCreate}"> <submit/> </field> </form> <form name="CreatePhysicalInventoryAndVariance" type="single" target="createPhysicalInventoryAndVariance" title="" - default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"> + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createPhysicalInventoryAndVariance"/> <field name="physicalInventoryId"><ignored/></field> <field name="physicalInventoryDate"><ignored/></field> @@ -110,7 +115,7 @@ <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ViewPhysicalInventoryAndVariance" type="list" target="" title="" list-name="physicalInventoryAndVarianceDatas" - default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext"> + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <auto-fields-entity entity-name="PhysicalInventoryAndVariance" map-name="physicalInventoryAndVariance" default-field-type="display"/> <field name="inventoryItemId"><hidden/></field> <field name="partyId"><display description="${person.firstName} ${person.lastName} ${partyGroup.groupName} [${physicalInventoryAndVariance.partyId}]"/></field> @@ -118,7 +123,7 @@ </form> <form name="ViewInventoryItemShipmentReceipts" type="list" target="" title="" list-name="shipmentReceiptList" - default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext"> + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-and entity-name="ShipmentReceipt" list-name="shipmentReceiptList"> <field-map field-name="inventoryItemId"/> @@ -129,7 +134,7 @@ </form> <form name="ListInventoryItemDetail" type="list" target="" title="" list-name="inventoryItemDetails" - default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext"> + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <auto-fields-entity entity-name="InventoryItemDetail" map-name="inventoryItemDetail" default-field-type="display"/> <field name="inventoryItemId"><hidden/></field> <!-- this field is redundant --> <field name="orderId" widget-style="buttontext"> @@ -144,7 +149,8 @@ <!-- workEffortId - not sure if it's better to show manufacturing or workeffort app itemIssuanceId, receiptId, physicalInventoryId - no natural screens to show these --> </form> - <form name="InventoryItemReservations" type="list" target="" title="" list-name="inventoryItemReservations"> + <form name="InventoryItemReservations" type="list" target="" title="" list-name="inventoryItemReservations" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <auto-fields-entity entity-name="OrderItemShipGrpInvRes" default-field-type="display"/> <field name="inventoryItemId"><hidden/></field> <field name="orderId" widget-style="buttontext"> @@ -152,7 +158,8 @@ </field> </form> <!-- Inventory Item Labels --> - <form name="UpdateInventoryItemLabelAppls" type="list" target="updateInventoryItemLabelApplFromItem" title="" list-name="inventoryItemLabelAppls"> + <form name="UpdateInventoryItemLabelAppls" type="list" target="updateInventoryItemLabelApplFromItem" title="" list-name="inventoryItemLabelAppls" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <auto-fields-service service-name="updateInventoryItemLabelAppl"/> <field name="inventoryItemLabelId" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="EditInventoryItemLabel?inventoryItemLabelId=${inventoryItemLabelId}" description="${inventoryItemLabelId}" also-hidden="true"/> @@ -168,7 +175,8 @@ description="${uiLabelMap.CommonDelete}" also-hidden="false"/> </field> </form> - <form name="AddInventoryItemLabelAppl" type="single" target="createInventoryItemLabelApplFromItem" title=""> + <form name="AddInventoryItemLabelAppl" type="single" target="createInventoryItemLabelApplFromItem" title="" + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createInventoryItemLabelAppl"/> <field name="facilityId"><hidden/></field> <field name="inventoryItemId"><hidden/></field> Modified: ofbiz/trunk/applications/product/webapp/facility/labels/InventoryItemLabelForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/labels/InventoryItemLabelForms.xml?rev=608662&r1=608661&r2=608662&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/labels/InventoryItemLabelForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/facility/labels/InventoryItemLabelForms.xml Thu Jan 3 14:30:48 2008 @@ -20,7 +20,8 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - <form name="AddInventoryItemLabelType" type="single" target="createInventoryItemLabelType" title=""> + <form name="AddInventoryItemLabelType" type="single" target="createInventoryItemLabelType" title="" + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createInventoryItemLabelType"/> <field name="parentTypeId"> <drop-down allow-empty="true"> @@ -34,7 +35,8 @@ </field> <field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field> </form> - <form name="UpdateInventoryItemLabelTypes" type="list" target="updateInventoryItemLabelType" title="" list-name="inventoryItemLabelTypes"> + <form name="UpdateInventoryItemLabelTypes" type="list" target="updateInventoryItemLabelType" title="" list-name="inventoryItemLabelTypes" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <auto-fields-service service-name="updateInventoryItemLabelType"/> <field name="inventoryItemLabelTypeId"><display/></field> <field name="parentTypeId"> @@ -50,7 +52,8 @@ description="${uiLabelMap.CommonDelete}" also-hidden="false"/> </field> </form> - <form name="ListInventoryItemLabels" type="list" title="" list-name="inventoryItemLabels"> + <form name="ListInventoryItemLabels" type="list" title="" list-name="inventoryItemLabels" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <auto-fields-entity entity-name="InventoryItemLabel" default-field-type="display"/> <field name="inventoryItemLabelId" widget-style="buttontext"> <hyperlink target="EditInventoryItemLabel?inventoryItemLabelId=${inventoryItemLabelId}" @@ -64,7 +67,8 @@ description="${uiLabelMap.CommonDelete}" also-hidden="false"/> </field> </form> - <form name="EditInventoryItemLabel" type="single" target="createInventoryItemLabel" title="" default-map-name="inventoryItemLabel"> + <form name="EditInventoryItemLabel" type="single" target="createInventoryItemLabel" title="" default-map-name="inventoryItemLabel" + header-row-style="header-row" default-table-style="basic-table"> <alt-target target="updateInventoryItemLabel" use-when="inventoryItemLabel!=null"/> <auto-fields-service service-name="createInventoryItemLabel" /> <field name="inventoryItemLabelId" use-when="inventoryItemLabel!=null"><display/></field> @@ -80,7 +84,8 @@ </field> <field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field> </form> - <form name="UpdateInventoryItemLabelAppls" type="list" target="updateInventoryItemLabelAppl" title="" list-name="inventoryItemLabelAppls"> + <form name="UpdateInventoryItemLabelAppls" type="list" target="updateInventoryItemLabelAppl" title="" list-name="inventoryItemLabelAppls" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <auto-fields-service service-name="updateInventoryItemLabelAppl"/> <field name="inventoryItemLabelId"><hidden/></field> <field name="inventoryItemLabelTypeId"><hidden/></field> @@ -96,7 +101,8 @@ description="${uiLabelMap.CommonDelete}" also-hidden="false"/> </field> </form> - <form name="AddInventoryItemLabelAppl" type="single" target="createInventoryItemLabelAppl" title=""> + <form name="AddInventoryItemLabelAppl" type="single" target="createInventoryItemLabelAppl" title="" + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createInventoryItemLabelAppl"/> <field name="inventoryItemLabelId"><hidden/></field> <field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field> Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=608662&r1=608661&r2=608662&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Thu Jan 3 14:30:48 2008 @@ -138,27 +138,40 @@ <link target="FindFacilityTransfers?facilityId=${facilityId}&completeRequested=true" text="${uiLabelMap.ProductCompleteRequestedTransfers}" style="buttontext"/> <link target="TransferInventoryItem?facilityId=${facilityId}" text="${uiLabelMap.ProductInventoryTransfer}" style="buttontext"/> </container> - <container> - <label style="head1">${uiLabelMap.ProductInventoryTransfersFor} ${facility.facilityName} [${uiLabelMap.CommonId}: ${facilityId}]</label> - </container> - <container> - <label style="head2">${uiLabelMap.CommonTo}: ${facility.facilityName} [${uiLabelMap.CommonId}: ${facilityId}]</label> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.ProductInventoryTransfersFor} ${facility.facilityName} [${uiLabelMap.CommonId}: ${facilityId}] ${uiLabelMap.CommonTo}: ${facility.facilityName} [${uiLabelMap.CommonId}: ${facilityId}]"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ToFacilityTransfers" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + </widgets> + </section> + </container> </container> - <include-form name="ToFacilityTransfers" location="component://product/webapp/facility/facility/FacilityForms.xml"/> - <container> - <label style="head2">${uiLabelMap.CommonFrom}: ${facility.facilityName} [${uiLabelMap.CommonId}: ${facilityId}]</label> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.CommonFrom}: ${facility.facilityName} [${uiLabelMap.CommonId}: ${facilityId}]"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <condition> + <if-compare field-name="parameters.completeRequested" operator="equals" value="true"/> + </condition> + <widgets> + <include-form name="FromFacilityTransfersComplete" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + </widgets> + <fail-widgets> + <include-form name="FromFacilityTransfers" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + </fail-widgets> + </section> + </container> </container> - <section> - <condition> - <if-compare field-name="parameters.completeRequested" operator="equals" value="true"/> - </condition> - <widgets> - <include-form name="FromFacilityTransfersComplete" location="component://product/webapp/facility/facility/FacilityForms.xml"/> - </widgets> - <fail-widgets> - <include-form name="FromFacilityTransfers" location="component://product/webapp/facility/facility/FacilityForms.xml"/> - </fail-widgets> - </section> </decorator-section> </decorator-screen> </widgets> @@ -506,19 +519,44 @@ <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> <decorator-section name="body"> <container> - <label style="head1">${uiLabelMap.ProductInventoryItemsDetailsFor}</label> - <label style="head2">${facility.facilityName} [${uiLabelMap.CommonId}:${facility.facilityId}]</label> + <label style="head1">${uiLabelMap.ProductInventoryItemsDetailsFor} ${facility.facilityName} [${uiLabelMap.CommonId}:${facility.facilityId}]</label> </container> <container> <link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="buttontext"/> </container> - <include-form name="SearchInventoryItemsDetailsParams" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleViewFacilityInventoryItemsDetails}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="SearchInventoryItemsDetailsParams" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + </widgets> + </section> + </container> + </container> <section> <condition> <if-compare field-name="parameters.reportType" operator="equals" value="BY_ITEM"/> </condition> <widgets> - <include-form name="ListFacilityInventoryItemsDetailsByItem" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleViewFacilityInventoryItemsDetails}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListFacilityInventoryItemsDetailsByItem" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + </widgets> + </section> + </container> + </container> </widgets> </section> <section> @@ -823,15 +861,33 @@ </container> </fail-widgets> </section> - - <container style="widget-container"> - <include-form name="EditInventoryItem" location="component://product/webapp/facility/inventory/InventoryForms.xml"/> - </container> - <container style="widget-container"> - <label style="head2">${uiLabelMap.ProductInventoryItemReservations}</label> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditInventoryItem}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="EditInventoryItem" location="component://product/webapp/facility/inventory/InventoryForms.xml"/> + </widgets> + </section> + </container> </container> - <container style="widget-container"> - <include-form name="InventoryItemReservations" location="component://product/webapp/facility/inventory/InventoryForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.ProductInventoryItemReservations}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="InventoryItemReservations" location="component://product/webapp/facility/inventory/InventoryForms.xml"/> + </widgets> + </section> + </container> </container> <section> <condition> @@ -841,14 +897,20 @@ <script location="component://product/webapp/facility/WEB-INF/actions/inventory/PhysicalInventoryVariance.bsh"/> </actions> <widgets> - <container style="widget-container"> - <label style="head2">${uiLabelMap.ProductPhysicalInventoryVariances}</label> - </container> - <container style="widget-container"> - <include-form name="CreatePhysicalInventoryAndVariance" location="component://product/webapp/facility/inventory/InventoryForms.xml"/> - </container> - <container style="widget-container"> - <include-form name="ViewPhysicalInventoryAndVariance" location="component://product/webapp/facility/inventory/InventoryForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.ProductPhysicalInventoryVariances}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="CreatePhysicalInventoryAndVariance" location="component://product/webapp/facility/inventory/InventoryForms.xml"/> + <include-form name="ViewPhysicalInventoryAndVariance" location="component://product/webapp/facility/inventory/InventoryForms.xml"/> + </widgets> + </section> + </container> </container> </widgets> </section> @@ -879,14 +941,34 @@ <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> <decorator-section name="body"> <include-menu name="InventoryItemTabBar" location="component://product/widget/facility/Menus.xml"/> - <container> - <label style="head1">${uiLabelMap.ProductInventoryDetails} ${uiLabelMap.CommonFor} [${inventoryItemId}]</label> - </container> - <include-form name="ListInventoryItemDetail" location="component://product/webapp/facility/inventory/InventoryForms.xml"/> - <container> - <label style="head1">Shipment Receipts for [${inventoryItemId}]</label> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.ProductInventoryDetails} ${uiLabelMap.CommonFor} [${inventoryItemId}]"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListInventoryItemDetail" location="component://product/webapp/facility/inventory/InventoryForms.xml"/> + </widgets> + </section> + </container> </container> - <include-form name="ViewInventoryItemShipmentReceipts" location="component://product/webapp/facility/inventory/InventoryForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.ProductShipmentReceiptsFor} [${inventoryItemId}]"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ViewInventoryItemShipmentReceipts" location="component://product/webapp/facility/inventory/InventoryForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -914,11 +996,34 @@ <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> <decorator-section name="body"> <include-menu name="InventoryItemTabBar" location="component://product/widget/facility/Menus.xml"/> - <container> - <label style="head1">${uiLabelMap.ProductInventoryItemLabels} ${uiLabelMap.CommonFor} [${inventoryItemId}]</label> - </container> - <include-form name="UpdateInventoryItemLabelAppls" location="component://product/webapp/facility/inventory/InventoryForms.xml"/> - <include-form name="AddInventoryItemLabelAppl" location="component://product/webapp/facility/inventory/InventoryForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.ProductInventoryItemLabels} ${uiLabelMap.CommonFor} [${inventoryItemId}]"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="UpdateInventoryItemLabelAppls" location="component://product/webapp/facility/inventory/InventoryForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.ProductInventoryItemLabels} ${uiLabelMap.CommonFor} [${inventoryItemId}]"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddInventoryItemLabelAppl" location="component://product/webapp/facility/inventory/InventoryForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -936,8 +1041,34 @@ <widgets> <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> <decorator-section name="body"> - <include-form name="FindPhysicalInventory" location="component://product/webapp/facility/facility/FacilityForms.xml"/> - <include-form name="ListPhysicalInventory" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleFindFacilityPhysicalInventory}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="FindPhysicalInventory" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleFindFacilityPhysicalInventory}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListPhysicalInventory" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml?rev=608662&r1=608661&r2=608662&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml Thu Jan 3 14:30:48 2008 @@ -32,11 +32,23 @@ <widgets> <decorator-screen name="CommonInventoryItemLabelsDecorator" location="${parameters.commonFacilityDecoratorLocation}"> <decorator-section name="body"> - <!--<label style="head1">${uiLabelMap.ProductFacilityGroup}</label>--> <container> <link target="EditInventoryItemLabel" text="${uiLabelMap.CommonNew}" style="buttontext"/> </container> - <include-form name="ListInventoryItemLabels" location="component://product/webapp/facility/labels/InventoryItemLabelForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleFindInventoryItemLabels}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListInventoryItemLabels" location="component://product/webapp/facility/labels/InventoryItemLabelForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -45,7 +57,7 @@ <screen name="EditInventoryItemLabelTypes"> <section> <actions> - <set field="titleProperty" value="PageTitleFindInventoryItemLabels"/> + <set field="titleProperty" value="PageTitleEditInventoryItemLabelTypes"/> <set field="headerItem" value="inventoryItemLabel"/> <set field="tabButtonItem" value="EditInventoryItemLabelTypes"/> <entity-condition entity-name="InventoryItemLabelType" list-name="inventoryItemLabelTypes"/> @@ -53,8 +65,34 @@ <widgets> <decorator-screen name="CommonInventoryItemLabelsDecorator" location="${parameters.commonFacilityDecoratorLocation}"> <decorator-section name="body"> - <include-form name="UpdateInventoryItemLabelTypes" location="component://product/webapp/facility/labels/InventoryItemLabelForms.xml"/> - <include-form name="AddInventoryItemLabelType" location="component://product/webapp/facility/labels/InventoryItemLabelForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditInventoryItemLabelTypes}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="UpdateInventoryItemLabelTypes" location="component://product/webapp/facility/labels/InventoryItemLabelForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleAddInventoryItemLabelTypes}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddInventoryItemLabelType" location="component://product/webapp/facility/labels/InventoryItemLabelForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -63,7 +101,7 @@ <screen name="EditInventoryItemLabel"> <section> <actions> - <set field="titleProperty" value="PageTitleEditFacilityGroup"/> + <set field="titleProperty" value="ProductInventoryItemLabel"/> <set field="headerItem" value="inventoryItemLabel"/> <set field="tabButtonItem" value="FindInventoryItemLabels"/> <set field="subTabButtonItem" value="EditInventoryItemLabel"/> @@ -77,18 +115,43 @@ <widgets> <decorator-screen name="CommonInventoryItemLabelDecorator" location="${parameters.commonFacilityDecoratorLocation}"> <decorator-section name="body"> - <include-form name="EditInventoryItemLabel" location="component://product/webapp/facility/labels/InventoryItemLabelForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.ProductInventoryItemLabel}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="EditInventoryItemLabel" location="component://product/webapp/facility/labels/InventoryItemLabelForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> <fail-widgets> <decorator-screen name="CommonInventoryItemLabelsDecorator" location="${parameters.commonFacilityDecoratorLocation}"> <decorator-section name="body"> - <label style="head1">${uiLabelMap.ProductInventoryItemLabel}</label> <container> <link target="EditInventoryItemLabel" text="${uiLabelMap.CommonNew}" style="buttontext"/> </container> - <include-form name="EditInventoryItemLabel" location="component://product/webapp/facility/labels/InventoryItemLabelForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.ProductInventoryItemLabel}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="EditInventoryItemLabel" location="component://product/webapp/facility/labels/InventoryItemLabelForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </fail-widgets> @@ -111,8 +174,34 @@ <decorator-screen name="CommonInventoryItemLabelDecorator" location="${parameters.commonFacilityDecoratorLocation}"> <decorator-section name="body"> <container><label style="head2">${uiLabelMap.CommonType}: ${inventoryItemLabelType.description} [${inventoryItemLabelType.inventoryItemLabelTypeId}]</label></container> - <include-form name="UpdateInventoryItemLabelAppls" location="component://product/webapp/facility/labels/InventoryItemLabelForms.xml"/> - <include-form name="AddInventoryItemLabelAppl" location="component://product/webapp/facility/labels/InventoryItemLabelForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditInventoryItemLabelAppls}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="UpdateInventoryItemLabelAppls" location="component://product/webapp/facility/labels/InventoryItemLabelForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleAddInventoryItemLabelAppls}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddInventoryItemLabelAppl" location="component://product/webapp/facility/labels/InventoryItemLabelForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |