You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2009/12/12 00:11:51 UTC
svn commit: r889851 [17/17] - in /ofbiz/branches/addbirt: ./
applications/accounting/config/ applications/accounting/data/
applications/accounting/data/helpdata/ applications/accounting/entitydef/
applications/accounting/script/org/ofbiz/accounting/fin...
Modified: ofbiz/branches/addbirt/macros.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/macros.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/macros.xml (original)
+++ ofbiz/branches/addbirt/macros.xml Fri Dec 11 23:11:39 2009
@@ -43,6 +43,10 @@
<path id="ant.lib.class.path">
<pathelement location="${ofbiz.home.dir}/framework/base/lib/ant/ant-nodeps-1.7.0.jar"/>
</path>
+ <path id="junit.class.path">
+ <fileset dir="${ofbiz.home.dir}/framework/base/lib/scripting/" includes="*.jar"/>
+ <pathelement location="${ofbiz.home.dir}/framework/base/lib/ant/ant-apache-bsf-1.7.0.jar"/>
+ </path>
<path id="local.class.path"/>
<presetdef name="default-javac">
Modified: ofbiz/branches/addbirt/specialpurpose/assetmaint/widget/forms/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/specialpurpose/assetmaint/widget/forms/LookupForms.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/specialpurpose/assetmaint/widget/forms/LookupForms.xml (original)
+++ ofbiz/branches/addbirt/specialpurpose/assetmaint/widget/forms/LookupForms.xml Fri Dec 11 23:11:39 2009
@@ -28,6 +28,6 @@
<field name="firstName" title="${uiLabelMap.PartyFirstName}"><text-find/></field>
<field name="lastName" title="${uiLabelMap.PartyLastName}"><text-find/></field>
<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.CommonLookup}"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field>
</form>
</forms>
\ No newline at end of file
Modified: ofbiz/branches/addbirt/specialpurpose/assetmaint/widget/ismgr/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/specialpurpose/assetmaint/widget/ismgr/FieldLookupForms.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/specialpurpose/assetmaint/widget/ismgr/FieldLookupForms.xml (original)
+++ ofbiz/branches/addbirt/specialpurpose/assetmaint/widget/ismgr/FieldLookupForms.xml Fri Dec 11 23:11:39 2009
@@ -36,7 +36,7 @@
</drop-down>
</field>
<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.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListLookupComputerHardware" list-name="listIt" title="" type="list" paginate-target="LookupComputerHardware"
@@ -71,7 +71,7 @@
</drop-down>
</field>
<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.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListLookupComputerSoftware" list-name="listIt" title="" type="list" paginate-target="LookupComputerSoftware"
Modified: ofbiz/branches/addbirt/specialpurpose/cmssite/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/specialpurpose/cmssite/ofbiz-component.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/specialpurpose/cmssite/ofbiz-component.xml (original)
+++ ofbiz/branches/addbirt/specialpurpose/cmssite/ofbiz-component.xml Fri Dec 11 23:11:39 2009
@@ -31,12 +31,5 @@
location="webapp/cmssite"
mount-point="/cmssite"
app-bar-display="true"/>
- <webapp name="ofbizsite"
- title="OFBiz Site"
- menu-name="secondary"
- server="default-server"
- location="webapp/ofbizsite"
- mount-point="/ofbiz"
- app-bar-display="true"/>
</ofbiz-component>
Modified: ofbiz/branches/addbirt/specialpurpose/cmssite/template/cms/HtmlHead.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/specialpurpose/cmssite/template/cms/HtmlHead.ftl?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/specialpurpose/cmssite/template/cms/HtmlHead.ftl (original)
+++ ofbiz/branches/addbirt/specialpurpose/cmssite/template/cms/HtmlHead.ftl Fri Dec 11 23:11:39 2009
@@ -19,6 +19,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
+<#assign initialLocale = locale.toString()>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>${(decoratedContent.subcontent.title.render)?default("CMS Site Generic Title (Set subcontent 'title' on your content!)")}</title>
@@ -26,8 +27,8 @@
<script language="javascript" src="/images/prototypejs/prototype.js" type="text/javascript"></script>
<script language="javascript" src="/images/fieldlookup.js" type="text/javascript"></script>
<script language="javascript" src="/images/selectall.js" type="text/javascript"></script>
- <script language="javascript" src="/images/calendar_date_select.js" type="text/javascript"></script>
-
+ <script language="javascript" src="/images/calendarDateSelect/calendar_date_select.js" type="text/javascript"></script>
+ <script language="javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
<link rel="stylesheet" href="/images/ecommain.css" type="text/css"/>
<link rel="stylesheet" href="/ecommerce/images/blog.css" type="text/css"/>
<link rel="stylesheet" href="/content/images/contentForum.css" type="text/css"/>
Modified: ofbiz/branches/addbirt/specialpurpose/cmssite/template/ofbiz/ofbizMenu.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/specialpurpose/cmssite/template/ofbiz/ofbizMenu.ftl?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/specialpurpose/cmssite/template/ofbiz/ofbizMenu.ftl (original)
+++ ofbiz/branches/addbirt/specialpurpose/cmssite/template/ofbiz/ofbizMenu.ftl Fri Dec 11 23:11:39 2009
@@ -60,7 +60,7 @@
<a href="http://fisheye6.cenqua.com/browse/ofbiz">Source Browse and Stats (Fisheye)</a>
<!-- no RSS feed any more... <a href="http://www.ofbiz.org/rss/svnlog.rss">SVN Commit RSS Feed</a> -->
<a href="http://api.ofbiz.org/">API Reference (Javadoc)</a>
- <a href="http://docs.ofbiz.org/display/OFBIZ">Documentation Site: Wiki</a>
+ <a href="http://cwiki.apache.org/confluence/display/OFBIZ">Documentation Site: Wiki</a>
<a href="VideosConf.html">Conference Videos</a>
<a href="http://docs.ofbiz.org/x/QQg">Books</a>
Modified: ofbiz/branches/addbirt/specialpurpose/component-load.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/specialpurpose/component-load.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/specialpurpose/component-load.xml (original)
+++ ofbiz/branches/addbirt/specialpurpose/component-load.xml Fri Dec 11 23:11:39 2009
@@ -25,6 +25,7 @@
<load-component component-location="hhfacility"/>
<load-component component-location="assetmaint"/>
<load-component component-location="cmssite"/>
+ <load-component component-location="ofbizwebsite"/>
<load-component component-location="projectmgr"/>
<load-component component-location="oagis"/>
<load-component component-location="googlebase"/>
Modified: ofbiz/branches/addbirt/specialpurpose/ebay/data/EbayHelpData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/specialpurpose/ebay/data/EbayHelpData.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/specialpurpose/ebay/data/EbayHelpData.xml (original)
+++ ofbiz/branches/addbirt/specialpurpose/ebay/data/EbayHelpData.xml Fri Dec 11 23:11:39 2009
@@ -34,8 +34,54 @@
<!-- features -->
<DataResource dataResourceId="EBAY_Features" localeString="en" dataResourceTypeId="OFBIZ_FILE"
- objectInfo="specialpurpose/ebay/data/helpdata/HELP_EBAY_Features.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay Features" mimeTypeId="text/xml" isPublic="Y" />
+ objectInfo="specialpurpose/ebay/data/helpdata/HELP_EBAY_Features.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="EBAY_Features" contentTypeId="DOCUMENT" contentName="Ebay features." templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_Features" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
<ContentAssoc contentId="HELP_EBAY" contentIdTo="EBAY_Features" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/>
+ <!-- -->
+ <DataResource dataResourceId="EBAY_FindEbayConfig" localeString="en" dataResourceTypeId="OFBIZ_FILE"
+ objectInfo="specialpurpose/ebay/data/helpdata/HELP_EBAY_FindConfigurations.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" />
+ <Content contentId="EBAY_FindEbayConfig" contentTypeId="DOCUMENT" contentName="Ebay find configurations." templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_FindEbayConfig" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+ <ContentAssoc contentId="HELP_EBAY" contentIdTo="EBAY_FindEbayConfig" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_FindEbayConfigurations"/>
+
+ <DataResource dataResourceId="EBAY_EditEbayConfig" localeString="en" dataResourceTypeId="OFBIZ_FILE"
+ objectInfo="specialpurpose/ebay/data/helpdata/HELP_EBAY_EditEbayConfiguration.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" />
+ <Content contentId="EBAY_EditEbayConfig" contentTypeId="DOCUMENT" contentName="Ebay edit configurations." templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_EditEbayConfig" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+ <ContentAssoc contentId="HELP_EBAY" contentIdTo="EBAY_EditEbayConfig" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_EditEbayConfiguration"/>
+
+ <DataResource dataResourceId="EBAY_AddEbayConfig" localeString="en" dataResourceTypeId="OFBIZ_FILE"
+ objectInfo="specialpurpose/ebay/data/helpdata/HELP_EBAY_AddEbayConfiguration.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" />
+ <Content contentId="EBAY_AddEbayConfig" contentTypeId="DOCUMENT" contentName="EBAY_AddEbayConfig" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_AddEbayConfig" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+ <ContentAssoc contentId="HELP_EBAY" contentIdTo="EBAY_AddEbayConfig" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_EditEbayConfiguration"/>
+
+ <DataResource dataResourceId="EBAY_ShippingMethods" localeString="en" dataResourceTypeId="OFBIZ_FILE"
+ objectInfo="specialpurpose/ebay/data/helpdata/HELP_EBAY_ShippingMethods.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" />
+ <Content contentId="EBAY_ShippingMethods" contentTypeId="DOCUMENT" contentName="Ebay shippingMethods" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_ShippingMethods" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+ <ContentAssoc contentId="HELP_EBAY" contentIdTo="EBAY_ShippingMethods" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_EbayShippingMethods"/>
+
+ <DataResource dataResourceId="EBAY_AdvanceSearch" localeString="en" dataResourceTypeId="OFBIZ_FILE"
+ objectInfo="specialpurpose/ebay/data/helpdata/HELP_EBAY_AdvanceSearch.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" />
+ <Content contentId="EBAY_AdvanceSearch" contentTypeId="DOCUMENT" contentName="Ebay advance Search" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_AdvanceSearch" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+ <ContentAssoc contentId="HELP_EBAY" contentIdTo="EBAY_AdvanceSearch" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_advancedsearch"/>
+
+ <DataResource dataResourceId="EBAY_KeywordSearch" localeString="en" dataResourceTypeId="OFBIZ_FILE"
+ objectInfo="specialpurpose/ebay/data/helpdata/HELP_EBAY_KeywordSearch.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" />
+ <Content contentId="EBAY_KeywordSearch" contentTypeId="DOCUMENT" contentName="Ebay keyword Search" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_KeywordSearch" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+ <ContentAssoc contentId="HELP_EBAY" contentIdTo="EBAY_KeywordSearch" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_keywordsearch"/>
+
+ <DataResource dataResourceId="EBAY_ProdsExpToEbay" localeString="en" dataResourceTypeId="OFBIZ_FILE"
+ objectInfo="specialpurpose/ebay/data/helpdata/HELP_EBAY_ProductsExportToEbay.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" />
+ <Content contentId="EBAY_ProdsExpToEbay" contentTypeId="DOCUMENT" contentName="Ebay products export to Ebay" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_ProdsExpToEbay" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+ <ContentAssoc contentId="HELP_EBAY" contentIdTo="EBAY_ProdsExpToEbay" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_ProductsExportToEbay"/>
+
+ <DataResource dataResourceId="EBAY_MOrdsFromEbay" localeString="en" dataResourceTypeId="OFBIZ_FILE"
+ objectInfo="specialpurpose/ebay/data/helpdata/HELP_EBAY_ManageOrdersFromEbay.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" />
+ <Content contentId="EBAY_MOrdsFromEbay" contentTypeId="DOCUMENT" contentName="Ebay import single transections from Ebay" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_MOrdsFromEbay" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+ <ContentAssoc contentId="HELP_EBAY" contentIdTo="EBAY_MOrdsFromEbay" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_ManageOrdersFromEbay"/>
+
+ <DataResource dataResourceId="EBAY_EbayOrders" localeString="en" dataResourceTypeId="OFBIZ_FILE"
+ objectInfo="specialpurpose/ebay/data/helpdata/HELP_EBAY_eBayOrders.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" />
+ <Content contentId="EBAY_EbayOrders" contentTypeId="DOCUMENT" contentName="Ebay orders import" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_EbayOrders" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+ <ContentAssoc contentId="HELP_EBAY" contentIdTo="EBAY_EbayOrders" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_FindEbayOrders"/>
+
</entity-engine-xml>
Modified: ofbiz/branches/addbirt/specialpurpose/ebay/data/helpdata/HELP_EBAY.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/specialpurpose/ebay/data/helpdata/HELP_EBAY.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/specialpurpose/ebay/data/helpdata/HELP_EBAY.xml (original)
+++ ofbiz/branches/addbirt/specialpurpose/ebay/data/helpdata/HELP_EBAY.xml Fri Dec 11 23:11:39 2009
@@ -26,9 +26,7 @@
<title>The Ebay application introduction.</title>
<para>
- The Ebay component provides an interface to the Ebay website.
+ The Ebay component provides an interface to the Ebay website. It is possible to export products from your store into eBay category also import an orders from ebay.
</para>
- <xi:include href="HELP_EBAY_main.xml" />
-
</section>
Modified: ofbiz/branches/addbirt/specialpurpose/ebay/data/helpdata/HELP_EBAY_Features.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/specialpurpose/ebay/data/helpdata/HELP_EBAY_Features.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/specialpurpose/ebay/data/helpdata/HELP_EBAY_Features.xml (original)
+++ ofbiz/branches/addbirt/specialpurpose/ebay/data/helpdata/HELP_EBAY_Features.xml Fri Dec 11 23:11:39 2009
@@ -17,14 +17,25 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://docbook.org/ns/docbook ../../../../applications/content/dtd/docbook.xsd">
<title>Ebay Features</title>
- <para>
- <orderedlist>
- <listitem>
- <para>Product Export to Ebay</para>
- </listitem>
- <listitem>
- <para>Import Orders from Ebay</para>
- </listitem>
- </orderedlist>
- </para>
-</section>
\ No newline at end of file
+ <orderedlist>
+ <listitem>
+ <para>Ebay configurations for ofbiz intregrate with ebay.</para>
+ </listitem>
+ <listitem>
+ <para>Setup shipping methods.</para>
+ </listitem>
+ <listitem>
+ <para>Export products into ebay categories.</para>
+ </listitem>
+ <listitem>
+ <para>Export products into ebay categories.</para>
+ </listitem>
+ <listitem>
+ <para>Import transactions from ebay</para>
+ </listitem>
+<listitem>
+ <para>Import orders from ebay</para>
+ </listitem>
+ </orderedlist>
+
+</section>
Modified: ofbiz/branches/addbirt/specialpurpose/ebay/data/helpdata/HELP_EBAY_main.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/specialpurpose/ebay/data/helpdata/HELP_EBAY_main.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/specialpurpose/ebay/data/helpdata/HELP_EBAY_main.xml (original)
+++ ofbiz/branches/addbirt/specialpurpose/ebay/data/helpdata/HELP_EBAY_main.xml Fri Dec 11 23:11:39 2009
@@ -25,6 +25,51 @@
<title>The Ebay application introduction.</title>
<para>
- More info about the Ebay component.
+ Ebay application will be use for merchant integration between OFBiz and eBay.It is possible to export products from your store into categories on Ebay site also import an orders from ebay. You can use fuctions on this application to setup auction on ebay for the sell your stuff on ebay.
</para>
+<section>
+ <title>How to setup OFBiz integration eBay.</title>
+ <orderedlist>
+ <listitem><para>Register with ebay developer site for obtain keys and certificate (eBayExport.devId,eBayExport.appId,eBayExport.cerId and eBayExport.token etc.) at <link xl:href="https://developer.ebay.com/join/">Join with ebay developers</link> </para></listitem>
+ <listitem>
+ <para>
+ After registered it should be following the keys below :# ebay keys example
+ <orderedlist>
+ <listitem><para>eBayExport.devID=f3586481-93c7-4aaf-ab87-d383d56b71b1</para></listitem>
+ <listitem><para>eBayExport.appID=antwebc0f-9bf9-4829-998b-e5e8fb773ac</para></listitem>
+ <listitem><para>eBayExport.certID=7f363bc0-11d6-489a-a54d-4a44de82f790</para></listitem>
+ </orderedlist>
+ # token key generated from ebay account example :
+ <orderedlist>
+ <listitem><para>eBayExport.token=AgAAAA**AQAAAA**aAAAAA**Ccn7Sg.....</para></listitem>
+ </orderedlist>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Following file in specialpurpose/ebay/config/eBayExport.properties. You will see Merchant configurations.
+ For :
+ eBayExport.xmlGatewayUri :
+ <orderedlist>
+ <listitem><para>https://api.sandbox.ebay.com/ws/api.dll (sandbox environment used for testing and develoment )if you want to use for testing should select sandbox enviroment. </para></listitem>
+ <listitem><para>https://api.ebay.com/ws/api.dll (production environment). </para></listitem>
+ </orderedlist>
+ For : eBayExport.siteID :
+ <orderedlist>
+ <listitem><para>It was siteId you want to sell products ex: site id (0=US, 101=Italy, ...) obtain from <link xl:href="http://developer.ebay.com/DevZone/XML/docs/Reference/eBay/types/SiteCodeType.html">SiteCodeType</link>
+ </para></listitem>
+ </orderedlist>
+
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ Go to ebay-->Ebay Configurations screen(see link in the bottom of page) This screen will displayed ebay configurations with each stores. You need to âaddâ or âeditâ the configuration keys you got from ebay for each productstores into this screen. This configuration is for connect to ebay site and export or import data to ebay.
+ </para>
+ </listitem>
+ <listitem><para>Go to ebay-->Export to eBay screen or eBay orders Import then try to test export products and import orders from ebay. </para></listitem>
+ </orderedlist>
+ </section>
</section>
+
Modified: ofbiz/branches/addbirt/specialpurpose/ebay/documents/Ebay.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/specialpurpose/ebay/documents/Ebay.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/specialpurpose/ebay/documents/Ebay.xml (original)
+++ ofbiz/branches/addbirt/specialpurpose/ebay/documents/Ebay.xml Fri Dec 11 23:11:39 2009
@@ -22,11 +22,17 @@
xsi:schemaLocation="http://docbook.org/ns/docbook ../../../applications/content/dtd/docbook.xsd">
<title>The Ebay Component</title>
<section>
- <title>Introduction</title>
+ <title>Ebay Introduction</title>
<para>
- and a introduction paragraph for Ebay
+ The Ebay component provides an interface to the Ebay website. It is possible to export products from your store into eBay category also import an orders from ebay.
</para>
</section>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../data/helpdata/HELP_EBAY.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../data/helpdata/HELP_EBAY_main.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../data/helpdata/HELP_EBAY_EditEbayConfiguration.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../data/helpdata/HELP_EBAY_AdvanceSearch.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../data/helpdata/HELP_EBAY_KeywordSearch.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../data/helpdata/HELP_EBAY_eBayOrders.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../data/helpdata/HELP_EBAY_ManageOrdersFromEbay.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../data/helpdata/HELP_EBAY_ProductsExportToEbay.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../data/helpdata/HELP_EBAY_ShippingMethods.xml"/>
</chapter>
Modified: ofbiz/branches/addbirt/specialpurpose/ebay/widget/EbayScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/specialpurpose/ebay/widget/EbayScreens.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/specialpurpose/ebay/widget/EbayScreens.xml (original)
+++ ofbiz/branches/addbirt/specialpurpose/ebay/widget/EbayScreens.xml Fri Dec 11 23:11:39 2009
@@ -182,7 +182,7 @@
<actions>
<set field="titleProperty" value="EbayConfigurations"/>
<set field="tabButtonItem" value="find"/>
- <set field="webSiteId" from-field="parameters.webSiteId"/>
+ <!--set field="webSiteId" from-field="parameters.webSiteId"/-->
</actions>
<widgets>
<decorator-screen name="CommonEbayConfigDecorator" location="${parameters.mainDecoratorLocation}">
@@ -236,7 +236,7 @@
<set field="xmlGatewayUri" value="${groovy:ebayConfig == null?'' : org.ofbiz.base.util.StringUtil.wrapString(ebayConfig.xmlGatewayUri)}"/>
<set field="token" value="${groovy:ebayConfig == null?'' : org.ofbiz.base.util.StringUtil.wrapString(ebayConfig.token)}"/>
<set field="customXml" value="${groovy:ebayConfig == null?'' : org.ofbiz.base.util.StringUtil.wrapString(ebayConfig.customXml)}"/>
- <set field="webSiteId" value="${groovy:ebayConfig == null?parameters.webSiteId : ebayConfig.webSiteId}"/>
+ <!--set field="webSiteId" value="${groovy:ebayConfig == null?parameters.webSiteId : ebayConfig.webSiteId}"/-->
</actions>
<widgets>
<decorator-screen name="CommonEbayConfigDecorator" location="${parameters.mainDecoratorLocation}">
Modified: ofbiz/branches/addbirt/specialpurpose/ecommerce/data/DemoOrderTestData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/specialpurpose/ecommerce/data/DemoOrderTestData.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/specialpurpose/ecommerce/data/DemoOrderTestData.xml (original)
+++ ofbiz/branches/addbirt/specialpurpose/ecommerce/data/DemoOrderTestData.xml Fri Dec 11 23:11:39 2009
@@ -121,7 +121,7 @@
<InventoryItem inventoryItemId="9025" inventoryItemTypeId="NON_SERIAL_INV_ITEM" productId="GZ-2644" ownerPartyId="Company" datetimeReceived="2009-08-13 17:47:31.095" facilityId="WebStoreWarehouse" locationSeqId="TLTLTLLL01" quantityOnHandTotal="2.000000" availableToPromiseTotal="2.000000" unitCost="24.000000" currencyUomId="USD"/>
<ShipmentReceipt receiptId="9000" inventoryItemId="9025" productId="GZ-2644" shipmentId="9997" orderId="Demo1001" orderItemSeqId="00001" datetimeReceived="2009-08-13 17:47:31.095" quantityAccepted="2.000000" quantityRejected="0.000000"/>
- <InventoryItemDetail inventoryItemId="9025" inventoryItemDetailSeqId="10000" effectiveDate="2009-08-13 17:47:46.78" quantityOnHandDiff="2.000000" availableToPromiseDiff="2.000000" unitCost="24.000000" orderId="Demo1001" orderItemSeqId="00001" shipmentId="9997" receiptId="9000"/>
+ <InventoryItemDetail inventoryItemId="9025" inventoryItemDetailSeqId="00001" effectiveDate="2009-08-13 17:47:46.78" quantityOnHandDiff="2.000000" availableToPromiseDiff="2.000000" unitCost="24.000000" orderId="Demo1001" orderItemSeqId="00001" shipmentId="9997" receiptId="9000"/>
<ItemIssuance itemIssuanceId="9000" orderId="Demo1001" orderItemSeqId="00001" shipGroupSeqId="00001" shipmentId="9997" shipmentItemSeqId="00001" issuedDateTime="2009-08-13 17:46:29.603" quantity="2.000000"/>
<Invoice invoiceId="8008" invoiceTypeId="PURCHASE_INVOICE" description="Purchase Order Invoice" partyIdFrom="DemoSupplier" partyId="Company" statusId="INVOICE_READY" invoiceDate="2009-08-13 17:47:47.929" currencyUomId="USD"/>
Modified: ofbiz/branches/addbirt/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original)
+++ ofbiz/branches/addbirt/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Fri Dec 11 23:11:39 2009
@@ -247,7 +247,7 @@
<request-map uri="additemsurvey">
<security https="false" auth="false"/>
- <event type="service" invoke="createSurveyResponse"/>
+ <event type="java" invoke="createSurveyResponseAndRestoreParameters" path="org.ofbiz.content.survey.SurveyEvents"/>
<response name="success" type="request" value="additem"/>
<response name="error" type="view" value="main"/>
</request-map>
@@ -1245,13 +1245,13 @@
</request-map>
<request-map uri="profilesurvey">
<security https="true" auth="true"/>
- <event type="service" invoke="createSurveyResponse"/>
+ <event type="java" invoke="createSurveyResponseAndRestoreParameters" path="org.ofbiz.content.survey.SurveyEvents"/>
<response name="success" type="view" value="profilesurvey"/>
<response name="error" type="view" value="profilesurvey"/>
</request-map>
<request-map uri="minipoll">
<security https="false" auth="false"/>
- <event type="service" invoke="createSurveyResponse"/>
+ <event type="java" invoke="createSurveyResponseAndRestoreParameters" path="org.ofbiz.content.survey.SurveyEvents"/>
<response name="success" type="view" value="main"/>
<response name="error" type="view" value="main"/>
</request-map>
Modified: ofbiz/branches/addbirt/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl (original)
+++ ofbiz/branches/addbirt/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl Fri Dec 11 23:11:39 2009
@@ -17,6 +17,7 @@
under the License.
-->
+<#assign initialLocale = locale.toString()>
<html>
<head>
<title>Automation Groups - Main</title>
@@ -24,7 +25,8 @@
<script language="javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
<script language="javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
<script language="javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
- <script language="javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
+ <script language="javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
+ <script language="javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
<link rel='stylesheet' href='<@o...@ofbizContentUrl>' type='text/css'>
<link rel='stylesheet' href='<@o...@ofbizContentUrl>' type='text/css'>
<link rel='stylesheet' href='<@o...@ofbizContentUrl>' type='text/css'>
Modified: ofbiz/branches/addbirt/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl (original)
+++ ofbiz/branches/addbirt/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl Fri Dec 11 23:11:39 2009
@@ -316,7 +316,7 @@
<#else>
<form name="defaultPaymentMethodForm" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="productStoreId" value="${productStoreId}" />
- <input type="hidden" name="defaultPayMeth" value="=${paymentMethod.paymentMethodId}" />
+ <input type="hidden" name="defaultPayMeth" value="${paymentMethod.paymentMethodId}" />
<input type="hidden" name="partyId" value="${party.partyId}" />
<input type="submit" value="${uiLabelMap.EcommerceSetDefault}" class="button" />
</form>
Modified: ofbiz/branches/addbirt/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl (original)
+++ ofbiz/branches/addbirt/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl Fri Dec 11 23:11:39 2009
@@ -92,8 +92,10 @@
<#if paymentAddress.attnName?has_content>${uiLabelMap.PartyAddrAttnName}: ${paymentAddress.attnName}</#if>
${paymentAddress.address1}
<#if paymentAddress.address2?has_content>${paymentAddress.address2}</#if>
- ${paymentAddress.city}<#if paymentAddress.stateProvinceGeoId?has_content>, ${paymentAddress.stateProvinceGeoId}</#if> ${paymentAddress.postalCode?if_exists}
- ${paymentAddress.countryGeoId}
+ <#assign paymentStateGeo = (delegator.findOne("Geo", {"geoId", paymentAddress.stateProvinceGeoId?if_exists}, false))?if_exists />
+ ${paymentAddress.city}<#if paymentStateGeo?has_content>, ${paymentStateGeo.geoName?if_exists}</#if> ${paymentAddress.postalCode?if_exists}
+ <#assign paymentCountryGeo = (delegator.findOne("Geo", {"geoId", paymentAddress.countryGeoId?if_exists}, false))?if_exists />
+ <#if paymentCountryGeo?has_content>${paymentCountryGeo.geoName?if_exists}</#if>
${uiLabelMap.EcommerceBeSureToIncludeYourOrderNb}
</#if>
<#else>
@@ -193,9 +195,10 @@
<#if pmBillingAddress.address2?has_content>${pmBillingAddress.address2}</#if>
</li>
<li>
- ${pmBillingAddress.city}<#if pmBillingAddress.stateProvinceGeoId?has_content>, ${pmBillingAddress.stateProvinceGeoId} </#if>
- ${pmBillingAddress.postalCode?if_exists}
- ${pmBillingAddress.countryGeoId?if_exists}
+ <#assign pmBillingStateGeo = (delegator.findOne("Geo", {"geoId", pmBillingAddress.stateProvinceGeoId?if_exists}, false))?if_exists />
+ ${pmBillingAddress.city}<#if pmBillingStateGeo?has_content>, ${ pmBillingStateGeo.geoName?if_exists}</#if> ${pmBillingAddress.postalCode?if_exists}
+ <#assign pmBillingCountryGeo = (delegator.findOne("Geo", {"geoId", pmBillingAddress.countryGeoId?if_exists}, false))?if_exists />
+ <#if pmBillingCountryGeo?has_content>${pmBillingCountryGeo.geoName?if_exists}</#if>
</li>
</ul>
</li>
@@ -256,11 +259,12 @@
<#if shippingAddress.address2?has_content>${shippingAddress.address2}</#if>
</li>
<li>
- ${shippingAddress.city}<#if shippingAddress.stateProvinceGeoId?has_content>, ${shippingAddress.stateProvinceGeoId} </#if>
- ${shippingAddress.postalCode?if_exists}
+ <#assign shippingStateGeo = (delegator.findOne("Geo", {"geoId", shippingAddress.stateProvinceGeoId?if_exists}, false))?if_exists />
+ ${shippingAddress.city}<#if shippingStateGeo?has_content>, ${shippingStateGeo.geoName?if_exists}</#if> ${shippingAddress.postalCode?if_exists}
</li>
<li>
- ${shippingAddress.countryGeoId?if_exists}
+ <#assign shippingCountryGeo = (delegator.findOne("Geo", {"geoId", shippingAddress.countryGeoId?if_exists}, false))?if_exists />
+ <#if shippingCountryGeo?has_content>${shippingCountryGeo.geoName?if_exists}</#if>
</li>
</ul>
</li>
Modified: ofbiz/branches/addbirt/specialpurpose/ecommerce/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/specialpurpose/ecommerce/widget/CommonScreens.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/specialpurpose/ecommerce/widget/CommonScreens.xml (original)
+++ ofbiz/branches/addbirt/specialpurpose/ecommerce/widget/CommonScreens.xml Fri Dec 11 23:11:39 2009
@@ -41,7 +41,9 @@
<!-- NOTE: this should be included on each screen that uses it to avoid including it in all screens: -->
<set field="layoutSettings.javaScripts[]" value="/images/fieldlookup.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/>
- <set field="layoutSettings.javaScripts[]" value="/images/calendar_date_select.js" global="true"/>
+ <set field="layoutSettings.javaScripts[]" value="/images/calendarDateSelect/calendar_date_select.js" global="true"/>
+ <set field="initialLocale" type="String" value="${parameters.userLogin.lastLocale}" default-value="${groovy:locale.toString()}"/>
+ <set field="layoutSettings.javaScripts[]" value="/images/calendarDateSelect/locale/${initialLocale}.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/prototypejs/effects.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/prototypejs/validation.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/prototypejs/prototype.js" global="true"/>
@@ -222,7 +224,7 @@
</widgets>
</section>
</screen>
-
+
<screen name="CommonPopUpDecorator">
<section>
<actions>
@@ -244,7 +246,9 @@
<!-- NOTE: this should be included on each screen that uses it to avoid including it in all screens: -->
<set field="layoutSettings.javaScripts[]" value="/images/fieldlookup.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/>
- <set field="layoutSettings.javaScripts[]" value="/images/calendar_date_select.js" global="true"/>
+ <set field="layoutSettings.javaScripts[]" value="/images/calendarDateSelect/calendar_date_select.js" global="true"/>
+ <set field="initialLocale" type="String" value="${parameters.userLogin.lastLocale}" default-value="${groovy:locale.toString()}"/>
+ <set field="layoutSettings.javaScripts[]" value="/images/calendarDateSelect/locale/${initialLocale}.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/prototypejs/effects.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/prototypejs/validation.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/prototypejs/prototype.js" global="true"/>
Modified: ofbiz/branches/addbirt/specialpurpose/googlecheckout/README
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/specialpurpose/googlecheckout/README?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/specialpurpose/googlecheckout/README (original)
+++ ofbiz/branches/addbirt/specialpurpose/googlecheckout/README Fri Dec 11 23:11:39 2009
@@ -1 +1 @@
-To use Google checkout please check http://docs.ofbiz.org/display/OFBIZ/Google+Checkout+Integration.
\ No newline at end of file
+To use Google checkout please check http://cwiki.apache.org/confluence/display/OFBIZ/Google+Checkout+Integration.
\ No newline at end of file
Propchange: ofbiz/branches/addbirt/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 11 23:11:39 2009
@@ -1,2 +1,2 @@
/incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:418499-490456
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:831205-885662
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:831205-889845
Propchange: ofbiz/branches/addbirt/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 11 23:11:39 2009
@@ -1,2 +1,2 @@
/incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:418499-490456
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:831205-885662
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:831205-889845
Propchange: ofbiz/branches/addbirt/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 11 23:11:39 2009
@@ -1,2 +1,2 @@
/incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:418499-490456
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:831205-885662
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:831205-889845
Modified: ofbiz/branches/addbirt/specialpurpose/pos/data/PosSyncSettings.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/specialpurpose/pos/data/PosSyncSettings.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/specialpurpose/pos/data/PosSyncSettings.xml (original)
+++ ofbiz/branches/addbirt/specialpurpose/pos/data/PosSyncSettings.xml Fri Dec 11 23:11:39 2009
@@ -18,7 +18,7 @@
under the License.
-->
-<!-- To know more about this setting please read the documentation http://docs.ofbiz.org/x/chM -->
+<!-- To know more about this setting please read the documentation http://cwiki.apache.org/confluence/x/bgFk -->
<entity-engine-xml>
<!-- MCS->PSS Central Server to Per Store Server -->
@@ -43,7 +43,7 @@
<EntityGroupEntry entityGroupId="5501" entityOrPackage="org.ofbiz.product.category" applEnumId="ESIA_INCLUDE"/>
<!-- org.ofbiz.party.party may be needed for certain promotions -->
<EntityGroupEntry entityGroupId="5501" entityOrPackage="org.ofbiz.party.party" applEnumId="ESIA_INCLUDE"/>
- <EntityGroupEntry entityGroupId="5501" entityOrPackage="org.ofbiz.pos.PosTerminal" applEnumId="ESIA_INCLUDE"/>
+ <EntityGroupEntry entityGroupId="5501" entityOrPackage="org.ofbiz.specialpurpose.pos.PosTerminal" applEnumId="ESIA_INCLUDE"/>
<!-- POS->PSS POS Terminal to Per Store Server -->
<EntityGroup entityGroupId="5505" entityGroupName="POS: POS Terminal to Per Store Server"/>
Modified: ofbiz/branches/addbirt/themes/bizznesstime/webapp/bizznesstime/css/forms.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/themes/bizznesstime/webapp/bizznesstime/css/forms.css?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/themes/bizznesstime/webapp/bizznesstime/css/forms.css (original)
+++ ofbiz/branches/addbirt/themes/bizznesstime/webapp/bizznesstime/css/forms.css Fri Dec 11 23:11:39 2009
@@ -28,7 +28,7 @@
font-size: 11px;
color: #5d5644;
margin-top: 5px;
- text-transform:uppercase;
+ text-transform:uppercase;
}
form a img {
@@ -45,15 +45,16 @@
input[type="radio"],input[type="checkbox"] {
font-size: 1.1em;
- margin: 5px 5px 10px 5px;
+ margin: 5px 5px 10px 0px;
}
input[type="text"],input[type="password"] {
- border: #ddd solid 2px;
- font-weight:bold;
- font-size: 1.1em;
- margin:5px 5px 5px 5px;
- padding:2px 4px;
+ background:#fbfbfb;
+ border: #ccc solid 1px;
+ font-weight:normal;
+ font-size: 1.1em;
+ margin:5px 0px;
+ padding:2px 4px;
}
input[type="submit"],input[type="button"],input[type="reset"] {
@@ -62,7 +63,7 @@
color: #444;
font-weight:bold;
line-height:1.8em;
- margin:5px 5px 2px 5px;
+ margin:5px 5px 2px 0px;
padding:2px 4px;
text-transform:uppercase;
}
@@ -84,11 +85,11 @@
}
select {
- background-color: #ffffff;
- border: #ddd solid 2px;
+ background-color: #fbfbfb;
+ border: #ccc solid 1px;
font-size: 1.1em;
height: 1.6em; /* force ctrl to scale with text */
- margin:5px 5px 2px 5px;
+ margin:5px 0px 2px 0px;
}
select[multiple="multiple"] {
@@ -104,9 +105,9 @@
}
input:focus,.contentarea textarea:focus {
- border: 2px solid #6E2723;
+ border: 1px solid #6E2723;
}
input.focused, textarea.focused {
- border: 2px solid #6E2723;
+ border: 1px solid #6E2723;
}
Modified: ofbiz/branches/addbirt/themes/bizznesstime/webapp/bizznesstime/css/legacy.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/themes/bizznesstime/webapp/bizznesstime/css/legacy.css?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/themes/bizznesstime/webapp/bizznesstime/css/legacy.css (original)
+++ ofbiz/branches/addbirt/themes/bizznesstime/webapp/bizznesstime/css/legacy.css Fri Dec 11 23:11:39 2009
@@ -706,6 +706,7 @@
white-space: nowrap;
width: 1%;
margin:0 4px 0 0px;
+ vertical-align:middle;
}
.basic-form {
Modified: ofbiz/branches/addbirt/themes/bizznesstime/webapp/bizznesstime/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/themes/bizznesstime/webapp/bizznesstime/css/style.css?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/themes/bizznesstime/webapp/bizznesstime/css/style.css (original)
+++ ofbiz/branches/addbirt/themes/bizznesstime/webapp/bizznesstime/css/style.css Fri Dec 11 23:11:39 2009
@@ -81,8 +81,8 @@
background:url(../images/bg.jpg) top left repeat-y;
color: #000;
font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size:.75em;
- line-height:1.5em;
+ font-size:.65em;
+ line-height:1.2em;
}
img {display: inline-block; vertical-align: bottom;}
@@ -121,7 +121,7 @@
***********************************************/
table {border-collapse: collapse; border-spacing: 0; margin: 0 0 1.5em;}
caption {text-align: left;}
-th, td {padding: .25em .5em; color:#555;}
+th, td {padding: .25em .5em; color:#555; vertical-align:middle;}
tbody td, tbody th {}
tfoot {font-style: italic;}
@@ -1397,4 +1397,4 @@
.profile-right {
width:45%;
float:left;
-}
\ No newline at end of file
+}
Modified: ofbiz/branches/addbirt/themes/bluelight/webapp/bluelight/style.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/themes/bluelight/webapp/bluelight/style.css?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/themes/bluelight/webapp/bluelight/style.css (original)
+++ ofbiz/branches/addbirt/themes/bluelight/webapp/bluelight/style.css Fri Dec 11 23:11:39 2009
@@ -862,6 +862,7 @@
text-align: right;
white-space: nowrap;
width: 1%;
+ vertical-align: middle;
}
.required,input.required {
@@ -1461,6 +1462,7 @@
.basic-table tr td { /* Style for all cells */
padding: 0.1em;
+ vertical-align: middle;
}
.basic-table tr .label,.basic-table tr .group-label {
Modified: ofbiz/branches/addbirt/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css (original)
+++ ofbiz/branches/addbirt/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css Fri Dec 11 23:11:39 2009
@@ -853,6 +853,7 @@
text-align: right;
white-space: nowrap;
width: 1%;
+vertical-align: middle;
}
.required,input.required {
@@ -1429,6 +1430,7 @@
.basic-table tr td { /* Style for all cells */
padding: 0.1em;
+vertical-align: middle;
}
.basic-table tr .label,.basic-table tr .group-label {
Modified: ofbiz/branches/addbirt/themes/flatgrey/webapp/flatgrey/maincss.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/themes/flatgrey/webapp/flatgrey/maincss.css?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/themes/flatgrey/webapp/flatgrey/maincss.css (original)
+++ ofbiz/branches/addbirt/themes/flatgrey/webapp/flatgrey/maincss.css Fri Dec 11 23:11:39 2009
@@ -885,6 +885,7 @@
text-align: right;
white-space: nowrap;
width: 1%;
+vertical-align: middle;
}
.required, input.required {
@@ -1482,6 +1483,7 @@
.basic-table tr td {
/* Style for all cells */
padding: 0.1em;
+vertical-align: middle;
}
.basic-table tr .label,