svn commit: r612998 - in /ofbiz/trunk/applications: order/config/OrderUiLabels.pro
Locked
svn commit: r612998 - in /ofbiz/trunk/applications: order/config/OrderUiLabels.pro
 
|
Author: mrisaliti
Date: Thu Jan 17 14:45:32 2008 New Revision: 612998 URL: http://svn.apache.org/viewvc?rev=612998&view=rev Log: Reports forms (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1545) Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.properties ofbiz/trunk/applications/order/config/OrderUiLabels_it.properties ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.properties?rev=612998&r1=612997&r2=612998&view=diff ============================================================================== --- ofbiz/trunk/applications/order/config/OrderUiLabels.properties (original) +++ ofbiz/trunk/applications/order/config/OrderUiLabels.properties Thu Jan 17 14:45:32 2008 @@ -397,6 +397,14 @@ FormFieldTitle_visitorId=Visitor Id FormFieldTitle_webSiteId=Web Site Id FormFieldTitle_salesTaxAmount=Sales Tax Amount +FormFieldTitle_totalQuantityOrdered=Total Quantity Ordered +FormFieldTitle_totalQuantityOpen=Total Quantity Open +FormFieldTitle_totalCostPrice=Total Cost Price +FormFieldTitle_totalListPrice=Total List Price +FormFieldTitle_totalRetailPrice=Total Retail Price +FormFieldTitle_totalDiscount=Total Discount +FormFieldTitle_totalMarkup=Total Markup +FormFieldTitle_totalPercentMarkup=Total Percent Markup OrderAddCode=Add Code OrderAddNote=Add Note OrderAddOrderToShoppingList=Add Order Items to Shopping List @@ -744,11 +752,13 @@ OrderRemaining=Remaining OrderRemainingSubTotal=Remaining SubTotal OrderRemoveSelected=Remove Selected +OrderReportFromDate=From Date<br/>(Order Date>=) OrderReportOpenOrderItems=Open Order Items Report OrderReportPurchasesByOrganization=Purchases by Organization Report OrderReportPurchasesByPaymentMethod=Purchases by Payment Method Report OrderReportPurchasesByProduct=Purchases by Product Report OrderReportSalesByStore=Sales by Store Report +OrderReportThruDate=Thru Date<br/>(Order Date<) OrderReports=Order Reports OrderRequest=Request OrderRequestCreatedDate=Created Date Modified: ofbiz/trunk/applications/order/config/OrderUiLabels_it.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels_it.properties?rev=612998&r1=612997&r2=612998&view=diff ============================================================================== --- ofbiz/trunk/applications/order/config/OrderUiLabels_it.properties (original) +++ ofbiz/trunk/applications/order/config/OrderUiLabels_it.properties Thu Jan 17 14:45:32 2008 @@ -595,11 +595,13 @@ OrderRemainingSubTotal = SubTotale Rimanenza OrderRemoveSelected=Rimuovi Selezionati OrderReports=Stampe Ordini +OrderReportFromDate=Dalla Data<br/>(Data Ordine>=) OrderReportOpenOrderItems=Report Righe Ordine Aperte OrderReportPurchasesByOrganization=Report Acquisti per Organizzazione OrderReportPurchasesByPaymentMethod=Report Acquisti per Metodo di Pagamento OrderReportPurchasesByProduct=Report Acquisti per Prodotto OrderReportSalesByStore=Report Vendite per Negozio +OrderReportThruDate=Fino alla Data<br/>(Data Ordine<) OrderRequest = Richiesta OrderRequestCreatedDate=Data Creazione OrderRequestDate=Data Richiesta @@ -968,4 +970,12 @@ FormFieldTitle_productPromoCodeId=Codice Promozione Prodotto FormFieldTitle_facilityQuantityOnHandTotal=Totale Quantit\u00e0 Disponibile Stabilimento FormFieldTitle_quantityTotal=Quantit\u00e0 Totale -FormFieldTitle_amountTotal=Importo Totale \ No newline at end of file +FormFieldTitle_amountTotal=Importo Totale +FormFieldTitle_totalQuantityOrdered=Totale Quantit\u00e0 Ordinata +FormFieldTitle_totalQuantityOpen=Totale Quantit\u00e0 Aperta +FormFieldTitle_totalCostPrice=Totale Prezzo di Costo +FormFieldTitle_totalListPrice=Totale Prezzo di Listino +FormFieldTitle_totalRetailPrice=Totale Prezzo al Dettaglio +FormFieldTitle_totalDiscount=Totale Sconto +FormFieldTitle_totalMarkup=Totale Markup Calcolato +FormFieldTitle_totalPercentMarkup=Totale Markup Percentuale \ No newline at end of file Modified: ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml?rev=612998&r1=612997&r2=612998&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml Thu Jan 17 14:45:32 2008 @@ -21,8 +21,7 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> <form name="OrderPurchaseReportOptions" type="single" title="" - default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"> - + header-row-style="header-row" default-table-style="basic-table"> <field name="productStoreId"> <drop-down allow-empty="false"> <option key="" description="- ${uiLabelMap.CommonAny} -"/> @@ -60,21 +59,20 @@ </field> </form> <form name="OrderPurchaseProductOptions" type="single" target="OrderPurchaseReportProduct.pdf" title="" extends="OrderPurchaseReportOptions"> - <field name="fromOrderDate" title="${uiLabelMap.CommonFromDate} (${uiLabelMap.OrderDate}>=)"><date-time type="timestamp"/></field> - <field name="thruOrderDate" title="${uiLabelMap.CommonThruDate} (${uiLabelMap.OrderDate}<)"><date-time type="timestamp"/></field> - + <field name="fromOrderDate" title="${uiLabelMap.OrderReportFromDate}"><date-time type="timestamp"/></field> + <field name="thruOrderDate" title="${uiLabelMap.OrderReportThruDate}"><date-time type="timestamp"/></field> <field name="submitButton" title="${uiLabelMap.CommonRun}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="OrderPurchasePaymentOptions" type="single" target="OrderPurchaseReportPayment.pdf" title="" extends="OrderPurchaseReportOptions"> - <field name="fromOrderDate" title="${uiLabelMap.CommonFromDate} (${uiLabelMap.OrderDate}>=)"><date-time type="timestamp"/></field> - <field name="thruOrderDate" title="${uiLabelMap.CommonThruDate} (${uiLabelMap.OrderDate}<)"><date-time type="timestamp"/></field> + <field name="fromOrderDate" title="${uiLabelMap.OrderReportFromDate}"><date-time type="timestamp"/></field> + <field name="thruOrderDate" title="${uiLabelMap.OrderReportThruDate}"><date-time type="timestamp"/></field> <field name="submitButton" title="${uiLabelMap.CommonRun}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <!-- form for generating a report of total product sales (quantity and value) --> <form name="SalesByStoreReport" type="single" target="SalesByStoreReport.pdf" title="" - default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"> + header-row-style="header-row" default-table-style="basic-table"> <field name="productStoreId"> <drop-down allow-empty="false"> <option key="" description="- ${uiLabelMap.CommonSelectAny} -"/> @@ -101,7 +99,7 @@ <!-- form for generating a report of open order items --> <form name="OpenOrderItemsReport" type="single" target="OpenOrderItemsReport" title="" - default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"> + header-row-style="header-row" default-table-style="basic-table"> <field name="productStoreId"> <drop-down allow-empty="false"> <option key="" description="- ${uiLabelMap.CommonSelectAny} -"/> @@ -124,14 +122,14 @@ </entity-options> </drop-down> </field> - <field name="fromOrderDate" title="${uiLabelMap.CommonFromDate} (${uiLabelMap.OrderDate}>=)"><date-time type="timestamp"/></field> - <field name="thruOrderDate" title="${uiLabelMap.CommonThruDate} (${uiLabelMap.OrderDate}<)"><date-time type="timestamp"/></field> + <field name="fromOrderDate" title="${uiLabelMap.OrderReportFromDate}"><date-time type="timestamp"/></field> + <field name="thruOrderDate" title="${uiLabelMap.OrderReportThruDate}"><date-time type="timestamp"/></field> <field name="submitButton" title="${uiLabelMap.CommonRun}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <!-- list open order items --> <form name="OpenOrderItemsList" type="list" list-name="orderItemList" - default-title-style="tableheadtext" default-widget-style="tabletext" paginate-target="OpenOrderItemsReport"> + odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="OpenOrderItemsReport"> <field name="orderDate" title="${uiLabelMap.OrderDate}"><display/></field> <field name="orderId" title="${uiLabelMap.OrderOrderId}" widget-style="buttontext"> <hyperlink target="orderview?orderId=${orderId}" description="${orderId}"/> @@ -152,11 +150,11 @@ <field name="percentMarkup" title="${uiLabelMap.PercentageMarkup}"><display/></field> </form> - <form name="OpenOrderItemsTotal" type="list" list-name="totalAmountList" default-title-style="tableheadtext" - default-widget-style="tabletext"> - <field name="" title="Total"><display/></field> - <field name="totalquantityOrdered"><display/></field> - <field name="totalquantityOpen"><display/></field> + <form name="OpenOrderItemsTotal" type="list" list-name="totalAmountList" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + <field name="" title="${uiLabelMap.CommonTotal}"><display/></field> + <field name="totalQuantityOrdered"><display/></field> + <field name="totalQuantityOpen"><display/></field> <field name="totalCostPrice"><display/></field> <field name="totalListPrice"><display/></field> <field name="totalRetailPrice"><display/></field> @@ -167,7 +165,7 @@ <!-- form for generating a report of total product purchases (quantity and value) --> <form name="PurchasesByOrganizationReport" type="single" target="PurchasesByOrganizationReport.pdf" title="" - default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"> + header-row-style="header-row" default-table-style="basic-table"> <field name="fromPartyId" title="${uiLabelMap.AccountingFromParty}"> <drop-down allow-empty="false"> <option key="" description="- ${uiLabelMap.CommonSelectAny} -"/> @@ -195,4 +193,4 @@ <field name="thruOrderDate" title="${uiLabelMap.CommonThruDate}"><date-time type="timestamp"/></field> <field name="submitButton" title="${uiLabelMap.CommonRun}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> -</forms> +</forms> \ No newline at end of file Modified: ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml?rev=612998&r1=612997&r2=612998&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml Thu Jan 17 14:45:32 2008 @@ -23,9 +23,8 @@ <screen name="OrderPurchaseReportOptions"> <section> <actions> - <set field="titleProperty" value="OrderPurchaseReportOptions"/> + <set field="titleProperty" value="OrderReports"/> <set field="headerItem" value="reports"/> - <!-- <set field="titleProperty" value=""/> --> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -36,15 +35,23 @@ <container style="lefthalf"> <container style="screenlet"> <container style="screenlet-title-bar"> - <label style="boxhead" text="">${uiLabelMap.OrderReportSalesByStore}</label> + <container style="head4"> + <label text="${uiLabelMap.OrderReportSalesByStore}"/> + </container> </container> <container style="screenlet-body"> - <include-form name="SalesByStoreReport" location="component://order/widget/ordermgr/ReportForms.xml"/> + <section> + <widgets> + <include-form name="SalesByStoreReport" location="component://order/widget/ordermgr/ReportForms.xml"/> + </widgets> + </section> </container> </container> <container style="screenlet"> <container style="screenlet-title-bar"> - <label style="boxhead" text="">${uiLabelMap.OrderReportOpenOrderItems}</label> + <container style="head4"> + <label text="${uiLabelMap.OrderReportOpenOrderItems}"/> + </container> </container> <container style="screenlet-body"> <include-form name="OpenOrderItemsReport" location="component://order/widget/ordermgr/ReportForms.xml"/> @@ -52,7 +59,9 @@ </container> <container style="screenlet"> <container style="screenlet-title-bar"> - <label style="boxhead" text="">${uiLabelMap.OrderReportPurchasesByOrganization}</label> + <container style="head4"> + <label text="${uiLabelMap.OrderReportPurchasesByOrganization}"/> + </container> </container> <container style="screenlet-body"> <include-form name="PurchasesByOrganizationReport" location="component://order/widget/ordermgr/ReportForms.xml"/> @@ -62,7 +71,9 @@ <container style="righthalf"> <container style="screenlet"> <container style="screenlet-title-bar"> - <label style="boxhead" text="">${uiLabelMap.OrderReportPurchasesByProduct}</label> + <container style="head4"> + <label text="${uiLabelMap.OrderReportPurchasesByProduct}"/> + </container> </container> <container style="screenlet-body"> <include-form name="OrderPurchaseProductOptions" location="component://order/widget/ordermgr/ReportForms.xml"/> @@ -70,12 +81,14 @@ </container> <container style="screenlet"> <container style="screenlet-title-bar"> - <label style="boxhead" text="">${uiLabelMap.OrderReportPurchasesByPaymentMethod}</label> + <container style="head4"> + <label text="${uiLabelMap.OrderReportPurchasesByPaymentMethod}"/> + </container> </container> <container style="screenlet-body"> <include-form name="OrderPurchasePaymentOptions" location="component://order/widget/ordermgr/ReportForms.xml"/> </container> - </container> + </container> </container> </decorator-section> </decorator-screen> @@ -86,10 +99,10 @@ <section> <actions> <set field="titleProperty" value="OrderReportPurchasesByPaymentMethod"/> - <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <entity-condition entity-name="OrderPurchasePaymentSummary" list-name="orderPurchasePaymentSummaryList"> <condition-list combine="and"> @@ -218,9 +231,34 @@ <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <label style="head2" text="${uiLabelMap.OrderReportOpenOrderItems} - ${productStore.storeName}"/> - <include-form name="OpenOrderItemsList" location="component://order/widget/ordermgr/ReportForms.xml"/> - <include-form name="OpenOrderItemsTotal" location="component://order/widget/ordermgr/ReportForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.OrderReportOpenOrderItems} - ${productStore.storeName}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="OpenOrderItemsList" location="component://order/widget/ordermgr/ReportForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.OrderReportOpenOrderItems}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="OpenOrderItemsTotal" location="component://order/widget/ordermgr/ReportForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -265,8 +303,4 @@ </widgets> </section> </screen> - - -</screens> - - +</screens> \ 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=612998&r1=612997&r2=612998&view=diff ============================================================================== --- ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties (original) +++ ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties Thu Jan 17 14:45:32 2008 @@ -40,6 +40,7 @@ AddSelectableFeature=Aggiungi Caratteristica Selezionabile AnyFeatureType=- Qualsiasi - ApplyToAll=Applica A Tutto +CalculatedMarkup=Markup Calcolato CatalogCompanyName=OFBiz: Gestione Cataloghi Categories=Categorie CategoryUploadImage=Carica Immagine Categoria @@ -286,6 +287,7 @@ PartyState=Stato/Provincia PartyToName=Al Nome PartyZipCode=C.A.P. +PercentageMarkup=Markup Percentuale ProductAbbrev=Abbr. ProductAbbreviation=Abbreviazione ProductAcceptUpsShipmentConfirmation=Accetta Conferma Spedizione UPS @@ -565,6 +567,7 @@ ProductDetailImage=Dettaglio Immagine ProductDetailScreen=Dettaglio Videata ProductDetailScreenMessage=per videate in altri files usare qualcosa simile a +ProductDiscount=Sconto ProductDL=DL ProductDropShipment=Spedizioni Conto Terzi ProductDuplicateProduct=Duplica Prodotto |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |