svn commit: r995688 [1/3] - in /ofbiz/branches/jquery: ./ applications/content/config/ applications/content/script/or
Locked
svn commit: r995688 [1/3] - in /ofbiz/branches/jquery: ./ applications/content/config/ applications/content/script/or
 
|
Author: jleroux
Date: Fri Sep 10 07:26:12 2010 New Revision: 995688 URL: http://svn.apache.org/viewvc?rev=995688&view=rev Log: Merges the trunk at r995580 Added: ofbiz/branches/jquery/framework/webtools/widget/CacheForms.xml - copied unchanged from r995684, ofbiz/trunk/framework/webtools/widget/CacheForms.xml ofbiz/branches/jquery/framework/webtools/widget/StatsForms.xml - copied unchanged from r995684, ofbiz/trunk/framework/webtools/widget/StatsForms.xml Removed: ofbiz/branches/jquery/framework/webtools/webapp/webtools/cache/ ofbiz/branches/jquery/framework/webtools/webapp/webtools/performance/ ofbiz/branches/jquery/framework/webtools/webapp/webtools/service/services.ftl ofbiz/branches/jquery/framework/webtools/webapp/webtools/stats/ Modified: ofbiz/branches/jquery/ (props changed) ofbiz/branches/jquery/applications/content/config/ContentUiLabels.xml ofbiz/branches/jquery/applications/content/script/org/ofbiz/content/data/DataServices.xml ofbiz/branches/jquery/applications/content/servicedef/services_data.xml ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/controller.xml ofbiz/branches/jquery/applications/content/widget/content/ContentForms.xml ofbiz/branches/jquery/applications/content/widget/content/DataResourceForms.xml ofbiz/branches/jquery/applications/content/widget/content/DataResourceScreens.xml ofbiz/branches/jquery/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunSimpleEvents.xml ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml ofbiz/branches/jquery/applications/order/entitydef/entitymodel.xml ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (props changed) ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy ofbiz/branches/jquery/applications/order/webapp/ordermgr/return/returnReportBody.fo.ftl ofbiz/branches/jquery/applications/party/config/PartyEntityLabels.xml ofbiz/branches/jquery/applications/party/config/PartyUiLabels.xml ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props changed) ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/controller.xml ofbiz/branches/jquery/applications/party/widget/partymgr/PartyForms.xml ofbiz/branches/jquery/applications/party/widget/partymgr/PartyScreens.xml ofbiz/branches/jquery/applications/product/entitydef/entitymodel.xml ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml (props changed) ofbiz/branches/jquery/applications/product/servicedef/services_feature.xml ofbiz/branches/jquery/applications/product/webapp/facility/facility/EditContactMech.ftl ofbiz/branches/jquery/applications/product/webapp/facility/facility/Picklist.fo.ftl ofbiz/branches/jquery/applications/workeffort/entitydef/entitymodel_view.xml ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilXml.java ofbiz/branches/jquery/framework/common/config/CommonEntityLabels.xml ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml (props changed) ofbiz/branches/jquery/framework/example/webapp/example/WEB-INF/controller.xml ofbiz/branches/jquery/framework/example/widget/example/ExampleFeatureScreens.xml ofbiz/branches/jquery/framework/example/widget/example/ExampleForms.xml ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleLookupForms.xml ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleLookupScreens.xml ofbiz/branches/jquery/framework/images/webapp/images/ecommain.css ofbiz/branches/jquery/framework/images/webapp/images/selectall.js ofbiz/branches/jquery/framework/webapp/dtd/site-conf.xsd ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java ofbiz/branches/jquery/framework/webtools/config/WebtoolsUiLabels.xml ofbiz/branches/jquery/framework/webtools/data/helpdata/HELP_WEBTOOLS_main.xml ofbiz/branches/jquery/framework/webtools/webapp/webtools/WEB-INF/actions/cache/FindUtilCache.groovy ofbiz/branches/jquery/framework/webtools/webapp/webtools/WEB-INF/actions/cache/FindUtilCacheElements.groovy ofbiz/branches/jquery/framework/webtools/webapp/webtools/WEB-INF/actions/entity/CheckDb.groovy ofbiz/branches/jquery/framework/webtools/webapp/webtools/WEB-INF/actions/service/Services.groovy ofbiz/branches/jquery/framework/webtools/webapp/webtools/service/threads.ftl ofbiz/branches/jquery/framework/webtools/widget/CacheScreens.xml ofbiz/branches/jquery/framework/webtools/widget/EntityForms.xml ofbiz/branches/jquery/framework/webtools/widget/EntityScreens.xml ofbiz/branches/jquery/framework/webtools/widget/LogScreens.xml ofbiz/branches/jquery/framework/webtools/widget/Menus.xml ofbiz/branches/jquery/framework/webtools/widget/ServiceForms.xml ofbiz/branches/jquery/framework/webtools/widget/ServiceScreens.xml ofbiz/branches/jquery/framework/webtools/widget/StatsScreens.xml ofbiz/branches/jquery/framework/widget/dtd/widget-form.xsd ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/ModelWidget.java ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/FormFactory.java ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/menu/MenuFactory.java ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/screen/ScreenFactory.java ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/tree/TreeFactory.java ofbiz/branches/jquery/framework/widget/templates/foFormMacroLibrary.ftl ofbiz/branches/jquery/rc.ofbiz ofbiz/branches/jquery/rc.ofbiz.for.debian ofbiz/branches/jquery/specialpurpose/ebaystore/lib/ (props changed) ofbiz/branches/jquery/specialpurpose/ecommerce/data/DemoProduct.xml ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (props changed) ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy (props changed) ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (props changed) ofbiz/branches/jquery/startofbiz.bat ofbiz/branches/jquery/startofbiz.sh ofbiz/branches/jquery/startofbizBoth.bat ofbiz/branches/jquery/startofbizPos.bat ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/css/help.css Propchange: ofbiz/branches/jquery/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Sep 10 07:26:12 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310:921280-927264 -/ofbiz/trunk:951708-991996 +/ofbiz/trunk:951708-995684 Modified: ofbiz/branches/jquery/applications/content/config/ContentUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/config/ContentUiLabels.xml?rev=995688&r1=995687&r2=995688&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/config/ContentUiLabels.xml (original) +++ ofbiz/branches/jquery/applications/content/config/ContentUiLabels.xml Fri Sep 10 07:26:12 2010 @@ -2521,6 +2521,7 @@ <property key="FormFieldTitle_decoratorContentId"> <value xml:lang="da">Dekoratør indholds id</value> <value xml:lang="en">Decorator Content Id</value> + <value xml:lang="fr">Ressource de décorateur</value> <value xml:lang="it">Decoratore contenuto</value> <value xml:lang="zh">修饰ç¨åºå 容æ è¯</value> </property> @@ -3724,6 +3725,10 @@ <value xml:lang="th">à¹à¸à¸´à¹à¸¡à¹à¸«à¸¥à¹à¸à¸à¸µà¹à¸¡à¸²à¸à¸à¸à¸à¹à¸à¸¡à¸¹à¸¥</value> <value xml:lang="zh">æ°å»ºæ°æ®èµæº</value> </property> + <property key="PageTitleAddDataResourceFromContent"> + <value xml:lang="en">Add DataResource From Content</value> + <value xml:lang="fr">Ajouter une ressource de données pour un contenu</value> + </property> <property key="PageTitleAddDataResourceText"> <value xml:lang="ar">إضاÙØ© Ùص Ù Ùرد ٠عÙÙ٠ات</value> <value xml:lang="da">Tilføj dataressource tekst</value> Modified: ofbiz/branches/jquery/applications/content/script/org/ofbiz/content/data/DataServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/script/org/ofbiz/content/data/DataServices.xml?rev=995688&r1=995687&r2=995688&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/script/org/ofbiz/content/data/DataServices.xml (original) +++ ofbiz/branches/jquery/applications/content/script/org/ofbiz/content/data/DataServices.xml Fri Sep 10 07:26:12 2010 @@ -75,6 +75,29 @@ under the License. <entity-one entity-name="DataResource" value-field="lookedUpValue"/> <remove-value value-field="lookedUpValue"/> </simple-method> + + <simple-method method-name="createDataResourceAndAssocToContent" short-description="Create a Data Resource and return the data resource type"> + <entity-one value-field="content" entity-name="Content"/> + <if-empty field="content"><add-error><fail-message message="${layoutEvents.content_empty}"/></add-error><check-errors/></if-empty> + + <set-service-fields service-name="createDataResource" to-map="dataResourceCtx" map="parameters"/> + <call-service service-name="createDataResource" in-map-name="dataResourceCtx"> + <result-to-field result-name="dataResource"/> + </call-service> + + <if-compare field="parameters.templateDataResource" operator="equals" value="Y"> + <set field="contentCtx.templateDataResourceId" from-field="parameters.dataResourceId" /> + <else> + <set field="contentCtx.dataResourceId" from-field="parameters.dataResourceId" /> + </else> + </if-compare> + <set field="contentCtx.contentId" from-field="parameters.contentId"/> + <call-service service-name="updateContent" in-map-name="contentCtx"/> + + <field-to-result field="parameters.contentId" result-name="contentId"/> + <if-compare field="dataResource.dataResourceTypeId" operator="equals" value="ELECTRONIC_TEXT"><return response-code="${dataResource.dataResourceTypeId}"/></if-compare> + <if-compare field="dataResource.dataResourceTypeId" operator="equals" value="IMAGE_OBJECT"><return response-code="${dataResource.dataResourceTypeId}"/></if-compare> + </simple-method> <!-- Methods for DataCategory --> <simple-method method-name="createDataCategory" short-description="Create a Data Category"> @@ -589,7 +612,7 @@ under the License. </if-empty> <if-compare field="parameters.dataResourceTypeId" value="LOCAL_FILE" operator="equals"> - <call-simple-method method-name="saveLocalFileDateResource"/> + <call-simple-method method-name="saveLocalFileDataResource"/> <return/> </if-compare> @@ -642,10 +665,15 @@ under the License. </simple-method> <!-- save LOCAL_FILE data --> - <simple-method method-name="saveLocalFileDateResource" short-description="Attach an uploaded file to a data resource as LOCAL_FILE"> + <simple-method method-name="saveLocalFileDataResource" short-description="Attach an uploaded file to a data resource as LOCAL_FILE"> <entity-one entity-name="DataResource" value-field="dataResource"/> <if-empty field="dataResource"> <add-error><fail-message message="No data resource found for ID: [${parameters.dataResourceId}]"/></add-error> + <else> + <if-not-empty field="dataResource.objectInfo"> + <set field="isUpdate" value="Y"/> + </if-not-empty> + </else> </if-empty> <if> <condition> Modified: ofbiz/branches/jquery/applications/content/servicedef/services_data.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/servicedef/services_data.xml?rev=995688&r1=995687&r2=995688&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/servicedef/services_data.xml (original) +++ ofbiz/branches/jquery/applications/content/servicedef/services_data.xml Fri Sep 10 07:26:12 2010 @@ -38,6 +38,14 @@ <attribute name="dataResource" type="org.ofbiz.entity.GenericValue" mode="OUT" optional="true"/> <override name="objectInfo" allow-html="safe"/> </service> + <service name="createDataResourceAndAssocToContent" default-entity-name="DataResource" engine="simple" + location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="createDataResourceAndAssocToContent" auth="true"> + <description>Create a DataResource and link this data to the content present</description> + <permission-service service-name="genericDataResourcePermission" main-action="CREATE"/> + <implements service="createDataResource" optional="true"/> + <attribute name="contentId" type="String" mode="INOUT" optional="false"/> + <attribute name="templateDataResource" type="String" mode="IN" optional="true"/> + </service> <service name="updateDataResource" engine="simple" default-entity-name="DataResource" auth="true" location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="updateDataResource"> <description>Update a DataResource</description> Modified: ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/controller.xml?rev=995688&r1=995687&r2=995688&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/controller.xml (original) +++ ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/controller.xml Fri Sep 10 07:26:12 2010 @@ -942,6 +942,7 @@ under the License. <request-map uri="AddDataResourceText"><security auth="true" https="true"/><response name="success" type="view" value="AddDataResourceText"/></request-map> <request-map uri="AddDataResourceUrl"><security auth="true" https="true"/><response name="success" type="view" value="EditDataResourceUrl"/></request-map> <request-map uri="AddDataResourceUpload"><security auth="true" https="true"/><response name="success" type="view" value="AddDataResourceUpload"/></request-map> + <request-map uri="AddDataResourceFromContent"><security auth="true" https="true"/><response name="success" type="view" value="AddDataResourceFromContent"/></request-map> <request-map uri="updateDataResourceText"> <security auth="true" https="true"/> <event invoke="updateDataResource" path="" type="service"/> @@ -962,6 +963,14 @@ under the License. <response name="IMAGE_OBJECT" type="view" value="UploadImage"/> <response name="error" type="view" value="AddDataResource"/> </request-map> + <request-map uri="createDataResourceAndAssocToContent"> + <security auth="true" https="true"/> + <event invoke="createDataResourceAndAssocToContent" path="" type="service"/> + <response name="success" type="view" value="EditContent"/> + <response name="ELECTRONIC_TEXT" type="view" value="EditElectronicText"/> + <response name="IMAGE_OBJECT" type="view" value="UploadImage"/> + <response name="error" type="view" value="AddDataResourceFromContent"/> + </request-map> <request-map uri="createDataResourceUpload"> <security auth="true" https="true"/> <event invoke="createDataResource" path="" type="service"/> @@ -1882,6 +1891,7 @@ under the License. <view-map name="AddDataResourceText" page="component://content/widget/content/DataResourceScreens.xml#AddDataResourceText" type="screen"/> <view-map name="AddDataResourceUrl" page="component://content/widget/content/DataResourceScreens.xml#AddDataResourceUrl" type="screen"/> <view-map name="AddDataResourceUpload" page="component://content/widget/content/DataResourceScreens.xml#AddDataResourceUpload" type="screen"/> + <view-map name="AddDataResourceFromContent" page="component://content/widget/content/DataResourceScreens.xml#AddDataResourceFromContent" type="screen"/> <view-map name="EditDataResourceText" page="component://content/widget/content/DataResourceScreens.xml#EditDataResourceText" type="screen"/> <view-map name="EditDataResourceUrl" page="component://content/widget/content/DataResourceScreens.xml#EditDataResourceUrl" type="screen"/> <view-map name="EditDataResourceUpload" page="component://content/widget/content/DataResourceScreens.xml#EditDataResourceUpload" type="screen"/> Modified: ofbiz/branches/jquery/applications/content/widget/content/ContentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/widget/content/ContentForms.xml?rev=995688&r1=995687&r2=995688&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/widget/content/ContentForms.xml (original) +++ ofbiz/branches/jquery/applications/content/widget/content/ContentForms.xml Fri Sep 10 07:26:12 2010 @@ -137,6 +137,8 @@ under the License. <entity-one entity-name="StatusItem" value-field="currentStatus" auto-field-map="false"> <field-map field-name="statusId" from-field="currentValue.statusId"/> </entity-one> + <set field="dataResourceId" from-field="currentValue.dataResourceId"/> + <set field="templateDataResourceId" from-field="currentValue.templateDataResourceId"/> </actions> <alt-target use-when="currentValue==null" target="createContent"/> <auto-fields-entity entity-name="Content"/> @@ -150,20 +152,36 @@ under the License. </entity-options> </drop-down> </field> - <field name="dataResourceId"> + <field name="dataResourceId" use-when="dataResourceId != null"> <lookup target-form-name="LookupDataResource"> <sub-hyperlink link-style="buttontext" target="EditDataResource" description="${uiLabelMap.ContentGoToDataResource}"> <parameter param-name="dataResourceId" from-field="currentValue.dataResourceId"/> </sub-hyperlink> </lookup> </field> - <field name="templateDataResourceId"> + <field name="dataResourceId" use-when="dataResourceId == null "> + <lookup target-form-name="LookupDataResource"> + <sub-hyperlink link-style="buttontext" target="AddDataResourceFromContent" description="${uiLabelMap.FormFieldTitle_newDataResourceId}"> + <parameter param-name="contentId" from-field="currentValue.contentId"/> + <parameter param-name="template" value="N"/> + </sub-hyperlink> + </lookup> + </field> + <field name="templateDataResourceId" use-when="templateDataResourceId != null"> <lookup target-form-name="LookupDataResource"> <sub-hyperlink link-style="buttontext" target="EditDataResource" description="${uiLabelMap.ContentGoToDataResource}"> <parameter param-name="dataResourceId" from-field="currentValue.templateDataResourceId"/> </sub-hyperlink> </lookup> </field> + <field name="templateDataResourceId" use-when="templateDataResourceId == null"> + <lookup target-form-name="LookupDataResource"> + <sub-hyperlink link-style="buttontext" target="AddDataResourceFromContent" description="${uiLabelMap.FormFieldTitle_newDataResourceId}"> + <parameter param-name="contentId" from-field="currentValue.contentId"/> + <parameter param-name="templateDataResource" value="Y"/> + </sub-hyperlink> + </lookup> + </field> <field name="ownerContentId"><lookup target-form-name="LookupContent"/></field> <field name="decoratorContentId"> <lookup target-form-name="LookupContent"> Modified: ofbiz/branches/jquery/applications/content/widget/content/DataResourceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/widget/content/DataResourceForms.xml?rev=995688&r1=995687&r2=995688&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/widget/content/DataResourceForms.xml (original) +++ ofbiz/branches/jquery/applications/content/widget/content/DataResourceForms.xml Fri Sep 10 07:26:12 2010 @@ -206,6 +206,12 @@ under the License. <field name="createButton" title="${uiLabelMap.CommonCreate}" use-when="currentValue==null" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="updateButton" title="${uiLabelMap.CommonUpdate}" use-when="currentValue!=null" widget-style="smallSubmit"><submit button-type="button"/></field> </form> + + <form name="AddDataResourceFromContent" extends="AddDataResource" target="createDataResourceAndAssocToContent" > + <field name="contentId"><hidden value="${parameters.contentId}"/></field> + <field name="templateDataResource"><hidden value="${parameters.templateDataResource}"/></field> + </form> + <form name="ListContentsAssociatedToDataResource" type="list" list-name="contentRecords" default-widget-style="display" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> Modified: ofbiz/branches/jquery/applications/content/widget/content/DataResourceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/widget/content/DataResourceScreens.xml?rev=995688&r1=995687&r2=995688&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/widget/content/DataResourceScreens.xml (original) +++ ofbiz/branches/jquery/applications/content/widget/content/DataResourceScreens.xml Fri Sep 10 07:26:12 2010 @@ -288,6 +288,23 @@ under the License. </widgets> </section> </screen> + <screen name="AddDataResourceFromContent"> + <section> + <actions> + <set field="titleProperty" value="PageTitleAddDataResourceFromContent"/> + <set field="labelTitleProperty" value="PageTitleAddDataResourceFromContent"/> + <set field="headerItem" value="DataResource"/> + <set field="tabButtonItem" value="adddataresource"/> + </actions> + <widgets> + <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <include-form name="AddDataResourceFromContent" location="component://content/widget/content/DataResourceForms.xml"/> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> <screen name="EditDataResourceText"> <section> <actions> Modified: ofbiz/branches/jquery/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunSimpleEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunSimpleEvents.xml?rev=995688&r1=995687&r2=995688&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunSimpleEvents.xml (original) +++ ofbiz/branches/jquery/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunSimpleEvents.xml Fri Sep 10 07:26:12 2010 @@ -159,5 +159,16 @@ under the License. <call-service service-name="addProductionRunRoutingTask" in-map-name="context"> </call-service> </simple-method> + <simple-method method-name="createProductionRun" short-description="Based on selected options, calls one of the specialized services to create a production run."> + <if-compare field="parameters.createDependentProductionRuns" operator="equals" value="Y"> + <return response-code="createProductionRunsForProductBom"/> + <else> + <set field="parameters.pRQuantity" from-field="parameters.quantity" type="BigDecimal"/> + <field-to-request field="parameters.quantity" request-name="pRQuantity"/> + <return response-code="createProductionRunSingle"/> + </else> + </if-compare> + </simple-method> + </simple-methods> Modified: ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml?rev=995688&r1=995687&r2=995688&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml (original) +++ ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml Fri Sep 10 07:26:12 2010 @@ -448,10 +448,22 @@ under the License. </request-map> <request-map uri="createProductionRun"> <security https="true" auth="true"/> + <event type="simple" path="component://manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunSimpleEvents.xml" invoke="createProductionRun"/> + <response name="createProductionRunsForProductBom" type="request" value="createProductionRunsForProductBom"/> + <response name="createProductionRunSingle" type="request" value="createProductionRunSingle"/> + </request-map> + <request-map uri="createProductionRunsForProductBom"> + <security https="true" auth="true"/> <event type="service" invoke="createProductionRunsForProductBom"/> <response name="success" type="view" value="EditProductionRun"/> <response name="error" type="view" value="CreateProductionRun"/> </request-map> + <request-map uri="createProductionRunSingle"> + <security https="true" auth="true"/> + <event type="service" invoke="createProductionRun"/> + <response name="success" type="view" value="EditProductionRun"/> + <response name="error" type="view" value="CreateProductionRun"/> + </request-map> <request-map uri="ShowProductionRun"> <security https="true" auth="true"/> <event type="groovy" path="component://manufacturing/webapp/manufacturing/jobshopmgt/" invoke="ShowProductionRun.groovy"/> Modified: ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml?rev=995688&r1=995687&r2=995688&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml (original) +++ ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml Fri Sep 10 07:26:12 2010 @@ -35,6 +35,12 @@ under the License. <field name="routingId" title="${uiLabelMap.ManufacturingRoutingId}"><lookup target-form-name="LookupRouting" size="16"/></field> <field name="workEffortName" title="${uiLabelMap.ManufacturingProductionRunName}"><text size="30"/></field> <field name="description" title="${uiLabelMap.CommonDescription}"><text size="50"/></field> + <field name="createDependentProductionRuns"> + <drop-down allow-empty="false"> + <option key="N" description="${uiLabelMap.CommonNo}"/> + <option key="Y" description="${uiLabelMap.CommonYes}"/> + </drop-down> + </field> <field name="submitButton" title="${uiLabelMap.CommonSubmit}"> <submit button-type="button"/> </field> @@ -135,6 +141,7 @@ under the License. <form name="ListProductionRunInventoryItems" type="list" title="" list-name="inventoryItems" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <row-actions> + <entity-one entity-name="InventoryItem" value-field="inventoryItem"/> <entity-condition entity-name="InventoryItemDetail" list="inventoryItemDetails"> <condition-expr field-name="inventoryItemId" operator="equals" from-field="inventoryItemId"/> <order-by field-name="inventoryItemDetailSeqId"/> @@ -146,10 +153,11 @@ under the License. <parameter param-name="inventoryItemId"/> </hyperlink> </field> - <field name="lotId" entry-name="inventoryItemId"><display-entity entity-name="InventoryItem" key-field-name="inventoryItemId" description="${lotId} "/></field> - <field name="unitCost" entry-name="inventoryItemId"><display-entity entity-name="InventoryItem" key-field-name="inventoryItemId" description="${unitCost} "/></field> + <field name="lotId" map-name="inventoryItem"><display/></field> + <field name="statusId" map-name="inventoryItem"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field> + <field name="unitCost" map-name="inventoryItem"><display/></field> <field name="quantity" entry-name="quantityOnHandDiff"><display/></field> - <field name="creationDate" entry-name="inventoryItemId"><display-entity entity-name="InventoryItem" key-field-name="inventoryItemId" description="${datetimeReceived}"/></field> + <field name="datetimeReceived" map-name="inventoryItem"><display/></field> </form> <form name="ViewListProductionRunRoutingTasks" type="list" title="" list-name="productionRunRoutingTasks" Modified: ofbiz/branches/jquery/applications/order/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/entitydef/entitymodel.xml?rev=995688&r1=995687&r2=995688&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/entitydef/entitymodel.xml (original) +++ ofbiz/branches/jquery/applications/order/entitydef/entitymodel.xml Fri Sep 10 07:26:12 2010 @@ -2377,6 +2377,7 @@ under the License. <field name="destinationFacilityId" type="id"></field> <field name="needsInventoryReceive" type="indicator"></field> <field name="currencyUomId" type="id-ne"></field> + <field name="supplierRmaId" type="id"></field> <prim-key field="returnId"/> <relation type="one" fk-name="RTN_HEAD_TYPE" rel-entity-name="ReturnHeaderType"> <key-map field-name="returnHeaderTypeId"/> Propchange: ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Sep 10 07:26:12 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CheckoutMapProcs.xml:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:921280-927264 -/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-991996 +/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-995684 Modified: ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java?rev=995688&r1=995687&r2=995688&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java (original) +++ ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java Fri Sep 10 07:26:12 2010 @@ -260,7 +260,7 @@ public class OrderReturnServices { uiLabelMap.addBottomResourceBundle("OrderUiLabels"); uiLabelMap.addBottomResourceBundle("CommonUiLabels"); - Map bodyParameters = UtilMisc.toMap("returnHeader", returnHeader, "returnItems", returnItems, "uiLabelMap", uiLabelMap, "locale", locale); + Map bodyParameters = UtilMisc.toMap("returnHeader", returnHeader, "returnItems", returnItems, "uiLabelMap", uiLabelMap, "locale", locale, "userLogin", userLogin); sendMap.put("bodyParameters", bodyParameters); sendMap.put("subject", productStoreEmail.getString("subject")); @@ -269,6 +269,7 @@ public class OrderReturnServices { sendMap.put("sendCc", productStoreEmail.get("ccAddress")); sendMap.put("sendBcc", productStoreEmail.get("bccAddress")); sendMap.put("sendTo", emailAddress); + sendMap.put("partyId", returnHeader.getString("fromPartyId")); sendMap.put("userLogin", userLogin); Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy?rev=995688&r1=995687&r2=995688&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy (original) +++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy Fri Sep 10 07:26:12 2010 @@ -24,12 +24,21 @@ import org.ofbiz.entity.condition.Entity import org.ofbiz.entity.condition.EntityOperator; import org.ofbiz.party.contact.*; - -orderId = parameters.get("orderId"); -partyId = parameters.get("fromPartyId"); -returnId = parameters.get("returnId"); - +if (parameters.userLogin) { + userLogin = parameters.userLogin; + context.userLogin = userLogin; +} returnHeader = null; +orderId = parameters.orderId; + +if (parameters.returnHeader) { + returnHeader = parameters.returnHeader; + returnId = returnHeader.returnId; + partyId = returnHeader.fromPartyId; +} else { + partyId = parameters.fromPartyId; + returnId = parameters.returnId; +} if (returnId) { returnHeader = delegator.findByPrimaryKey("ReturnHeader", [returnId : returnId]); if (returnHeader) { @@ -95,7 +104,10 @@ context.orderHeader = orderHeader; // from address -addresses = ContactMechWorker.getPartyPostalAddresses(request, partyId, "_NA_"); +addresses = null; +if (context.request) { + addresses = ContactMechWorker.getPartyPostalAddresses(request, partyId, "_NA_"); +} context.addresses = addresses; if (returnHeader) { Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/return/returnReportBody.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/return/returnReportBody.fo.ftl?rev=995688&r1=995687&r2=995688&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/webapp/ordermgr/return/returnReportBody.fo.ftl (original) +++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/return/returnReportBody.fo.ftl Fri Sep 10 07:26:12 2010 @@ -28,6 +28,7 @@ under the License. <#if returnAdjustment.comments?has_content>${returnAdjustment.comments}<#else>${returnAdjustment.description?default("N/A")}</#if> </fo:block> </fo:table-cell> + <fo:table-cell><fo:block></fo:block></fo:table-cell> <fo:table-cell padding="1mm" text-align="right"><fo:block><@ofbizCurrency amount=returnAdjustment.amount isoCode=returnHeader.currencyUomId/></fo:block></fo:table-cell> </fo:table-row> <#if returnAdjustment.amount?has_content> @@ -40,7 +41,8 @@ under the License. <fo:table border-style="solid" border-width="0.2pt" width="7.25in" height="5in"> <fo:table-column column-width="0.875in"/> <fo:table-column column-width="0.875in"/> - <fo:table-column column-width="3.25in"/> + <fo:table-column column-width="2.25in"/> + <fo:table-column column-width="1.0in"/> <fo:table-column column-width="0.5in"/> <fo:table-column column-width="0.875in"/> <fo:table-column column-width="0.875in"/> @@ -50,6 +52,7 @@ under the License. <fo:table-cell padding="1mm" border-style="solid" border-width="0.2pt" display-align="after"><fo:block>${uiLabelMap.OrderOrderId}</fo:block></fo:table-cell> <fo:table-cell padding="1mm" border-style="solid" border-width="0.2pt" display-align="after"><fo:block>${uiLabelMap.ProductProductId}</fo:block></fo:table-cell> <fo:table-cell padding="1mm" border-style="solid" border-width="0.2pt" display-align="after"><fo:block>${uiLabelMap.CommonDescription}</fo:block></fo:table-cell> + <fo:table-cell padding="1mm" border-style="solid" border-width="0.2pt" display-align="after"><fo:block>${uiLabelMap.CommonReason}</fo:block></fo:table-cell> <fo:table-cell padding="1mm" border-style="solid" border-width="0.2pt" display-align="after"><fo:block>${uiLabelMap.OrderQty}</fo:block></fo:table-cell> <fo:table-cell padding="1mm" border-style="solid" border-width="0.2pt" display-align="after"><fo:block>${uiLabelMap.OrderUnitPrice}</fo:block></fo:table-cell> <fo:table-cell padding="1mm" border-style="solid" border-width="0.2pt" display-align="after"><fo:block>${uiLabelMap.OrderAmount}</fo:block></fo:table-cell> @@ -68,6 +71,7 @@ under the License. </fo:block> </fo:table-cell> <fo:table-cell padding="1mm"><fo:block wrap-option="wrap">${returnItem.description?if_exists}</fo:block></fo:table-cell> + <fo:table-cell padding="1mm" font-size="8pt"><fo:block><#if returnItem.returnReasonId?exists>${(returnItem.getRelatedOne("ReturnReason")).get("description",locale)?default(returnItem.returnReasonId)}</#if></fo:block></fo:table-cell> <fo:table-cell padding="1mm" text-align="right"><fo:block>${returnItem.returnQuantity}</fo:block></fo:table-cell> <fo:table-cell padding="1mm" text-align="right"><fo:block><@ofbizCurrency amount=returnItem.returnPrice isoCode=returnHeader.currencyUomId/></fo:block></fo:table-cell> <fo:table-cell padding="1mm" text-align="right"><fo:block><@ofbizCurrency amount=(returnItem.returnPrice * returnItem.returnQuantity) isoCode=returnHeader.currencyUomId/></fo:block></fo:table-cell> @@ -97,7 +101,8 @@ under the License. <fo:table space-before="5mm" font-size="10pt"> <fo:table-column column-width="0.875in"/> <fo:table-column column-width="0.875in"/> - <fo:table-column column-width="3.25in"/> + <fo:table-column column-width="2.25in"/> + <fo:table-column column-width="1.0in"/> <fo:table-column column-width="0.5in"/> <fo:table-column column-width="0.875in"/> <fo:table-column column-width="0.875in"/> @@ -107,6 +112,7 @@ under the License. <fo:table-cell/> <fo:table-cell/> <fo:table-cell/> + <fo:table-cell/> <fo:table-cell padding="1mm" border-style="solid" border-width="0.2pt"> <fo:block font-weight="bold" text-align="center">${uiLabelMap.CommonTotal}</fo:block> </fo:table-cell> Modified: ofbiz/branches/jquery/applications/party/config/PartyEntityLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/config/PartyEntityLabels.xml?rev=995688&r1=995687&r2=995688&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/config/PartyEntityLabels.xml (original) +++ ofbiz/branches/jquery/applications/party/config/PartyEntityLabels.xml Fri Sep 10 07:26:12 2010 @@ -1755,7 +1755,7 @@ <value xml:lang="de">Teilnehmer am Kalender</value> <value xml:lang="en">Calendar Attendee</value> <value xml:lang="es">Participa en el calendario</value> - <value xml:lang="fr">Agenda -Participant</value> + <value xml:lang="fr">Participant</value> <value xml:lang="hi_IN">à¤à¥à¤²à¥à¤à¤¡à¤° ठà¤à¥à¤à¤¡à¥</value> <value xml:lang="it">Membro del calendario</value> <value xml:lang="pt_BR">Membro da agenda</value> @@ -1768,7 +1768,7 @@ <value xml:lang="de">Delegierter für Kalender</value> <value xml:lang="en">Calendar Delegate</value> <value xml:lang="es">Delegado del calendario</value> - <value xml:lang="fr">Agenda -Délégation</value> + <value xml:lang="fr">Secrétaire</value> <value xml:lang="hi_IN">à¤à¥à¤²à¥à¤à¤¡à¤° पà¥à¤°à¤¤à¤¿à¤¨à¤¿à¤§à¤¿</value> <value xml:lang="it">Delegato del calendario</value> <value xml:lang="pt_BR">Representante de agenda</value> @@ -1789,7 +1789,7 @@ <value xml:lang="de">Kalenderorganisator</value> <value xml:lang="en">Calendar Organizer</value> <value xml:lang="es">Organiza el calendario</value> - <value xml:lang="fr">Organisateur de l'agenda</value> + <value xml:lang="fr">Organisateur</value> <value xml:lang="hi_IN">à¤à¥à¤²à¥à¤à¤¡à¤° à¤à¤¯à¥à¤à¤</value> <value xml:lang="it">Organizzatore del calendario</value> <value xml:lang="pt_BR">Organizador da agenda</value> @@ -1802,7 +1802,7 @@ <value xml:lang="de">Kalenderbesitzer</value> <value xml:lang="en">Calendar Owner</value> <value xml:lang="es">Propietario del calendario</value> - <value xml:lang="fr">Propriétaire de l'agenda</value> + <value xml:lang="fr">Créateur</value> <value xml:lang="hi_IN">à¤à¥à¤²à¥à¤à¤¡à¤° सà¥à¤µà¤¾à¤®à¥</value> <value xml:lang="it">Proprietario del calendario</value> <value xml:lang="pt_BR">Dono da agenda</value> Modified: ofbiz/branches/jquery/applications/party/config/PartyUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/config/PartyUiLabels.xml?rev=995688&r1=995687&r2=995688&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/config/PartyUiLabels.xml (original) +++ ofbiz/branches/jquery/applications/party/config/PartyUiLabels.xml Fri Sep 10 07:26:12 2010 @@ -2636,6 +2636,18 @@ <value xml:lang="th">à¹à¸à¸´à¹à¸¡à¸ªà¸à¸²à¸à¸°</value> <value xml:lang="zh">æ·»å è§è²</value> </property> + <property key="PartyAddToMainRole"> + <value xml:lang="en">Add To Main Role</value> + <value xml:lang="fr">Ajouter le rôle principal</value> + </property> + <property key="PartyAddToSecondRole"> + <value xml:lang="en">Add To Second Role</value> + <value xml:lang="fr">Ajouter le rôle secondaire</value> + </property> + <property key="PartyAddToRoleViewAll"> + <value xml:lang="en">Add To Role : view all</value> + <value xml:lang="fr">Ajouter le rôle : vue générale</value> + </property> <property key="PartyAddToRole"> <value xml:lang="de">Zur Rolle hinzufügen</value> <value xml:lang="en">Add To Role</value> Propchange: ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Sep 10 07:26:12 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:418499-490456 /ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:921280-927264 -/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-991996 +/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-995684 Modified: ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=995688&r1=995687&r2=995688&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/controller.xml (original) +++ ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/controller.xml Fri Sep 10 07:26:12 2010 @@ -640,6 +640,7 @@ under the License. <response name="error" type="view" value="ViewSegmentRoles"/> </request-map> + <request-map uri="addsecondaryroles"><security https="true" auth="true"/><response name="success" type="view" value="addsecondaryroles"/></request-map> <request-map uri="addrole"> <security https="true" auth="true"/> <event type="service" path="" invoke="createPartyRole"/> @@ -1293,6 +1294,7 @@ under the License. <view-map name="viewprofile" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#viewprofile"/> <view-map name="partyContentList" type="screen" page="component://party/widget/partymgr/ProfileScreens.xml#ContentList"/> <view-map name="viewroles" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#viewroles"/> + <view-map name="addsecondaryroles" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#AddPartySecondaryRoles"/> <view-map name="viewidentifications" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#ListPartyIdentifications"/> <view-map name="linkparty" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#linkparty"/> <view-map name="EditPartyRelationships" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#EditPartyRelationships"/> Modified: ofbiz/branches/jquery/applications/party/widget/partymgr/PartyForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/widget/partymgr/PartyForms.xml?rev=995688&r1=995687&r2=995688&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/widget/partymgr/PartyForms.xml (original) +++ ofbiz/branches/jquery/applications/party/widget/partymgr/PartyForms.xml Fri Sep 10 07:26:12 2010 @@ -983,6 +983,30 @@ under the License. </field> <field name="add" title="${uiLabelMap.CommonAdd}"><submit/></field> </form> + <form name="AddPartyMainRole" type="single" title="${uiLabelMap.PartyAddToMainRole}" target="addrole/viewroles"> + <field name="partyId"><hidden value="${parameters.partyId}"/></field> + <field name="roleTypeId" event="onChange" action="ajaxUpdateArea('addPartySecondaryRole', 'addsecondaryroles', $('AddPartyMainRole').serialize());" entry-name="dummy"> + <drop-down allow-empty="false"> + <entity-options entity-name="RoleType" description="${description}"> + <entity-constraint name="parentTypeId" value=""/> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <field name="add" title="${uiLabelMap.CommonAdd}"><submit/></field> + </form> + <form name="AddPartySecondaryRoles" type="single" title="${uiLabelMap.PartyAddToSecondRole}" target="addrole/viewroles"> + <field name="partyId"><hidden value="${parameters.partyId}"/></field> + <field name="roleTypeId" entry-name="dummy"> + <drop-down allow-empty="false"> + <entity-options entity-name="RoleType" description="${description}"> + <entity-constraint name="parentTypeId" value="${parameters.roleTypeId}"/> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <field name="add" title="${uiLabelMap.CommonAdd}"><submit/></field> + </form> <form name="AddRoleType" type="single" title="Add a new roletype" target="createroletype" list-name="parentRoleList"> <field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}" required-field="true" entry-name="dummy" position="1"><text/></field> <field name="parentTypeId" position="2"> Modified: ofbiz/branches/jquery/applications/party/widget/partymgr/PartyScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/widget/partymgr/PartyScreens.xml?rev=995688&r1=995687&r2=995688&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/widget/partymgr/PartyScreens.xml (original) +++ ofbiz/branches/jquery/applications/party/widget/partymgr/PartyScreens.xml Fri Sep 10 07:26:12 2010 @@ -172,6 +172,12 @@ under the License. </condition> <widgets> <screenlet title="${uiLabelMap.PartyAddToRole}"> + <container> + <label style="h2">${uiLabelMap.PartyAddToMainRole}</label> + <include-form name="AddPartyMainRole" location="component://party/widget/partymgr/PartyForms.xml"/> + <container id="addPartySecondaryRole"/> + </container> + <label style="h2">${uiLabelMap.PartyAddToRoleViewAll}</label> <include-form name="AddPartyRole" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> </widgets> @@ -197,6 +203,18 @@ under the License. </widgets> </section> </screen> + <screen name="AddPartySecondaryRoles"> + <section> + <actions> + <property-map map-name="uiLabelMap" resource="CommonUiLabels"/> + <property-map map-name="uiLabelMap" resource="PartyUiLabels"/> + </actions> + <widgets> + <label style="h2">${uiLabelMap.PartyAddToSecondRole}</label> + <include-form name="AddPartySecondaryRoles" location="component://party/widget/partymgr/PartyForms.xml"/> + </widgets> + </section> + </screen> <screen name="linkparty"> <section> <actions> Modified: ofbiz/branches/jquery/applications/product/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/entitydef/entitymodel.xml?rev=995688&r1=995687&r2=995688&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/entitydef/entitymodel.xml (original) +++ ofbiz/branches/jquery/applications/product/entitydef/entitymodel.xml Fri Sep 10 07:26:12 2010 @@ -1532,6 +1532,14 @@ under the License. <view-link entity-alias="PF" rel-entity-alias="PFA"> <key-map field-name="productFeatureId"/> </view-link> + <relation type="one-nofk" rel-entity-name="ProductFeature"> + <key-map field-name="productFeatureId"/> + </relation> + <relation type="one-nofk" rel-entity-name="ProductFeatureAppl"> + <key-map field-name="productId"/> + <key-map field-name="productFeatureId"/> + <key-map field-name="fromDate"/> + </relation> <relation type="one-nofk" rel-entity-name="ProductFeatureType"> <key-map field-name="productFeatureTypeId"/> </relation> Modified: ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml?rev=995688&r1=995687&r2=995688&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml (original) +++ ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml Fri Sep 10 07:26:12 2010 @@ -49,10 +49,12 @@ under the License. <create-value value-field="newValue"/> <!-- now create the FacilityContactMechPurpose record --> - <make-value value-field="facilityContactMechPurpose" entity-name="FacilityContactMechPurpose"/> - <set-pk-fields map="newValue" value-field="facilityContactMechPurpose"/> - <set field="facilityContactMechPurpose.contactMechPurposeTypeId" from-field="parameters.contactMechPurposeTypeId"/> - <create-value value-field="facilityContactMechPurpose"/> + <if-not-empty field="parameters.contactMechPurposeTypeId"> + <make-value value-field="facilityContactMechPurpose" entity-name="FacilityContactMechPurpose"/> + <set-pk-fields map="newValue" value-field="facilityContactMechPurpose"/> + <set field="facilityContactMechPurpose.contactMechPurposeTypeId" from-field="parameters.contactMechPurposeTypeId"/> + <create-value value-field="facilityContactMechPurpose"/> + </if-not-empty> </simple-method> <simple-method method-name="updateFacilityContactMech" short-description="Update a FacilityContactMech"> Propchange: ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Sep 10 07:26:12 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/applications/product/script/org/ofbiz/shipment/test/FacilityTests.xml:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:921280-927264 -/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-991996 +/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-995684 Modified: ofbiz/branches/jquery/applications/product/servicedef/services_feature.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/servicedef/services_feature.xml?rev=995688&r1=995687&r2=995688&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/servicedef/services_feature.xml (original) +++ ofbiz/branches/jquery/applications/product/servicedef/services_feature.xml Fri Sep 10 07:26:12 2010 @@ -93,6 +93,7 @@ under the License. <attribute name="thruDate" type="java.sql.Timestamp" mode="IN" optional="true"/> <attribute name="sequenceNum" type="Long" mode="IN" optional="true"/> <attribute name="amount" type="BigDecimal" mode="IN" optional="true"/> + <attribute name="recurringAmount" type="BigDecimal" mode="IN" optional="true"/> </service> <service name="removeFeatureFromProduct" engine="simple" location="component://product/script/org/ofbiz/product/feature/ProductFeatureServices.xml" invoke="removeFeatureFromProduct" auth="true"> Modified: ofbiz/branches/jquery/applications/product/webapp/facility/facility/EditContactMech.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/facility/EditContactMech.ftl?rev=995688&r1=995687&r2=995688&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/facility/EditContactMech.ftl (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/facility/EditContactMech.ftl Fri Sep 10 07:26:12 2010 @@ -65,6 +65,18 @@ under the License. <#if contactMechPurposeTypeId?exists><input type='hidden' name='contactMechPurposeTypeId' value='${contactMechPurposeTypeId?if_exists}' /></#if> <#if paymentMethodId?exists><input type='hidden' name='paymentMethodId' value='${paymentMethodId}' /></#if> + + <tr> + <td class="label">${uiLabelMap.PartyContactPurposes}</td> + <td> + <select name='contactMechPurposeTypeId' class="required"> + <option></option> + <#list mechMap.purposeTypes as contactMechPurposeType> + <option value='${contactMechPurposeType.contactMechPurposeTypeId}'>${contactMechPurposeType.get("description",locale)}</option> + </#list> + </select> + *</td> + </tr> <#else> <h1>${title}</h1> <div class="button-bar"> Modified: ofbiz/branches/jquery/applications/product/webapp/facility/facility/Picklist.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/facility/Picklist.fo.ftl?rev=995688&r1=995687&r2=995688&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/facility/Picklist.fo.ftl (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/facility/Picklist.fo.ftl Fri Sep 10 07:26:12 2010 @@ -49,6 +49,11 @@ under the License. <fo:block>${picklistBinInfo.quantity} ${uiLabelMap.CommonTo} #${picklistBinInfo.picklistBin.binLocationNumber}</fo:block> </#list> </fo:table-cell> + <fo:table-cell padding="2pt" background-color="${rowColor}"> + <#list picklistBinInfoList as picklistBinInfo> + <fo:block>${picklistBinInfo.picklistBin.primaryOrderId?if_exists}</fo:block> + </#list> + </fo:table-cell> </fo:table-row> <#-- toggle the row color --> <#if rowColor == "white"> @@ -134,15 +139,17 @@ under the License. <fo:block space-after.optimum="10pt" font-size="10pt"> <fo:table> <fo:table-column column-width="90pt"/> - <fo:table-column column-width="220pt"/> + <fo:table-column column-width="200pt"/> <fo:table-column column-width="50pt"/> <fo:table-column column-width="80pt"/> + <fo:table-column column-width="100pt"/> <fo:table-header> <fo:table-row font-weight="bold"> <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductLocation}</fo:block></fo:table-cell> <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductProductId}</fo:block></fo:table-cell> <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductToPick}</fo:block></fo:table-cell> <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductQuantityToBin} ${uiLabelMap.CommonNbr}</fo:block></fo:table-cell> + <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductOrderId}</fo:block></fo:table-cell> <#-- Not display details here, just the summary info for the bins <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductOrderItems}</fo:block></fo:table-cell> Modified: ofbiz/branches/jquery/applications/workeffort/entitydef/entitymodel_view.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/entitydef/entitymodel_view.xml?rev=995688&r1=995687&r2=995688&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/workeffort/entitydef/entitymodel_view.xml (original) +++ ofbiz/branches/jquery/applications/workeffort/entitydef/entitymodel_view.xml Fri Sep 10 07:26:12 2010 @@ -320,7 +320,9 @@ under the License. <member-entity entity-alias="WEA" entity-name="WorkEffortAssoc"/> <member-entity entity-alias="WEFROM" entity-name="WorkEffort"/> <alias-all entity-alias="WEA"/> - <alias-all entity-alias="WEFROM"/> + <alias-all entity-alias="WEFROM"> + <exclude field="sequenceNum"/> + </alias-all> <view-link entity-alias="WEA" rel-entity-alias="WEFROM"> <key-map field-name="workEffortIdFrom" rel-field-name="workEffortId"/> </view-link> @@ -331,7 +333,9 @@ under the License. <member-entity entity-alias="WEA" entity-name="WorkEffortAssoc"/> <member-entity entity-alias="WETO" entity-name="WorkEffort"/> <alias-all entity-alias="WEA"/> - <alias-all entity-alias="WETO"/> + <alias-all entity-alias="WETO"> + <exclude field="sequenceNum"/> + </alias-all> <view-link entity-alias="WEA" rel-entity-alias="WETO"> <key-map field-name="workEffortIdTo" rel-field-name="workEffortId"/> </view-link> @@ -362,19 +366,6 @@ under the License. </view-link> </view-entity> - <!-- - <view-entity entity-name="WorkEffortAssocFromView" - package-name="org.ofbiz.workeffort.workeffort" - title="Work Effort Association From (Parent) View"> - <member-entity entity-alias="WEA" entity-name="WorkEffortAssoc"/> - <member-entity entity-alias="WEFR" entity-name="WorkEffort"/> - <alias-all entity-alias="WEA"/> - <alias-all entity-alias="WEFR"/> - <view-link entity-alias="WEA" rel-entity-alias="WEFR"> - <key-map field-name="workEffortIdFrom" rel-field-name="workEffortId"/> - </view-link> - </view-entity> - --> <view-entity entity-name="WorkEffortNoteAndData" package-name="org.ofbiz.workeffort.workeffort" title="Work Effort Note And Note Data Entity"> @@ -525,7 +516,16 @@ under the License. <member-entity entity-alias="PROD" entity-name="Product"/> <alias-all entity-alias="WE"/> <alias-all entity-alias="WEGS"/> - <alias-all entity-alias="PROD"/> + <alias-all entity-alias="PROD"> + <exclude field="facilityId"/> + <exclude field="description"/> + <exclude field="reserv2ndPPPerc"/> + <exclude field="reservNthPPPerc"/> + <exclude field="createdDate"/> + <exclude field="createdByUserLogin"/> + <exclude field="lastModifiedDate"/> + <exclude field="lastModifiedByUserLogin"/> + </alias-all> <view-link rel-entity-alias="WEGS" entity-alias="WE"> <key-map field-name="workEffortId"/> </view-link> Modified: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilXml.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilXml.java?rev=995688&r1=995687&r2=995688&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilXml.java (original) +++ ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilXml.java Fri Sep 10 07:26:12 2010 @@ -472,6 +472,7 @@ public class UtilXml { if (node.getUserData("startLine") != null) { return; } + node.setUserData("systemId",locator.getLiteralSystemId(), null); node.setUserData("startLine",locator.getLineNumber(), null); node.setUserData("startColumn",locator.getColumnNumber(), null); } @@ -561,7 +562,9 @@ public class UtilXml { parser.setEntityResolver(lr); parser.setErrorHandler(eh); } - parser.parse(new InputSource(is)); + InputSource inputSource = new InputSource(is); + inputSource.setSystemId(docDescription); + parser.parse(inputSource); document = parser.getDocument(); double totalSeconds = (System.currentTimeMillis() - startTime)/1000.0; @@ -800,7 +803,7 @@ public class UtilXml { if (node != null) { do { if (node.getNodeType() == Node.ELEMENT_NODE && (childElementName == null || - childElementName.equals(node.getLocalName()))) { + childElementName.equals(node.getNodeName()))) { Element childElement = (Element) node; return childElement; } Modified: ofbiz/branches/jquery/framework/common/config/CommonEntityLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/config/CommonEntityLabels.xml?rev=995688&r1=995687&r2=995688&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/config/CommonEntityLabels.xml (original) +++ ofbiz/branches/jquery/framework/common/config/CommonEntityLabels.xml Fri Sep 10 07:26:12 2010 @@ -6506,6 +6506,14 @@ <value xml:lang="th">à¹à¸ªà¸£à¹à¸à¸ªà¸¡à¸à¸¹à¸£à¸à¹</value> <value xml:lang="zh">å·²å®æ</value> </property> + <property key="StatusItem.description.CRQ_DRAFT"> + <value xml:lang="en">Draft</value> + <value xml:lang="fr">Brouillon</value> + </property> + <property key="StatusItem.description.CRQ_PENDING"> + <value xml:lang="en">Pending Cust.</value> + <value xml:lang="fr">En attente</value> + </property> <property key="StatusItem.description.CRQ_REJECTED"> <value xml:lang="de">Abgelehnt</value> <value xml:lang="en">Rejected</value> Propchange: ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Sep 10 07:26:12 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/applications/commonext/widget/HelpScreens.xml:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310/framework/common/widget/HelpScreens.xml:921280-927264 -/ofbiz/trunk/framework/common/widget/HelpScreens.xml:951708-991996 +/ofbiz/trunk/framework/common/widget/HelpScreens.xml:951708-995684 Modified: ofbiz/branches/jquery/framework/example/webapp/example/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/example/webapp/example/WEB-INF/controller.xml?rev=995688&r1=995687&r2=995688&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/example/webapp/example/WEB-INF/controller.xml (original) +++ ofbiz/branches/jquery/framework/example/webapp/example/WEB-INF/controller.xml Fri Sep 10 07:26:12 2010 @@ -192,8 +192,8 @@ under the License. <request-map uri="FormWidgetExamples"><security https="true" auth="true"/><response name="success" type="view" value="FormWidgetExamples"/></request-map> <request-map uri="LookupExampleFeature"><security https="true" auth="true"/><response name="success" type="view" value="LookupExampleFeature"/></request-map> - <request-map uri="LookupPartyExample"><security https="true" auth="true"/><response name="success" type="view" value="LookupPartyExample"/></request-map> - <request-map uri="LookupPartyExampleByName"><security https="true" auth="true"/><response name="success" type="view" value="LookupPartyExampleByName"/></request-map> + <request-map uri="LookupPartyName"><security https="true" auth="true"/><response name="success" type="view" value="LookupPartyName"/></request-map> + <request-map uri="LookupPartyGroupByName"><security https="true" auth="true"/><response name="success" type="view" value="LookupPartyGroupByName"/></request-map> <request-map uri="ListExampleFormOnly"><security https="true" auth="false"/><response name="success" type="view" value="ListExampleFormOnly"/></request-map> <request-map uri="CreateExampleFormOnly"><security https="true" auth="false"/><response name="success" type="view" value="CreateExampleFormOnly"/></request-map> @@ -252,8 +252,8 @@ under the License. <view-map name="FormWidgetExamples" type="screen" page="component://example/widget/example/FormWidgetExampleScreens.xml#FormWidgetExamples"/> <view-map name="LookupExampleFeature" type="screen" page="component://example/widget/example/ExampleFeatureScreens.xml#LookupExampleFeature"/> - <view-map name="LookupPartyExample" type="screen" page="component://example/widget/example/FormWidgetExampleLookupScreens.xml#LookupParty"/> - <view-map name="LookupPartyExampleByName" type="screen" page="component://example/widget/example/FormWidgetExampleLookupScreens.xml#LookupPartyByName"/> + <view-map name="LookupPartyName" type="screen" page="component://example/widget/example/FormWidgetExampleLookupScreens.xml#LookupPartyName"/> + <view-map name="LookupPartyGroupByName" type="screen" page="component://example/widget/example/FormWidgetExampleLookupScreens.xml#LookupPartyGroupByName"/> <!-- ajax view mappings --> <view-map name="findExampleAjax" type="screen" page="component://example/widget/example/ExampleAjaxScreens.xml#AjaxExample"/> Modified: ofbiz/branches/jquery/framework/example/widget/example/ExampleFeatureScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/example/widget/example/ExampleFeatureScreens.xml?rev=995688&r1=995687&r2=995688&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/example/widget/example/ExampleFeatureScreens.xml (original) +++ ofbiz/branches/jquery/framework/example/widget/example/ExampleFeatureScreens.xml Fri Sep 10 07:26:12 2010 @@ -106,10 +106,25 @@ under the License. <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/> + + <!-- entries needed for lookup ajax auto completer --> + <!-- required: entity to search in --> + <set field="entityName" value="ExampleFeature"/> + + <!-- required: fields to search a match --> + <set field="searchFields" value="[exampleFeatureId, description]"/> + + <!-- optional: field to return after user selection, default is first element of searchFields --> + <!-- return field might be hidden based on widget.autocompleter.displayReturnField property in widget.properties --> + <!--set field="returnField" value="exampleFeatureId"/--> + + <!-- optional: fields to display, default are searchFields --> + <!--set field="displayFields" value="[exampleFeatureId, description]"/--> + </actions> <widgets> - <decorator-screen name="LookupLayerPopupDecorator" location="component://common/widget/CommonScreens.xml"> + <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> <include-form name="LookupFindExampleFeature" location="component://example/widget/example/ExampleFeatureForms.xml"/> </decorator-section> Modified: ofbiz/branches/jquery/framework/example/widget/example/ExampleForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/example/widget/example/ExampleForms.xml?rev=995688&r1=995687&r2=995688&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/example/widget/example/ExampleForms.xml (original) +++ ofbiz/branches/jquery/framework/example/widget/example/ExampleForms.xml Fri Sep 10 07:26:12 2010 @@ -236,30 +236,20 @@ under the License. <form name="AddExampleFeatureAppl" type="single" target="example_createExampleFeatureAppl" title=""> <auto-fields-service service-name="createExampleFeatureAppl"/> <field name="exampleId"><hidden/></field> - - <!-- a nice combination of the lookup option and the auto-complete, but unfortunately still requires a custom companion controller.xml request to handle AJAX data retreival --> <field name="exampleFeatureId" title="${uiLabelMap.ExampleFeature}"> - <lookup presentation="layer" position="center" target-form-name="LookupExampleFeature"/> - <on-field-event-update-area event-type="change" area-id="AddExampleFeatureAppl_exampleFeatureId" area-target="findExampleFeatures"/> + <lookup target-form-name="LookupExampleFeature"/> </field> - <!-- basic example of server-side AJAX enabled option, requires use of custom companion request in controller.xml file to get data for drop-down --> - <!-- - <field name="exampleFeatureId"> - <text/> - <on-field-event-update-area event-type="change" area-id="AddExampleFeatureAppl_exampleFeatureId" area-target="findExampleFeatures"/> - </field> - --> - <!-- most feature rich for autocomplete, ie partial text entry searches the full string, doesn't require custom request to function, etc; Note that for usability this is still a bit lame since you can't see the full list, you HAVE to know part of the ID or description in order to see options --> - <!-- - <field name="exampleFeatureId"> + <!-- most feature rich for autocomplete, ie partial text entry searches the full string, + doesn't require custom request to function, etc; Note that for usability this is still a bit lame since you can't see the full list, + you HAVE to know part of the ID or description in order to see options --> + <!--field name="exampleFeatureId"> <drop-down> <auto-complete/> <entity-options entity-name="ExampleFeature" description="${exampleFeatureId}: ${description}"> <entity-order-by field-name="exampleFeatureId"/> </entity-options> </drop-down> - </field> - --> + </field--> <field name="exampleFeatureApplTypeId" title="${uiLabelMap.CommonType}"> <drop-down allow-empty="false"> Modified: ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleLookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleLookupForms.xml?rev=995688&r1=995687&r2=995688&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleLookupForms.xml (original) +++ ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleLookupForms.xml Fri Sep 10 07:26:12 2010 @@ -21,7 +21,7 @@ under the License. <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - <form name="lookupPartyName" target="LookupPartyExample" type="single" + <form name="lookupPartyName" target="LookupPartyName" type="single" header-row-style="header-row" default-table-style="basic-table"> <!--<auto-fields-entity entity-name="PartyNameView" default-field-type="find"/>--> <field name="partyId" title="${uiLabelMap.PartyPartyId}"><text-find/></field> @@ -36,7 +36,7 @@ under the License. <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field> </form> - <form name="listLookupPartyName" type="list" list-name="listIt" paginate-target="LookupPartyExample" + <form name="listLookupPartyName" type="list" list-name="listIt" paginate-target="LookupPartyName" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <set field="inputFields" from-field="parameters"/> @@ -57,10 +57,10 @@ under the License. </form> <!-- Lookup By Name --> - <form name="lookupPartyNameByName" target="LookupPartyExampleByName" type="single" + <form name="lookupPartyGroupByName" target="LookupPartyGroupByName" type="single" header-row-style="header-row" default-table-style="basic-table"> <field name="LayerFromLayer" title="${uiLabelMap.ExampleLayerFromLayer}"> - <lookup target-form-name="LookupPartyExample" position="center"/> + <lookup target-form-name="LookupPartyName" position="center"/> </field> <field name="CalendarFromLayer" title="${uiLabelMap.ExampleCalendarFromLayer}"><date-time/></field> <field name="partyId" title="${uiLabelMap.PartyPartyId}"><text-find/></field> @@ -75,7 +75,7 @@ under the License. <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field> </form> - <form name="listLookupPartyNameByName" type="list" list-name="listIt" paginate-target="LookupPartyExampleByName" + <form name="listLookupPartyGroupByName" type="list" list-name="listIt" paginate-target="LookupPartyGroupByName" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <set field="inputFields" from-field="parameters"/> @@ -95,12 +95,4 @@ under the License. <field name="groupName" title="${uiLabelMap.PartyGroupName}"><display/></field> </form> - <form name="lookupPersonByName" target="LookupPersonByNameExamplePopup" extends="lookupPerson" extends-resource="component://party/widget/partymgr/LookupForms.xml"/> - <form name="listLookupPersonByName" extends="listLookupPerson" extends-resource="component://party/widget/partymgr/LookupForms.xml"> - <field name="partyId" widget-style="smallSubmit" title="${uiLabelMap.VinopsPartyId}"> - <hyperlink also-hidden="false" target-type="plain" description="${partyId}" - target="javascript:set_values('${firstName} ${lastName}','${partyId}')"/> - </field> - </form> - </forms> Modified: ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleLookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleLookupScreens.xml?rev=995688&r1=995687&r2=995688&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleLookupScreens.xml (original) +++ ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleLookupScreens.xml Fri Sep 10 07:26:12 2010 @@ -20,7 +20,7 @@ under the License. <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> - <screen name="LookupParty"> + <screen name="LookupPartyName"> <section> <condition> <if-service-permission service-name="partyBasePermissionCheck" main-action="VIEW"/> @@ -64,7 +64,7 @@ under the License. </section> </screen> - <screen name="LookupPartyByName"> + <screen name="LookupPartyGroupByName"> <section> <condition> <if-service-permission service-name="partyBasePermissionCheck" main-action="VIEW"/> @@ -79,64 +79,32 @@ under the License. <!-- entries needed for lookup ajax auto completer --> <!-- required: entity to search in --> - <set field="entityName" value="PartyNameView"/> - - <!-- required: fields to search a match --> - <!-- the first element from searchFields is returned after user selection --> - <!-- it might be hidden based on widget.autocompleter.displayReturnField property in widget.properties --> - <set field="searchFields" value="[partyId, firstName, middleName, lastName, groupName]"/> - - <!-- optional: fields to display in the given order, default is searchFields --> - <set field="displayFields" value="[firstName, lastName, groupName]"/> - - <!-- optional: additional entity condition (named andCondition) added to search query --> - <script location="component://party/webapp/partymgr/WEB-INF/actions/party/StatusCondition.groovy"/> - </actions> - <widgets> - <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> - <decorator-section name="search-options"> - <include-form name="lookupPartyNameByName" location="component://example/widget/example/FormWidgetExampleLookupForms.xml"/> - </decorator-section> - <decorator-section name="search-results"> - <include-form name="listLookupPartyNameByName" location="component://example/widget/example/FormWidgetExampleLookupForms.xml"/> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - - <screen name="LookupPersonByNameExamplePopup"> - <section> - <actions> - <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PartyLookupPartyPerson}"/> - <set field="queryString" from-field="result.queryString"/> - - <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/> + <set field="entityName" value="PartyGroup"/> <!-- entries needed for lookup ajax auto completer --> <!-- required: entity to search in --> - <set field="entityName" value="PartyNameView"/> + <set field="entityName" value="ViewCustomersList"/> <!-- required: fields to search a match --> - <set field="searchFields" value="[partyId, firstName, middleName, lastName]"/> + <set field="searchFields" value="[groupName, partyId]"/> <!-- optional: field to return after user selection, default is first element of searchFields --> <!-- return field might be hidden based on widget.autocompleter.displayReturnField property in widget.properties --> - <set field="returnField" value="partyId"/> + <!--set field="returnField" value="groupName"/--> <!-- optional: fields to display, default are searchFields --> - <set field="displayFields" value="[firstName, lastName]"/> + <set field="displayFields" value="[groupName, partyId]"/> + <!-- optional: additional entity condition (named andCondition) added to search query --> + <script location="component://party/webapp/partymgr/WEB-INF/actions/party/StatusCondition.groovy"/> </actions> <widgets> - <decorator-screen name="LookupLayerPopupDecorator" location="component://common/widget/CommonScreens.xml"> + <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupPersonByName" location="component://example/widget/example/FormWidgetExampleLookupForms.xml"/> + <include-form name="lookupPartyGroupByName" location="component://example/widget/example/FormWidgetExampleLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupPersonByName" location="component://example/widget/example/FormWidgetExampleLookupForms.xml"/> + <include-form name="listLookupPartyGroupByName" location="component://example/widget/example/FormWidgetExampleLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/branches/jquery/framework/images/webapp/images/ecommain.css URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/images/webapp/images/ecommain.css?rev=995688&r1=995687&r2=995688&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/images/webapp/images/ecommain.css (original) +++ ofbiz/branches/jquery/framework/images/webapp/images/ecommain.css Fri Sep 10 07:26:12 2010 @@ -303,9 +303,9 @@ margin:0 0 0 10px; } #ecom-mainarea .center { -margin-left:150px; -margin-right:150px; voice-family:inherit; +overflow:hidden; +padding:0px 10px; } #ecom-mainarea .leftonly { @@ -1037,39 +1037,32 @@ display: inline-block; } #productImageBox { -width: 770px; +width:100%; border-top: 1px #BBBBBB solid; display: inline-block; } div.additionalImage { -width: 200px; } #detailImageBox { float: left; -height: 800px; -width: 272px; +width:50%; } #additionalImageBox { float: left; -width: 272px; } #productDetailBox { float: right; -height: 266px; -padding: 266px 0; -width: 200px; +width:50%; } #addItemForm { clear: both; -width : 600px; border-top: 1px #BBBBBB solid; } #paginationBox { -width : 600px; border-top: 1px #BBBBBB solid; border-bottom: 1px #BBBBBB solid; -} \ No newline at end of file +} |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |