You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2009/09/24 06:08:39 UTC
svn commit: r818363 [1/2] - in /ofbiz/trunk: applications/commonext/config/
applications/commonext/data/ applications/commonext/data/helpdata/
applications/commonext/documents/ applications/commonext/script/
applications/commonext/script/org/ofbiz/setu...
Author: hansbak
Date: Thu Sep 24 04:08:38 2009
New Revision: 818363
URL: http://svn.apache.org/viewvc?rev=818363&view=rev
Log:
some improvements to the setup webapp including that it will only show if no companies in the partyaccntgpreference entity, added some more help screens
Added:
ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_editFacility.xml (with props)
ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_editProductStore.xml (with props)
ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_editWebSite.xml (with props)
ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_firstProdCatalog.xml (with props)
ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_firstProductCategory.xml (with props)
ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_firstcustomer.xml (with props)
ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_profileCompany.xml (with props)
Modified:
ofbiz/trunk/applications/commonext/config/SetupUiLabels.xml
ofbiz/trunk/applications/commonext/data/CommonExtHelpData.xml
ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP.xml
ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_firstproduct.xml
ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_initialsetup.xml
ofbiz/trunk/applications/commonext/documents/CommonExt.xml
ofbiz/trunk/applications/commonext/documents/Setup.xml
ofbiz/trunk/applications/commonext/script/changeOrgPartyId.groovy
ofbiz/trunk/applications/commonext/script/org/ofbiz/setup/SetupEvents.xml
ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/FindFacility.groovy
ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProductStoreAndWebSite.groovy
ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/controller.xml
ofbiz/trunk/applications/commonext/webapp/ofbizsetup/organization/EditFacility.ftl
ofbiz/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml
ofbiz/trunk/applications/commonext/widget/ofbizsetup/Menus.xml
ofbiz/trunk/applications/commonext/widget/ofbizsetup/ProfileScreens.xml
ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml
ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupScreens.xml
ofbiz/trunk/themes/bizznesstime/includes/appbar.ftl
ofbiz/trunk/themes/bluelight/includes/appbar.ftl
ofbiz/trunk/themes/flatgrey/includes/appbar.ftl
Modified: ofbiz/trunk/applications/commonext/config/SetupUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/config/SetupUiLabels.xml?rev=818363&r1=818362&r2=818363&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/config/SetupUiLabels.xml (original)
+++ ofbiz/trunk/applications/commonext/config/SetupUiLabels.xml Thu Sep 24 04:08:38 2009
@@ -121,4 +121,7 @@
<property key="SetupInitialSetup">
<value xml:lang="en">Initial Setup</value>
</property>
+ <property key="SetupEventMessage">
+ <value xml:lang="en">Setup only works if there are no organizations defined yet</value>
+ </property>
</resource>
\ No newline at end of file
Modified: ofbiz/trunk/applications/commonext/data/CommonExtHelpData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/data/CommonExtHelpData.xml?rev=818363&r1=818362&r2=818363&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/data/CommonExtHelpData.xml (original)
+++ ofbiz/trunk/applications/commonext/data/CommonExtHelpData.xml Thu Sep 24 04:08:38 2009
@@ -27,15 +27,43 @@
<ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_COMMONEXT" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/>
<!-- setup component help -->
- <DataResource dataResourceId="HELP_SETUP" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/commonext/data/helpdata/HELP_SETUP.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Help system Setup" mimeTypeId="text/xml" isPublic="Y" />
- <Content contentId="HELP_SETUP" contentTypeId="DOCUMENT" localeString="en" contentName="OFBiz Setup Help" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_SETUP" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_COMMONEXT" contentIdTo="HELP_SETUP" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/>
+ <DataResource dataResourceId="HELP_SETUP" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/commonext/data/helpdata/HELP_SETUP.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="OFBiz Setup Overview" mimeTypeId="text/xml" isPublic="Y" />
+ <Content contentId="HELP_SETUP" contentTypeId="DOCUMENT" localeString="en" contentName="OFBiz Setup Overview" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_SETUP" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
+ <ContentAssoc contentId="HELP_COMMONEXT" contentIdTo="HELP_SETUP" contentAssocTypeId="TREE_CHILD" fromDate="2009-09-09 01:01:01" sequenceNum="000"/>
<DataResource dataResourceId="SETUP_initialsetup" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/commonext/data/helpdata/HELP_SETUP_initialsetup.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Setup Main Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="SETUP_initialsetup" contentTypeId="DOCUMENT" contentName="Main OFBiz Setup Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SETUP_initialsetup" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_SETUP" contentIdTo="SETUP_initialsetup" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="001" mapKey="SETUP_initialsetup"/>
+ <ContentAssoc contentId="HELP_SETUP" contentIdTo="SETUP_initialsetup" contentAssocTypeId="TREE_CHILD" fromDate="2009-09-09 01:01:01" sequenceNum="001" mapKey="SETUP_initialsetup"/>
- <DataResource dataResourceId="SETUP_firstproduct" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/commonext/data/helpdata/HELP_SETUP_firstproduct.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Setup The First Product Help" mimeTypeId="text/xml" isPublic="Y" />
- <Content contentId="SETUP_firstproduct" contentTypeId="DOCUMENT" contentName="Setup The First Product Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SETUP_firstproduct" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_SETUP" contentIdTo="SETUP_firstproduct" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-13 01:01:01" sequenceNum="002" mapKey="SETUP_firstproduct"/>
-</entity-engine-xml>
+ <DataResource dataResourceId="SETUP_editFacility" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/commonext/data/helpdata/HELP_SETUP_editFacility.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="OFBiz Setup Edit Facility Help" mimeTypeId="text/xml" isPublic="Y" />
+ <Content contentId="SETUP_editFacility" contentTypeId="DOCUMENT" contentName="OFBiz Setup Edit Facility Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SETUP_editFacility" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
+ <ContentAssoc contentId="HELP_SETUP" contentIdTo="SETUP_editFacility" contentAssocTypeId="TREE_CHILD" fromDate="2009-09-09 01:01:01" sequenceNum="002" mapKey="SETUP_EditFacility"/>
+
+ <DataResource dataResourceId="SETUP_editProdStore" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/commonext/data/helpdata/HELP_SETUP_editProductStore.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="OFBiz Setup Edit Product Store Help" mimeTypeId="text/xml" isPublic="Y" />
+ <Content contentId="SETUP_editProdStore" contentTypeId="DOCUMENT" contentName="OFBiz Setup Edit Product Store Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SETUP_editProdStore" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
+ <ContentAssoc contentId="HELP_SETUP" contentIdTo="SETUP_editProdStore" contentAssocTypeId="TREE_CHILD" fromDate="2009-09-09 01:01:01" sequenceNum="003" mapKey="SETUP_EditProductStore"/>
+
+ <DataResource dataResourceId="SETUP_editWebSite" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/commonext/data/helpdata/HELP_SETUP_editWebSite.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="OFBiz Setup Edit WebSite Help" mimeTypeId="text/xml" isPublic="Y" />
+ <Content contentId="SETUP_editWebSite" contentTypeId="DOCUMENT" contentName="OFBiz Setup Edit WebSite Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SETUP_editWebSite" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
+ <ContentAssoc contentId="HELP_SETUP" contentIdTo="SETUP_editWebSite" contentAssocTypeId="TREE_CHILD" fromDate="2009-09-09 01:01:01" sequenceNum="004" mapKey="SETUP_EditWebSite"/>
+
+ <DataResource dataResourceId="SETUP_firstCust" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/commonext/data/helpdata/HELP_SETUP_firstcustomer.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="OFBiz Setup Create First Customer Help" mimeTypeId="text/xml" isPublic="Y" />
+ <Content contentId="SETUP_firstCust" contentTypeId="DOCUMENT" contentName="OFBiz Setup Create First Customer Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SETUP_firstCust" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
+ <ContentAssoc contentId="HELP_SETUP" contentIdTo="SETUP_firstCust" contentAssocTypeId="TREE_CHILD" fromDate="2009-09-09 01:01:01" sequenceNum="005" mapKey="SETUP_firstcustomer"/>
+
+ <DataResource dataResourceId="SETUP_firstCatalog" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/commonext/data/helpdata/HELP_SETUP_firstProdCatalog.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="OFBiz Setup First Catalog Help" mimeTypeId="text/xml" isPublic="Y" />
+ <Content contentId="SETUP_firstCatalog" contentTypeId="DOCUMENT" contentName="OFBiz Setup First Catalog Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SETUP_firstCatalog" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
+ <ContentAssoc contentId="HELP_SETUP" contentIdTo="SETUP_firstCatalog" contentAssocTypeId="TREE_CHILD" fromDate="2009-09-09 01:01:01" sequenceNum="006" mapKey="SETUP_firstproduct"/>
+
+ <DataResource dataResourceId="SETUP_firstCategory" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/commonext/data/helpdata/HELP_SETUP_firstProductCategory.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="OFBiz Setup First Product Category Help" mimeTypeId="text/xml" isPublic="Y" />
+ <Content contentId="SETUP_firstCategory" contentTypeId="DOCUMENT" contentName="OFBiz Setup First Product Category Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SETUP_firstCategory" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
+ <ContentAssoc contentId="HELP_SETUP" contentIdTo="SETUP_firstCategory" contentAssocTypeId="TREE_CHILD" fromDate="2009-09-09 01:01:01" sequenceNum="007" mapKey="SETUP_EditCategory"/>
+
+ <DataResource dataResourceId="SETUP_firstproduct" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/commonext/data/helpdata/HELP_SETUP_firstproduct.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="OFBiz Setup The First Product Help" mimeTypeId="text/xml" isPublic="Y" />
+ <Content contentId="SETUP_firstproduct" contentTypeId="DOCUMENT" contentName="OFBiz Setup The First Product Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SETUP_firstproduct" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
+ <ContentAssoc contentId="HELP_SETUP" contentIdTo="SETUP_firstproduct" contentAssocTypeId="TREE_CHILD" fromDate="2009-09-09 01:01:01" sequenceNum="008" mapKey="SETUP_EditProduct"/>
+
+ <DataResource dataResourceId="SETUP_profileORG" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/commonext/data/helpdata/HELP_SETUP_profileCompany.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="OFBiz Setup View Organization Profile Help" mimeTypeId="text/xml" isPublic="Y" />
+ <Content contentId="SETUP_profileORG" contentTypeId="DOCUMENT" contentName="OFBiz Setup View Organization Profile Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SETUP_profileORG" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
+ <ContentAssoc contentId="HELP_SETUP" contentIdTo="SETUP_profileORG" contentAssocTypeId="TREE_CHILD" fromDate="2009-09-09 01:01:01" sequenceNum="009" mapKey="SETUP_viewprofile"/>
+</entity-engine-xml>
\ No newline at end of file
Modified: ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP.xml?rev=818363&r1=818362&r2=818363&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP.xml (original)
+++ ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP.xml Thu Sep 24 04:08:38 2009
@@ -24,7 +24,14 @@
xmlns="http://docbook.org/ns/docbook">
<title>The OFBiz Setup Component Overview</title>
<para>
- The OFBiz Setup Component is supporting for immediate setup your organization. For example, product store, web site , facility , product catalog, category
+ The OFBiz Setup Component is supporting for immediate setup your organization. For example, Product Store, WebSite , Facility , product catalog, category
, product, and etc. and then be able to create orders from data that is created.
</para>
+ <section>
+ <title>Why we have OFBiz Setup Application?</title>
+ <para>
+ If you are the company and also want to use OFBiz for running your business then you easily be able to setting your information for start running
+ the system quickly via The OFBiz Setup Application.
+ </para>
+ </section>
</section>
\ No newline at end of file
Added: ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_editFacility.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_editFacility.xml?rev=818363&view=auto
==============================================================================
--- ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_editFacility.xml (added)
+++ ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_editFacility.xml Thu Sep 24 04:08:38 2009
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
+ xmlns:xl="http://www.w3.org/1999/xlink"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
+ xmlns="http://docbook.org/ns/docbook">
+ <title>The OFBiz Setup Edit Facility help screen.</title>
+ <para>
+ The Edit Facility help screen is used to manage a warehouse, a store with related inventory.
+ </para>
+ <section>
+ <title>How do I create a facility?</title>
+ <para>Select the 'Facility' sub menu and the screen will be displayed</para>
+ <para>Enter the 'Facility Id' field (NOTE: If you do not enter the 'Facility Id' field it will be used the default as 'Organization Party Id')</para>
+ <para>Enter the 'Name' field </para>
+ <para>Enter a description describing what the line item is </para>
+ <para>Enter a number in the 'Default Days To Ship ' field</para>
+ <para>Press the 'Save' button</para>
+ </section>
+ <section>
+ <title>How do I update a facility?</title>
+ <para>Not all the fields on the facility can be updated. For example Facility Id cannot be updated. If these fields need to be amended then the facility will need to be removed and then re-created.</para>
+ <para>Select the 'Facility' sub menu and the screen will be displayed</para>
+ <para>Any existing line items will be displayed in the 'Items' box</para>
+ <para>Amend the details in the line item that needs to be updated (eg Name, Description, Default Days To Ship)</para>
+ <para>Press the 'Update' button displayed at the end of the line item that has been updated </para>
+ </section>
+</section>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_editFacility.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_editFacility.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_editFacility.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_editProductStore.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_editProductStore.xml?rev=818363&view=auto
==============================================================================
--- ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_editProductStore.xml (added)
+++ ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_editProductStore.xml Thu Sep 24 04:08:38 2009
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
+ xmlns:xl="http://www.w3.org/1999/xlink"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
+ xmlns="http://docbook.org/ns/docbook">
+ <title>The OFBiz Setup Edit Product Store help screen.</title>
+ <para>
+ The Product Store screen is used to manage a store with has all the information needed to sell products. For example shippings
+ ,a series of catalogs, which are composed of product categories and products , and also used to configure the payment processing settings
+ , fulfillment, notification, promotions, payment processing, and tax calculation policies , and etc.
+ </para>
+ <section>
+ <title>How do I create a Product Store?</title>
+ <para>Select the 'Product Store' sub menu and the screen will be displayed</para>
+ <para>Enter the 'Product Store Id' field (NOTE: If you do not enter the 'Product Store Id' field it will be used the default as 'Organization Party Id')</para>
+ <para>Enter the 'Store Name' field </para>
+ <para>Press the 'Update' button</para>
+ </section>
+ <section>
+ <title>How do I update a Product Store?</title>
+ <para>Not all the fields on the Product Store can be updated. For example Product Store Id cannot be updated. If these fields need to be amended then the Product Store will need to be removed and then re-created.</para>
+ <para>Select the 'Product Store' sub menu and the screen will be displayed</para>
+ <para>Any existing Product Store will be displayed in the 'Items' box</para>
+ <para>Amend the details in the line item that needs to be updated (eg Store Name)</para>
+ <para>Press the 'Update' button displayed at the end of the line item that has been updated </para>
+ </section>
+</section>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_editProductStore.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_editProductStore.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_editProductStore.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_editWebSite.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_editWebSite.xml?rev=818363&view=auto
==============================================================================
--- ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_editWebSite.xml (added)
+++ ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_editWebSite.xml Thu Sep 24 04:08:38 2009
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
+ xmlns:xl="http://www.w3.org/1999/xlink"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
+ xmlns="http://docbook.org/ns/docbook">
+ <title>The OFBiz Setup Edit WebSite help screen.</title>
+ <para>
+ The WebSite screen is used to manage the details of a WebSite. The WebSite record is used to configure which Product Store to use for your site that references it.
+ </para>
+ <section>
+ <title>How do I create a Web Site?</title>
+ <para>Select the 'Web Site' sub menu and the screen will be displayed</para>
+ <para>Enter the 'Web Site Id' field (NOTE: If you do not enter the 'Web Site Id' field it will be used the default as 'Organization Party Id')</para>
+ <para>Enter the 'Site Name' field </para>
+ <para>Select the 'Visual Theme Set' field</para>
+ <para>Press the 'Save' button</para>
+ </section>
+ <section>
+ <title>How do I update a Web Site?</title>
+ <para>Not all the fields on the web site can be updated. For example Web Site Id cannot be updated. If these fields need to be amended then the web site will need to be removed and then re-created.</para>
+ <para>Select the 'Web Site' sub menu and the screen will be displayed</para>
+ <para>Any existing line items will be displayed in the 'Items' box</para>
+ <para>Amend the details in the line item that needs to be updated (eg Site Name, Visual Theme Set)</para>
+ <para>Press the 'Update' button displayed at the end of the line item that has been updated </para>
+ </section>
+</section>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_editWebSite.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_editWebSite.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_editWebSite.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_firstProdCatalog.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_firstProdCatalog.xml?rev=818363&view=auto
==============================================================================
--- ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_firstProdCatalog.xml (added)
+++ ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_firstProdCatalog.xml Thu Sep 24 04:08:38 2009
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
+ xmlns:xl="http://www.w3.org/1999/xlink"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
+ xmlns="http://docbook.org/ns/docbook">
+ <title>The OFBiz Setup Edit First Catalog help screen.</title>
+ <para>
+ It provides an overview on Catalog, Category, and Product which is the first one of your organization.
+ You will be able to create/edit Catalog, Category, and Product for your organization and also be able to create order by that product.
+ </para>
+ <section>
+ <title>How do I create a Catalog?</title>
+ <para>Select the 'Product Catalog' sub menu and the screen will be displayed</para>
+ <para>Enter the 'Prod Catalog Id' field (NOTE: If you do not enter the 'Prod Catalog Id' field it will be used the default as 'Organization Party Id')</para>
+ <para>Enter the 'Catalog Name' field </para>
+ <para>Press the 'Update' button</para>
+ </section>
+ <section>
+ <title>How do I update a Catalog?</title>
+ <para>Not all the fields on the Catalog can be updated. For example Prod Catalog Id cannot be updated. If these fields need to be amended then the Catalog will need to be removed and then re-created.</para>
+ <para>Select the 'Product Catalog' sub menu and the screen will be displayed</para>
+ <para>Any existing Catalog will be displayed in the box</para>
+ <para>Amend the details in the line item that needs to be updated (eg Catalog Name)</para>
+ <para>Press the 'Update' button displayed at the end of the line item that has been updated </para>
+ </section>
+</section>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_firstProdCatalog.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_firstProdCatalog.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_firstProdCatalog.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_firstProductCategory.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_firstProductCategory.xml?rev=818363&view=auto
==============================================================================
--- ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_firstProductCategory.xml (added)
+++ ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_firstProductCategory.xml Thu Sep 24 04:08:38 2009
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
+ xmlns:xl="http://www.w3.org/1999/xlink"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
+ xmlns="http://docbook.org/ns/docbook">
+ <title>The OFBiz Setup Edit First Product Category help screen.</title>
+ <para>
+ The Edit First Product Category screen is used to manage the first category with related the first catalog.
+ </para>
+ <section>
+ <title>How do I create a Category?</title>
+ <para>Select the 'Category' sub menu and the screen will be displayed</para>
+ <para>Enter the 'Product Category Id ' field (NOTE: If you do not enter the 'Product Category Id' field it will be used the default as 'Organization Party Id')</para>
+ <para>Enter the 'Category Name' field </para>
+ <para>Enter a description describing what the category is</para>
+ <para>Press the 'Update' button</para>
+ </section>
+ <section>
+ <title>How do I update a Category?</title>
+ <para>Not all the fields on the Category can be updated. For example Prod Catalog Id cannot be updated. If these fields need to be amended then the Category will need to be removed and then re-created.</para>
+ <para>Select the 'Category' sub menu and the screen will be displayed</para>
+ <para>Any existing Category will be displayed in the box</para>
+ <para>Amend the details in the line item that needs to be updated (eg Category Name, Product Description )</para>
+ <para>Press the 'Update' button displayed at the end of the line item that has been updated </para>
+ </section>
+</section>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_firstProductCategory.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_firstProductCategory.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_firstProductCategory.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_firstcustomer.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_firstcustomer.xml?rev=818363&view=auto
==============================================================================
--- ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_firstcustomer.xml (added)
+++ ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_firstcustomer.xml Thu Sep 24 04:08:38 2009
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
+ xmlns:xl="http://www.w3.org/1999/xlink"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
+ xmlns="http://docbook.org/ns/docbook">
+ <title>The OFBiz Setup Create First Customer help screen.</title>
+ <para>
+ The First Customer screen provides create/edit the first customer of your organization and also setup the "Shipping Destination Address"
+ , "General Correspondence Address", any telephone numbers, and email addresses you want for your first customer.
+ </para>
+ <section>
+ <title>How do I update the profile information of the first customer?</title>
+ <para>After the first customer is created the profile and contact information screen will be displayed</para>
+ <para>Select the 'Update' button on the top corner of the profile information and the screen will be displayed</para>
+ <para>Any existing information will be displayed in the box</para>
+ <para>Amend the details in the profile information that needs to be updated</para>
+ <para>Press the 'Save' button</para>
+ <para>Press the 'Cancel/Done' button for go back to the first customer screen</para>
+ </section>
+</section>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_firstcustomer.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_firstcustomer.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_firstcustomer.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_firstproduct.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_firstproduct.xml?rev=818363&r1=818362&r2=818363&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_firstproduct.xml (original)
+++ ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_firstproduct.xml Thu Sep 24 04:08:38 2009
@@ -22,18 +22,27 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
xmlns="http://docbook.org/ns/docbook">
- <title>The First Product Overview</title>
+ <title>The OFBiz Setup Edit First Product help screen.</title>
<para>
- It provides an overview on product catalog, product category, and product which is the first one of your organization.
- You will be able to create product catalog, product category, and product for your organization and also be able to create order by that product.
+ The Edit First Product screen is used to manage the first product with related the first catalog and the first category.
</para>
<section>
- <title>How to create product</title>
- <para>1. When an organization is created , go to "First Product" tab button. You will see the screen for create/update product catalog, enter Catalog [ID]
- and Catalog Name , click "Update" and then product catalog is created.</para>
- <para>2. Go to "Category" tab button near "Product Catalog", You will see the screen for create/update product category, enter Product Category Id, Category Name and
- Product Description , click "Update" and then product category is created.</para>
- <para>3. Go to "Product" tab button near "Category", You will see the screen for create/update product, enter Product Id, Internal Name, Product Name, Short Description
- , Default Price, and Average Cost then click "Create Product" and then product is created.</para>
+ <title>How do I create a Product?</title>
+ <para>Select the 'Product' sub menu and the screen will be displayed</para>
+ <para>Enter the 'Product Id' field (NOTE: If you do not enter the 'Product Id' field it will be used the default as 'Organization Party Id')</para>
+ <para>Enter the 'Internal Name' field </para>
+ <para>Enter the 'Product Name' field </para>
+ <para>Enter a description describing what the category is</para>
+ <para>Enter a number in the 'Default Price' field</para>
+ <para>Enter a number in the 'Average Cost ' field</para>
+ <para>Press the 'Update' button</para>
+ </section>
+ <section>
+ <title>How do I update a Product?</title>
+ <para>Not all the fields on the Product can be updated. For example Product Id cannot be updated. If these fields need to be amended then the Product will need to be removed and then re-created.</para>
+ <para>Select the 'Product' sub menu and the screen will be displayed</para>
+ <para>Any existing Product will be displayed in the box</para>
+ <para>Amend the details in the line item that needs to be updated (eg Internal Name, Product Name, Short Description, Default Price, Average Cost)</para>
+ <para>Press the 'Update' button displayed at the end of the line item that has been updated </para>
</section>
</section>
\ No newline at end of file
Modified: ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_initialsetup.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_initialsetup.xml?rev=818363&r1=818362&r2=818363&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_initialsetup.xml (original)
+++ ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_initialsetup.xml Thu Sep 24 04:08:38 2009
@@ -38,7 +38,8 @@
<section>
<title>2. Create New Organization Section</title>
<para>
- This section provides a form for the first step of setup organization.
+ This section provides a form for create a new an organization(the first step of setup organization) and also setup the "Billing (AP) Address"
+ , "Payment (AR) Address", "General Correspondence Address", any telephone numbers, and email addresses you want for your Company.
</para>
</section>
</section>
\ No newline at end of file
Added: ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_profileCompany.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_profileCompany.xml?rev=818363&view=auto
==============================================================================
--- ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_profileCompany.xml (added)
+++ ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_profileCompany.xml Thu Sep 24 04:08:38 2009
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
+ xmlns:xl="http://www.w3.org/1999/xlink"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
+ xmlns="http://docbook.org/ns/docbook">
+ <title>The View Organization Profile help screen.</title>
+ <para>
+ This screen shows details of an individual profile. It displays specific information regarding the contact and profile information.
+ The lower part of the screen shows the contact information details indicating the address , telephone number , or email used to communicate with your organization.
+ </para>
+</section>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_profileCompany.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_profileCompany.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP_profileCompany.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ofbiz/trunk/applications/commonext/documents/CommonExt.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/documents/CommonExt.xml?rev=818363&r1=818362&r2=818363&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/documents/CommonExt.xml (original)
+++ ofbiz/trunk/applications/commonext/documents/CommonExt.xml Thu Sep 24 04:08:38 2009
@@ -29,5 +29,12 @@
<xi:include href="../data/helpdata/HELP_SETUP.xml" />
<xi:include href="../data/helpdata/HELP_SETUP_initialsetup.xml" />
+ <xi:include href="../data/helpdata/HELP_SETUP_editFacility.xml" />
+ <xi:include href="../data/helpdata/HELP_SETUP_editProductStore.xml" />
+ <xi:include href="../data/helpdata/HELP_SETUP_editWebSite.xml" />
+ <xi:include href="../data/helpdata/HELP_SETUP_firstcustomer.xml"/>
+ <xi:include href="../data/helpdata/HELP_SETUP_firstProdCatalog.xml"/>
+ <xi:include href="../data/helpdata/HELP_SETUP_firstProductCategory.xml" />
<xi:include href="../data/helpdata/HELP_SETUP_firstproduct.xml" />
-</chapter>
+ <xi:include href="../data/helpdata/HELP_SETUP_profileCompany.xml" />
+</chapter>
\ No newline at end of file
Modified: ofbiz/trunk/applications/commonext/documents/Setup.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/documents/Setup.xml?rev=818363&r1=818362&r2=818363&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/documents/Setup.xml (original)
+++ ofbiz/trunk/applications/commonext/documents/Setup.xml Thu Sep 24 04:08:38 2009
@@ -30,6 +30,13 @@
</para>
</section>
<section>
+ <title>Why we have OFBiz Setup Application?</title>
+ <para>
+ If you are the company and also want to use OFBiz for running your business then you easily be able to setting your information for start running
+ the system quickly via The OFBiz Setup Application.
+ </para>
+ </section>
+ <section>
<title>How to get start :</title>
<para>1. Open a new terminal.</para>
<para>2. Go to your ofbiz directory.</para>
@@ -40,5 +47,12 @@
<para>7. Connect to the OFBiz Setup application.</para>
</section>
<xi:include href="../data/helpdata/HELP_SETUP_initialsetup.xml" />
+ <xi:include href="../data/helpdata/HELP_SETUP_editFacility.xml" />
+ <xi:include href="../data/helpdata/HELP_SETUP_editProductStore.xml" />
+ <xi:include href="../data/helpdata/HELP_SETUP_editWebSite.xml" />
+ <xi:include href="../data/helpdata/HELP_SETUP_firstcustomer.xml"/>
+ <xi:include href="../data/helpdata/HELP_SETUP_firstProdCatalog.xml"/>
+ <xi:include href="../data/helpdata/HELP_SETUP_firstProductCategory.xml" />
<xi:include href="../data/helpdata/HELP_SETUP_firstproduct.xml" />
-</chapter>
+ <xi:include href="../data/helpdata/HELP_SETUP_profileCompany.xml" />
+</chapter>
\ No newline at end of file
Modified: ofbiz/trunk/applications/commonext/script/changeOrgPartyId.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/script/changeOrgPartyId.groovy?rev=818363&r1=818362&r2=818363&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/script/changeOrgPartyId.groovy (original)
+++ ofbiz/trunk/applications/commonext/script/changeOrgPartyId.groovy Thu Sep 24 04:08:38 2009
@@ -18,21 +18,14 @@
*/
import org.ofbiz.base.util.*;
-import org.ofbiz.entity.util.EntityUtil;
+
//partyAcctgPrefAndGroupList
partyAcctgPrefAndGroupList = [];
-organizationList = [];
partyAcctgPrefAndGroup = delegator.findAll("PartyAcctgPrefAndGroup");
iter = partyAcctgPrefAndGroup.iterator();
while (iter.hasNext()) {
group = iter.next()
partyAcctgPrefAndGroupList.add(["key":group.partyId,"value":group.groupName]);
- // find organization which have ORGANIZATION_ROLE
- organizationRoles = delegator.findByAnd("PartyRole",[partyId : group.partyId, roleTypeId : "ORGANIZATION_ROLE"]);
- organizationRole = EntityUtil.getFirst(organizationRoles);
- if(organizationRole){
- organizationList.add(organizationRole);
- }
}
globalContext.PartyAcctgPrefAndGroupList = partyAcctgPrefAndGroupList;
//hiddenFileds
@@ -40,4 +33,3 @@
hiddenFields.add([name : "userPrefTypeId", value : "ORGANIZATION_PARTY"]);
hiddenFields.add([name : "userPrefGroupTypeId", value : "GLOBAL_PREFERENCES"]);
globalContext.hiddenFields = hiddenFields;
-globalContext.organizationList = organizationList;
\ No newline at end of file
Modified: ofbiz/trunk/applications/commonext/script/org/ofbiz/setup/SetupEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/script/org/ofbiz/setup/SetupEvents.xml?rev=818363&r1=818362&r2=818363&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/script/org/ofbiz/setup/SetupEvents.xml (original)
+++ ofbiz/trunk/applications/commonext/script/org/ofbiz/setup/SetupEvents.xml Thu Sep 24 04:08:38 2009
@@ -27,10 +27,10 @@
<set field="require_login" value="false"/>
<!-- this parameter must be set to true or the createUser method below will use a default password instead of the one entered by user -->
<set field="create_allow_password" value="true"/>
-
+
<set field="parameters.roleTypeId" value="INTERNAL_ORGANIZATIO"/>
<now-timestamp field="nowStamp"/>
-
+
<!-- Create the PartyGroup -->
<call-map-processor in-map-name="parameters" out-map-name="partyGroupContext">
<simple-map-processor name="newPartyGroup">
@@ -38,10 +38,10 @@
<process field="groupName"><copy to-field="groupName"/><not-empty><fail-message message="Organization name is missing"/></not-empty></process>
</simple-map-processor>
</call-map-processor>
-
+
<!-- Create the PartyRole -->
<set field="partyRoleContext.roleTypeId" from-field="parameters.roleTypeId"/>
-
+
<!-- Create the Postal Address -->
<if-compare field="parameters.USE_ADDRESS" operator="equals" value="false">
<!-- address not used, do nothing -->
@@ -148,14 +148,14 @@
</if-compare>
<!-- get the visit from the session to get the visitId -->
<session-to-field field="visit"/>
-
+
<!-- now that everything is validated & setup, check to see if there are errors, then call the services -->
<check-errors/>
-
+
<call-service service-name="createPartyGroup" in-map-name="partyGroupContext">
<result-to-field result-name="partyId" field="tempMap.partyId"/>
</call-service>
-
+
<!-- now that we have the partyId, put it where it needs to go... -->
<set field="userLoginContext.partyId" from-field="tempMap.partyId"/>
<set field="partyGroupContext.partyId" from-field="tempMap.partyId"/>
@@ -235,10 +235,27 @@
<set field="emailPurposeContext.contactMechPurposeTypeId" value="PRIMARY_EMAIL"/>
<call-service service-name="createPartyContactMechPurpose" in-map-name="emailPurposeContext"/>
</if-not-empty>
-
+
<!-- General Ledger Setup for the new organization -->
- <call-simple-method method-name="setupDefaultGeneralLedger"/>
+ <!--<call-simple-method method-name="setupDefaultGeneralLedger"/>-->
+ <!-- create CustomTimePeriod within one years -->
+ <now-timestamp field="nowTimestamp"/>
+ <set field="endMonth" value="12"/>
+ <set field="endDate" value="31"/>
+ <call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="getYearStart" ret-field="fromDateStamp">
+ <field field="nowTimestamp" type="java.sql.Timestamp"/>
+ </call-class-method>
+ <set field="curYearString" value="${str:toString(date:year(fromDateStamp, util:defaultTimeZone(), util:defaultLocale()))}"/>
+ <set field="customTimePeriodCtx.fromDate" from-field="fromDateStamp" type="Date"/>
+ <set field="customTimePeriodCtx.thruDate" value="${groovy:org.ofbiz.base.util.UtilDateTime.toSqlDate(endMonth ,endDate , curYearString)}" type="Date"/>
+ <set field="customTimePeriodCtx.isClosed" value="N"/>
+ <set field="customTimePeriodCtx.organizationPartyId" from-field="tempMap.partyId"/>
+ <set field="customTimePeriodCtx.periodName" from-field="curYearString"/>
+ <set field="customTimePeriodCtx.periodNum" value="1" type="Long"/>
+ <set field="customTimePeriodCtx.periodTypeId" value="FISCAL_YEAR"/>
+ <call-service service-name="createCustomTimePeriod" in-map-name="customTimePeriodCtx"/>
+
<!-- Create partyId for UserLogin -->
<session-to-field field="userLoginCtx" session-name="userLogin"/>
<if-empty field="userLoginCtx.partyId">
@@ -255,22 +272,23 @@
<set field="userLoginCtx.partyId" from-field="userLoginCtx.userLoginId"/>
<store-value value-field="userLoginCtx"/>
</if-empty>
-
+
<!-- set the partyId in the request -->
<field-to-request field="tempMap.partyId" request-name="partyId"/>
</simple-method>
-
+
<simple-method method-name="setupDefaultGeneralLedger" short-description="General Ledger Setup for the new organization">
- <set field="partyId" from-field="tempMap.partyId" default-value="${parameters.partyId}"/>
+ <set field="partyId" from-field="parameters.partyId"/>
<!-- create GL journal for suspended transactions (failed post) -->
<set field="createGlJournalCtx.organizationPartyId" from-field="partyId"/>
<set field="createGlJournalCtx.glJournalName" value="Suspense transactions"/>
<call-service service-name="createGlJournal" in-map-name="createGlJournalCtx">
<result-to-field result-name="glJournalId" field="acctgPreferenceCtx.errorGlJournalId"/>
</call-service>
-
+
+ <entity-one entity-name="PartyGroup" value-field="partyGroup"/>
<call-bsh><![CDATA[
- groupName = parameters.get("groupName");
+ groupName = partyGroup.get("groupName");
if(groupName != null){
parameters.put("invoiceIdPrefix", groupName.toUpperCase().substring(0, 2)+"CI");
}else{
@@ -298,7 +316,7 @@
<call-service service-name="entityImport" in-map-name="importChartOfAccountCtx"/>
<check-errors/>
</if-empty>
-
+
<!-- create General Ledger Setup -->
<set field="pathFileString" value="file:${sys:getProperty('ofbiz.home')}/applications/commonext/data/GlAccountData.xml"/>
<set field="tempFileName" value="tempGlAccountData.xml"/>
@@ -308,9 +326,8 @@
<set field="ORGPARTYID" from-field="partyId"/>
<set field="FROMDATE" from-field="nowString"/>
<call-simple-method method-name="importTempDataFile"/>
-
</simple-method>
-
+
<simple-method method-name="createCustomer" short-description="Create Customer" login-required="false">
<set field="require_email" value="true"/>
<set field="require_phone" value="false"/>
@@ -334,11 +351,17 @@
<field-to-request field="organizationPartyId" request-name="partyId"/>
<field-to-request field="tempMap.partyId" request-name="customerId"/>
</simple-method>
-
+
<simple-method method-name="createFacilityAndContactMech" short-description="create Facility and ContactMech">
+ <if-empty field="parameters.facilityName">
+ <add-error><fail-message message="Facility Name is missing"/></add-error>
+ </if-empty>
+ <check-errors/>
+
<make-value value-field="newEntity" entity-name="Facility"/>
<set field="defaultDaysToShip" from-field="parameters.defaultDaysToShip" type="Long"/>
<clear-field field="parameters.defaultDaysToShip"/>
+
<set-nonpk-fields value-field="newEntity" map="parameters"/>
<set field="newEntity.defaultDaysToShip" from-field="defaultDaysToShip" type="Long"/>
@@ -354,11 +377,16 @@
<field-to-request field="facilityId" request-name="facilityId"/>
<create-value value-field="newEntity"/>
- <set-service-fields service-name="createPostalAddress" map="parameters" to-map="addressContext"/>
+ <!-- create Facility ContactMech-->
+ <entity-and entity-name="PartyAndPostalAddress" list="listPartyPostalAddress" filter-by-date="true">
+ <field-map field-name="partyId" from-field="parameters.partyId"/>
+ </entity-and>
+ <first-from-list entry="partyPostalAddress" list="listPartyPostalAddress"/>
+ <set-service-fields service-name="createPostalAddress" map="partyPostalAddress" to-map="addressContext"/>
<call-service service-name="createPostalAddress" in-map-name="addressContext">
<result-to-field result-name="contactMechId" field="contactMechId"/>
</call-service>
-
+
<set field="facilityContactMechCtx.contactMechId" from-field="contactMechId"/>
<set field="facilityContactMechCtx.facilityId" from-field="facilityId"/>
<call-service service-name="createFacilityContactMech" in-map-name="facilityContactMechCtx"/>
@@ -372,9 +400,11 @@
<set field="addressPurposeContext.contactMechPurposeTypeId" value="SHIP_ORIG_LOCATION"/>
<call-service service-name="createFacilityContactMechPurpose" in-map-name="addressPurposeContext"/>
</simple-method>
-
+
<simple-method method-name="createProductStoreWithDefaultSetting" short-description="create ProductStore and setting default value for payment and shipping">
- <!-- Create ProductStore -->
+ <if-empty field="parameters.storeName">
+ <add-error><fail-message message="Store Name is missing"/></add-error>
+ </if-empty>
<if-compare field="parameters.showPricesWithVatTax" operator="equals" value="Y">
<if-empty field="parameters.vatTaxAuthGeoId">
<add-error><fail-property property="ProductVatTaxAuthGeoNotSet" resource="ProductUiLabels"/></add-error>
@@ -382,8 +412,10 @@
<if-empty field="parameters.vatTaxAuthPartyId">
<add-error><fail-property property="ProductVatTaxAuthPartyNotSet" resource="ProductUiLabels"/></add-error>
</if-empty>
- <check-errors/>
</if-compare>
+ <check-errors/>
+
+ <!-- Create ProductStore -->
<make-value value-field="newEntity" entity-name="ProductStore"/>
<set-nonpk-fields value-field="newEntity" map="parameters"/>
<set field="newEntity.storeCreditValidDays" value="90" type="Long"/>
@@ -400,7 +432,7 @@
<set field="productStoreId" from-field="newEntity.productStoreId"/>
<field-to-request field="productStoreId" request-name="productStoreId"/>
<create-value value-field="newEntity"/>
-
+
<!-- create the ProductStoreFacility record -->
<now-timestamp field="nowTimestamp"/>
<if-not-empty field="newEntity.inventoryFacilityId">
@@ -423,7 +455,7 @@
<call-service service-name="entityImport" in-map-name="importShippingCtx"/>
<check-errors/>
</if-empty>
-
+
<!-- Import Default ProductStore & Shipment data -->
<set field="pathFileString" value="file:${sys:getProperty('ofbiz.home')}/applications/commonext/data/ProductStoreData.xml"/>
<set field="tempFileName" value="tempProductStore.xml"/>
@@ -432,7 +464,7 @@
<set field="PRODUCTSTOREID" from-field="productStoreId"/>
<call-simple-method method-name="importTempDataFile"/>
</simple-method>
-
+
<simple-method method-name="createProdCatalogAndProductStoreCatalog" short-description="create ProdCatalog And ProductStoreCatalog">
<set-service-fields service-name="createProdCatalog" map="parameters" to-map="createProdCatalogCtx"/>
Modified: ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/FindFacility.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/FindFacility.groovy?rev=818363&r1=818362&r2=818363&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/FindFacility.groovy (original)
+++ ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/FindFacility.groovy Thu Sep 24 04:08:38 2009
@@ -18,12 +18,13 @@
*/
import org.ofbiz.base.util.*
import org.ofbiz.entity.util.EntityUtil;
-
+
findResult = delegator.findByAnd("Facility", [ownerPartyId: partyId]);
findResultSize = findResult.size();
if (findResultSize == 1) {
context.showScreen = "one";
- context.facility = findResult.get(0);
+ facility = findResult.get(0);
+ context.facility = facility;
context.parameters.facilityId = context.facility.facilityId;
}
if ((findResultSize > 1 ) && (findResultSize <= 10)) {
@@ -44,4 +45,16 @@
}else{
context.showScreen = "origin";
}
+}else if("facility".equals(tabButtonItemTop)){
+ facilityId = parameters.facilityId;
+ if (!facilityId && request.getAttribute("facilityId")) {
+ facilityId = request.getAttribute("facilityId");
+ }
+ facility = delegator.findOne("Facility", [facilityId : facilityId], false);
+ if(facility){
+ facilityType = facility.getRelatedOne("FacilityType");
+ context.facilityType = facilityType;
+ }
+ context.facility = facility;
+ context.facilityId = facilityId;
}
\ No newline at end of file
Modified: ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProductStoreAndWebSite.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProductStoreAndWebSite.groovy?rev=818363&r1=818362&r2=818363&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProductStoreAndWebSite.groovy (original)
+++ ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProductStoreAndWebSite.groovy Thu Sep 24 04:08:38 2009
@@ -39,10 +39,5 @@
context.showScreen = "message";
return;
}
-
- if(webSite){
- webSiteId = webSite.webSiteId;
- }
- context.webSiteId = webSiteId;
- context.webSite = webSite;
-}
\ No newline at end of file
+ context.webSite = webSite;
+}
Modified: ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/controller.xml?rev=818363&r1=818362&r2=818363&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/controller.xml Thu Sep 24 04:08:38 2009
@@ -51,6 +51,10 @@
<security https="true" auth="true"/>
<response name="success" type="view" value="viewprofile" save-home-view="true"/>
</request-map>
+ <request-map uri="showMessage">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="showMessage"/>
+ </request-map>
<!-- Entity Export requests -->
<request-map uri="EntityExportAll"><security https="true" auth="true"/><response name="success" type="view" value="EntityExportAll"/><response name="error" type="view" value="EntityExportAll"/></request-map>
@@ -89,17 +93,10 @@
<response name="success" type="view" value="viewprofile"/>
<response name="error" type="view" value="initialsetup"/>
</request-map>
-
- <request-map uri="addGeneralLedger">
- <security https="true" auth="true"/>
- <event type="simple" path="component://commonext/script/org/ofbiz/setup/SetupEvents.xml" invoke="setupDefaultGeneralLedger"/>
- <response name="success" type="view" value="viewprofile"/>
- <response name="error" type="view" value="initialsetup"/>
- </request-map>
-
+
<request-map uri="OrganizationToComplete">
<security https="true" auth="true"/>
- <event type="service" invoke="createPartyRole"/>
+ <event type="simple" path="component://commonext/script/org/ofbiz/setup/SetupEvents.xml" invoke="setupDefaultGeneralLedger"/>
<response name="success" type="view" value="initialsetup"/>
<response name="error" type="view" value="initialsetup"/>
</request-map>
@@ -174,7 +171,7 @@
<response name="success" type="view" value="EditCategory"/>
<response name="error" type="view" value="EditCategory"/>
</request-map>
- <request-map uri="NewProduct">
+ <request-map uri="EditProduct">
<security https="true" auth="true"/>
<response name="success" type="view" value="EditProduct"/>
</request-map>
@@ -209,6 +206,7 @@
<!-- View Mappings -->
<view-map name="initialsetup" type="screen" page="component://commonext/widget/ofbizsetup/SetupScreens.xml#InitialSetup"/>
+ <view-map name="showMessage" type="screen" page="component://commonext/widget/ofbizsetup/SetupScreens.xml#nopartyAcctgPreference"/>
<view-map name="viewprofile" type="screen" page="component://commonext/widget/ofbizsetup/ProfileScreens.xml#viewprofile"/>
<view-map name="EditPerson" type="screen" page="component://commonext/widget/ofbizsetup/ProfileScreens.xml#EditPerson"/>
<view-map name="EditPartyGroup" type="screen" page="component://commonext/widget/ofbizsetup/ProfileScreens.xml#EditPartyGroup"/>
Modified: ofbiz/trunk/applications/commonext/webapp/ofbizsetup/organization/EditFacility.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/webapp/ofbizsetup/organization/EditFacility.ftl?rev=818363&r1=818362&r2=818363&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/webapp/ofbizsetup/organization/EditFacility.ftl (original)
+++ ofbiz/trunk/applications/commonext/webapp/ofbizsetup/organization/EditFacility.ftl Thu Sep 24 04:08:38 2009
@@ -1,93 +0,0 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<#if security.hasEntityPermission("FACILITY", "_VIEW", session)>
-<#if facilityId?has_content>
- <h1>${uiLabelMap.ProductEditFacility} ${facility.facilityName?if_exists} [${facilityId?if_exists}]</h1>
- <#--div class="button-bar">
- <a href="<@o...@ofbizUrl>" name="EditFacilityForm" class="buttontext">${uiLabelMap.ProductNewFacility}</a>
- <a href="/workeffort/control/calendar?facilityId=${facilityId}&externalLoginKey=${requestAttributes.externalLoginKey?if_exists}" class="buttontext">${uiLabelMap.CommonViewCalendar}</a>
- </div-->
-<#else>
- <h1>${uiLabelMap.ProductNewFacility}</h1>
-</#if>
-
-<#if facility?exists && facilityId?has_content>
- <form action="<@o...@ofbizUrl>" name="EditFacilityForm" method="post">
- <input type="hidden" name="facilityId" value="${facilityId?if_exists}">
- <table class="basic-table" cellspacing='0'>
- <tr>
- <td class="label">${uiLabelMap.ProductFacilityId}</td>
- <td>
- ${facilityId?if_exists} <span class="tooltip">${uiLabelMap.ProductNotModificationRecrationFacility}</span>
- </td>
- </tr>
-<#else>
- <form action="<@o...@ofbizUrl>" name="EditFacilityForm" method="post" style='margin: 0;'>
- <#if facilityId?exists>
- <h3>${uiLabelMap.ProductCouldNotFindFacilityWithId} "${facilityId?if_exists}".</h3>
- </#if>
- <table class="basic-table" cellspacing='0'>
- <tr>
- <td class="label">${uiLabelMap.ProductFacilityId}</td>
- <td><input type="text" class="required" name="facilityId" value="${partyId?default("")}" size="30" maxlength="60"><span class="tooltip">${uiLabelMap.CommonRequired}</span></td>
- </tr>
-</#if>
- <input type="hidden" name="partyId" value="${partyId?default("")}"/>
- <input type="hidden" name="facilityTypeId" value="${facilityType.facilityTypeId?default("WAREHOUSE")}"/>
- <input type="hidden" name="ownerPartyId" value="${facility.ownerPartyId?default(partyId)?default("")}"/>
- <input type="hidden" name="defaultInventoryItemTypeId" value="${facility.defaultInventoryItemTypeId?default("NON_SERIAL_INV_ITEM")}"/>
- <input type="hidden" name="defaultWeightUomId" value="${facility.defaultWeightUomId?default("WT_lb")}"/>
- <input type="hidden" name="squareFootage" value="${facility.squareFootage?if_exists}"/>
-<#if partyPostalAddress?has_content>
- <input type="hidden" name="toName" value="${partyPostalAddress.toName?if_exists}"/>
- <input type="hidden" name="attnName" value="${partyPostalAddress.attnName?if_exists}"/>
- <input type="hidden" name="address1" value="${partyPostalAddress.address1?if_exists}"/>
- <input type="hidden" name="address2" value="${partyPostalAddress.address2?if_exists}"/>
- <input type="hidden" name="city" value="${partyPostalAddress.city?if_exists}"/>
- <input type="hidden" name="countryGeoId" value="${partyPostalAddress.countryGeoId?if_exists}"/>
- <input type="hidden" name="postalCode" value="${partyPostalAddress.postalCode?if_exists}"/>
- <input type="hidden" name="stateProvinceGeoId" value="${partyPostalAddress.stateProvinceGeoId?if_exists}"/>
-</#if>
- <tr>
- <td class="label">${uiLabelMap.ProductName}</td>
- <td><input type="text" name="facilityName" value="${facility.facilityName?if_exists}" size="30" maxlength="60"></td>
- </tr>
- <tr>
- <td class="label">${uiLabelMap.SetupFacilityDescription}</td>
- <td ><input type="text" name="description" value="${facility.description?if_exists}" size="60" maxlength="250"></td>
- </tr>
- <tr>
- <td class="label">${uiLabelMap.ProductDefaultDaysToShip}</td>
- <td><input type="text" name="defaultDaysToShip" value="${facility.defaultDaysToShip?if_exists}" size="10" maxlength="20"></td>
- </tr>
- <tr>
- <td> </td>
- <#if facilityId?has_content>
- <td><input type="submit" name="Update" value="${uiLabelMap.CommonUpdate}"></td>
- <#else>
- <td><input type="submit" name="Update" value="${uiLabelMap.CommonSave}"></td>
- </#if>
- </tr>
-</table>
-</form>
-
-<#else>
- <h3>${uiLabelMap.ProductFacilityViewPermissionError}</h3>
-</#if>
\ No newline at end of file
Modified: ofbiz/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml?rev=818363&r1=818362&r2=818363&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml Thu Sep 24 04:08:38 2009
@@ -58,9 +58,6 @@
<set field="partyId" from-field="parameters.partyId"/>
<entity-one entity-name="Party" value-field="party"/>
<entity-one entity-name="PartyGroup" value-field="lookupGroup"/>
- <entity-one entity-name="Facility" value-field="lookupFacility"/>
- <entity-one entity-name="WebSite" value-field="lookupWebSite"/>
- <entity-one entity-name="ProductStore" value-field="lookupProductStore"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -147,31 +144,4 @@
</widgets>
</section>
</screen>
-
- <screen name="CommonMyCommunicationEventDecorator">
- <section>
- <actions>
- <set field="headerItem" value="mycomm"/>
- <set field="my" value="My" global="true"/>
- </actions>
- <widgets>
- <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <section>
- <condition>
- <if-has-permission action="_VIEW" permission="PARTYMGR"/>
- </condition>
- <widgets>
- <include-menu name="MyCommSubTabBar" location="component://party/widget/partymgr/PartyMenus.xml"/>
- <decorator-section-include name="body"/>
- </widgets>
- <fail-widgets>
- <label style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label>
- </fail-widgets>
- </section>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
</screens>
\ No newline at end of file
Modified: ofbiz/trunk/applications/commonext/widget/ofbizsetup/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/ofbizsetup/Menus.xml?rev=818363&r1=818362&r2=818363&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/ofbizsetup/Menus.xml (original)
+++ ofbiz/trunk/applications/commonext/widget/ofbizsetup/Menus.xml Thu Sep 24 04:08:38 2009
@@ -76,7 +76,7 @@
</link>
</menu-item>
<menu-item name="product" title="${uiLabelMap.ProductProduct}">
- <link target="NewProduct">
+ <link target="EditProduct">
<parameter param-name="partyId"/>
</link>
</menu-item>
Modified: ofbiz/trunk/applications/commonext/widget/ofbizsetup/ProfileScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/ofbizsetup/ProfileScreens.xml?rev=818363&r1=818362&r2=818363&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/ofbizsetup/ProfileScreens.xml (original)
+++ ofbiz/trunk/applications/commonext/widget/ofbizsetup/ProfileScreens.xml Thu Sep 24 04:08:38 2009
@@ -84,7 +84,7 @@
</fail-widgets>
</section>
</decorator-section>
- </decorator-screen>
+ </decorator-screen>
</widgets>
</section>
</screen>
@@ -121,7 +121,7 @@
<include-screen name="Party"/>
<include-screen name="Contact"/>
</decorator-section>
- </decorator-screen>
+ </decorator-screen>
</widgets>
</section>
</screen>
@@ -239,7 +239,7 @@
</widgets>
</section>
</screenlet>
- </fail-widgets>
+ </fail-widgets>
</section>
</widgets>
</section>
@@ -250,16 +250,11 @@
<screen name="Contact">
<section>
<actions>
- <set field="partyId" from-field="parameters.partyId" default-value="${userLogin.partyId}"/>
+ <set field="partyId" from-field="customerPartyId" default-value="${parameters.partyId}"/>
<script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetContactMechs.groovy"/>
<script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy"/>
</actions>
<widgets>
- <!--<platform-specific>
- <html>
- <html-template location="component://commonext/webapp/ofbizsetup/organization/viewcontact.ftl"/>
- </html>
- </platform-specific>-->
<platform-specific>
<html>
<html-template location="component://party/webapp/partymgr/party/profileblocks/Contact.ftl"/>
Modified: ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml?rev=818363&r1=818362&r2=818363&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml (original)
+++ ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml Thu Sep 24 04:08:38 2009
@@ -90,6 +90,26 @@
<field name="statusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
</form>
+ <form name="EditFacility" type="single" target="UpdateFacility" default-map-name="facility"
+ header-row-style="header-row" default-table-style="basic-table">
+ <alt-target use-when="facility==null" target="CreateFacility"/>
+
+ <field use-when="facility!=null" name="facilityId" tooltip="${uiLabelMap.ProductNotModificationRecreatingProductStore}"><display/></field>
+ <field use-when="facility==null" name="facilityId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text default-value="${partyId}"/></field>
+
+ <field name="facilityName" title="${uiLabelMap.ProductName}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30" maxlength="60"/></field>
+ <field name="description" title="${uiLabelMap.SetupFacilityDescription}"><text size="60" maxlength="250"/></field>
+ <field name="defaultDaysToShip" title="${uiLabelMap.ProductDefaultDaysToShip}"><text size="10" maxlength="20"/></field>
+ <field name="facilityTypeId"><hidden value="WAREHOUSE"/></field>
+ <field name="ownerPartyId"><hidden value="${partyId}"/></field>
+ <field name="defaultInventoryItemTypeId"><hidden value="NON_SERIAL_INV_ITEM"/></field>
+ <field name="defaultWeightUomId"><hidden value="WT_lb"/></field>
+ <field name="partyId"><hidden value="${partyId}"/></field>
+
+ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" use-when="facility!=null" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonSave}" use-when="facility==null" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+
<form name="EditProductStore" type="single" target="updateProductStore" title="" default-map-name="productStore"
header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="productStore==null" target="createProductStore"/>
@@ -98,7 +118,7 @@
<field use-when="productStore==null&&productStoreId==null" name="productStoreId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text default-value="${partyId}"/></field>
<field use-when="productStore==null&&productStoreId!=null" name="productStoreId" tooltip="${uiLabelMap.CommonCannotBeFound}: [${productStoreId}]"><text size="20" maxlength="20"/></field>
- <field name="storeName" title="${uiLabelMap.ProductStoreName}"><text size="30" maxlength="60"/></field>
+ <field name="storeName" title="${uiLabelMap.ProductStoreName}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30" maxlength="60"/></field>
<field name="companyName"><hidden value="${partyGroup.groupName}"/></field>
<field name="primaryStoreGroupId"><hidden/></field>
<field name="title"><hidden/></field>
@@ -175,7 +195,9 @@
</form>
<form name="EditWebSite" extends="EditWebSite" extends-resource="component://content/webapp/content/website/WebSiteForms.xml">
+ <actions><set field="webSiteId" from-field="webSite.webSiteId"/></actions>
<field use-when="webSite==null&&webSiteId==null" name="webSiteId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text default-value="${partyId}"/></field>
+ <field name="siteName" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30" maxlength="60"/></field>
<field name="partyId"><hidden value="${partyId}"/></field>
<field name="httpHost"><hidden/></field>
<field name="httpPort"><hidden/></field>
@@ -187,7 +209,6 @@
<field name="cookieDomain"><hidden/></field>
<field name="productStoreId"><hidden/></field>
<field name="allowProductStoreChange"><hidden/></field>
- <field name="siteName" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30" maxlength="60"/></field>
</form>
<form name="EditProdCatalog" extends="EditProdCatalog" extends-resource="component://product/webapp/catalog/catalog/ProdCatalogForms.xml">
@@ -252,29 +273,21 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar" view-size="10">
<row-actions>
<entity-one entity-name="PartyAcctgPreference" value-field="partyAcctgPreference"/>
- <entity-condition entity-name="PartyRole" list="partyRoles">
- <condition-list combine="and">
- <condition-expr field-name="partyId" operator="equals" from-field="partyId"/>
- <condition-expr field-name="roleTypeId" operator="equals" value="ORGANIZATION_ROLE"/>
- </condition-list>
- </entity-condition>
- <set field="partyRole" from-field="partyRoles[0]"/>
+ <entity-one entity-name="PartyGroup" value-field="partyGroup"/>
</row-actions>
- <field name="partyId" title="${uiLabelMap.AccountingCompanies}"><display-entity entity-name="PartyGroup" description="${groupName}"/></field>
- <field name="setup" title="${uiLabelMap.CommonEmptyHeader}" use-when="partyAcctgPreference==null" widget-style="buttontext">
- <hyperlink target="addGeneralLedger" description="${uiLabelMap.AccountingSetup}">
+ <field name="partyId" title="${uiLabelMap.AccountingCompanies}" use-when="partyAcctgPreference==null" widget-style="buttontext">
+ <hyperlink target="viewprofile" description="${partyGroup.groupName} [${partyId}]">
<parameter param-name="partyId"/>
</hyperlink>
</field>
- <field name="setup" title="${uiLabelMap.CommonEmptyHeader}" use-when="partyAcctgPreference!=null" widget-style="buttontext">
- <hyperlink target="viewprofile" description="${uiLabelMap.AccountingSetup}">
+ <field name="partyId" title="${uiLabelMap.AccountingCompanies}" use-when="partyAcctgPreference!=null" widget-style="buttontext">
+ <hyperlink target="showMessage" description="${partyGroup.groupName} [${partyId}]">
<parameter param-name="partyId"/>
</hyperlink>
</field>
- <field name="setToComplete" title="${uiLabelMap.CommonEmptyHeader}" use-when="partyRole==null" widget-style="buttontext">
+ <field name="setToComplete" title="${uiLabelMap.CommonEmptyHeader}" use-when="partyAcctgPreference==null" widget-style="buttontext">
<hyperlink target="OrganizationToComplete" description="${uiLabelMap.SetupSetToComplete}">
<parameter param-name="partyId"/>
- <parameter param-name="roleTypeId" value="ORGANIZATION_ROLE"/>
</hyperlink>
</field>
</form>